From owner-svn-ports-head@freebsd.org Mon Oct 12 05:38:01 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9D3CF42C7FB; Mon, 12 Oct 2020 05:38:01 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4C8nWs39QJz3RNZ; Mon, 12 Oct 2020 05:38:01 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4A4802754F; Mon, 12 Oct 2020 05:38:01 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 09C5c1oT078950; Mon, 12 Oct 2020 05:38:01 GMT (envelope-from koobs@FreeBSD.org) Received: (from koobs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 09C5c0XH078946; Mon, 12 Oct 2020 05:38:00 GMT (envelope-from koobs@FreeBSD.org) Message-Id: <202010120538.09C5c0XH078946@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: koobs set sender to koobs@FreeBSD.org using -f From: Kubilay Kocak Date: Mon, 12 Oct 2020 05:38:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r552095 - in head/www/py-requests: . files X-SVN-Group: ports-head X-SVN-Commit-Author: koobs X-SVN-Commit-Paths: in head/www/py-requests: . files X-SVN-Commit-Revision: 552095 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Oct 2020 05:38:01 -0000 Author: koobs Date: Mon Oct 12 05:38:00 2020 New Revision: 552095 URL: https://svnweb.freebsd.org/changeset/ports/552095 Log: www/py-requests: Chase dns/py-idna update ports r552091 updated idna to 2.10, breaking www/py-requests, and its dependents, with: raise DistributionNotFound(req, requirers) pkg_resources.DistributionNotFound: The 'idna<2.9,>=2.5' distribution was not found and is required by requests Backport an upstream commit [1] that kinda addresses "most" of the root cause problem of this for future dependency updates, by not pinning on minor versions. [1] https://github.com/psf/requests/pull/5342 PR: 245938 Reported by: lbartoletti, ohauer MFH: 2020Q3 X-MFH-With: 552091 Modified: head/www/py-requests/Makefile head/www/py-requests/files/patch-setup.py Modified: head/www/py-requests/Makefile ============================================================================== --- head/www/py-requests/Makefile Mon Oct 12 04:37:49 2020 (r552094) +++ head/www/py-requests/Makefile Mon Oct 12 05:38:00 2020 (r552095) @@ -3,6 +3,7 @@ PORTNAME= requests PORTVERSION= 2.22.0 +PORTREVISION= 1 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -19,7 +20,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}certifi>=2017.4.17 ${PYTHON_PKGNAMEPREFIX}urllib3>=1.21.1:net/py-urllib3@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-mock>0:devel/py-pytest-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pytest>=2.8.0:devel/py-pytest@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}pytest>=2.8.0:devel/py-pytest@${PY_FLAVOR} \ # Actually 2.7,3.5+ USES= python Modified: head/www/py-requests/files/patch-setup.py ============================================================================== --- head/www/py-requests/files/patch-setup.py Mon Oct 12 04:37:49 2020 (r552094) +++ head/www/py-requests/files/patch-setup.py Mon Oct 12 05:38:00 2020 (r552095) @@ -1,12 +1,29 @@ # pytest-cov and its dependencies are not compulsory +# +# Subject: [PATCH] Limit dependencies to major instead of minor (#5342 +# From c46f55bd48dabc02f033d252f8c64e2011f37361 Mon Sep 17 00:00:00 2001 +# From: Chris Withers +# Date: Tue, 18 Feb 2020 14:58:27 +0000 ---- setup.py.orig 2019-01-22 02:52:54 UTC +--- setup.py.orig 2019-05-16 14:22:45 UTC +++ setup.py -@@ -50,7 +50,6 @@ requires = [ - ] - test_requirements = [ - 'pytest-httpbin==0.0.7', -- 'pytest-cov', - 'pytest-mock', - 'pytest-xdist', - 'PySocks>=1.5.6, !=1.5.7', +@@ -42,8 +42,8 @@ if sys.argv[-1] == 'publish': + packages = ['requests'] + + requires = [ +- 'chardet>=3.0.2,<3.1.0', +- 'idna>=2.5,<2.9', ++ 'chardet>=3.0.2,<4', ++ 'idna>=2.5,<3', + 'urllib3>=1.21.1,<1.26,!=1.25.0,!=1.25.1', + 'certifi>=2017.4.17' + +@@ -101,7 +101,7 @@ setup( + cmdclass={'test': PyTest}, + tests_require=test_requirements, + extras_require={ +- 'security': ['pyOpenSSL >= 0.14', 'cryptography>=1.3.4', 'idna>=2.0.0'], ++ 'security': ['pyOpenSSL >= 0.14', 'cryptography>=1.3.4'], + 'socks': ['PySocks>=1.5.6, !=1.5.7'], + 'socks:sys_platform == "win32" and python_version == "2.7"': ['win_inet_pton'], + },