Date: Sun, 10 Nov 2019 14:43:21 +0000 (UTC) From: Kai Knoblich <kai@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r517209 - in branches/2019Q4/www/py-requests: . files Message-ID: <201911101443.xAAEhLBq050256@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kai Date: Sun Nov 10 14:43:20 2019 New Revision: 517209 URL: https://svnweb.freebsd.org/changeset/ports/517209 Log: MFH: r517078 www/py-requests: Update to 2.22.0 * Backport a patch from upstream that fixes the unittests in conjunction with devel/py-pytest >= 4. * Remove obsolete CONFLICTS_INSTALL entry as www/py-requests1 no longer exists in the Ports tree. This update includes a pinned urllib3 version bump to < 1.26, which clears the way for a net/urllib3 update to 1.25.6 [1]. Changelog: https://github.com/requests/requests/blob/v2.22.0/HISTORY.md PR: 239302, 229322 [1] Submitted by: swills (based on) Approved by: koobs (maintainer) Approved by: ports-secteam (joneum) Added: branches/2019Q4/www/py-requests/files/patch-tests_test__utils.py - copied unchanged from r517078, head/www/py-requests/files/patch-tests_test__utils.py Modified: branches/2019Q4/www/py-requests/Makefile branches/2019Q4/www/py-requests/distinfo Directory Properties: branches/2019Q4/ (props changed) Modified: branches/2019Q4/www/py-requests/Makefile ============================================================================== --- branches/2019Q4/www/py-requests/Makefile Sun Nov 10 14:28:38 2019 (r517208) +++ branches/2019Q4/www/py-requests/Makefile Sun Nov 10 14:43:20 2019 (r517209) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= requests -PORTVERSION= 2.21.0 +PORTVERSION= 2.22.0 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -21,11 +21,9 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.8.0:dev ${PYTHON_PKGNAMEPREFIX}pytest-mock>0:devel/py-pytest-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist@${PY_FLAVOR} -# Actually 2.6-2.7,3.4+ +# Actually 2.7,3.5+ USES= python USE_PYTHON= autoplist concurrent distutils - -CONFLICTS_INSTALL= py*-requests1-* NO_ARCH= yes Modified: branches/2019Q4/www/py-requests/distinfo ============================================================================== --- branches/2019Q4/www/py-requests/distinfo Sun Nov 10 14:28:38 2019 (r517208) +++ branches/2019Q4/www/py-requests/distinfo Sun Nov 10 14:43:20 2019 (r517209) @@ -1,3 +1,3 @@ -TIMESTAMP = 1548125465 -SHA256 (requests-2.21.0.tar.gz) = 502a824f31acdacb3a35b6690b5fbf0bc41d63a24a45c4004352b0242707598e -SIZE (requests-2.21.0.tar.gz) = 111528 +TIMESTAMP = 1572339862 +SHA256 (requests-2.22.0.tar.gz) = 11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4 +SIZE (requests-2.22.0.tar.gz) = 113406 Copied: branches/2019Q4/www/py-requests/files/patch-tests_test__utils.py (from r517078, head/www/py-requests/files/patch-tests_test__utils.py) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2019Q4/www/py-requests/files/patch-tests_test__utils.py Sun Nov 10 14:43:20 2019 (r517209, copy of r517078, head/www/py-requests/files/patch-tests_test__utils.py) @@ -0,0 +1,17 @@ +Make tests work with devel/py-pytest >= 4 + +Obtained from: +https://github.com/psf/requests/commit/0fe6653eabc3e0a4b8c48e374fb7ee83a3bf829b + +--- tests/test_utils.py.orig 2019-05-16 14:18:16 UTC ++++ tests/test_utils.py +@@ -33,7 +33,8 @@ class TestSuperLen: + 'stream, value', ( + (StringIO.StringIO, 'Test'), + (BytesIO, b'Test'), +- pytest.mark.skipif('cStringIO is None')((cStringIO, 'Test')), ++ pytest.param(cStringIO, 'Test', ++ marks=pytest.mark.skipif('cStringIO is None')), + )) + def test_io_streams(self, stream, value): + """Ensures that we properly deal with different kinds of IO streams."""
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201911101443.xAAEhLBq050256>