From 623ee73d661e5ed8475cb264511f683407d87365 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Apr 2020 03:41:30 +0100 Subject: gentoo Easter resync : 12.04.2020 --- dev-python/urllib3/Manifest | 6 +-- dev-python/urllib3/urllib3-1.24.2.ebuild | 23 +++++++--- dev-python/urllib3/urllib3-1.25.7.ebuild | 77 -------------------------------- dev-python/urllib3/urllib3-1.25.8.ebuild | 46 +++++++++++-------- 4 files changed, 45 insertions(+), 107 deletions(-) delete mode 100644 dev-python/urllib3/urllib3-1.25.7.ebuild (limited to 'dev-python/urllib3') diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest index e817adde8f28..b29ad7f2e24f 100644 --- a/dev-python/urllib3/Manifest +++ b/dev-python/urllib3/Manifest @@ -1,7 +1,5 @@ DIST urllib3-1.24.2.tar.gz 230699 BLAKE2B 9c2f2be8fa743f542493d75072c02423d1bd40189561fa0ea393a8a2515b24da9a2a383aeec35b55bdd2a9954d3d585450d759548358ed91ecfdb9ec03d391b6 SHA512 9939e9e7c4da30b5effb334969cd835c9d0404a136761098203c699570aab02e63fb3f1b4ab680def0bc0906fabe5f0782ab94cf3095ff10ccf9b3c371653cf2 -DIST urllib3-1.25.7.tar.gz 264636 BLAKE2B 32ee47df52e0d164865400ecb5f0b65d3640173b53e1d9cf8f2dbdec46ac34d56ca66991ab719d9fafb8d49440630a3318312a925f11e3c6b8d26cfa72600c4a SHA512 e43c1b7893488b77a38a9fdcfc9760ceea72c53cf176eb8e4d1d9990732c5c1936f85c653a646eaadb3eaf72a99ccdbb5023430b97beca6458b868095005eac2 DIST urllib3-1.25.8.tar.gz 261077 BLAKE2B 9625c8bce484e3a0ae8b49a776377d5420a496652d75220438f8f9cfbfa96c22a6fbea29380f45f18d8620d14568056dcb3e8b6a08fe711085298d2f6b2ea870 SHA512 6e380d98d9a8b06534abfab4eb67b685a8311a091e31adcefe2b0ffc61d2b728229df067790b20358f2646e9054a546450c3351e4aa618f31d85573ea50ceaa2 -EBUILD urllib3-1.24.2.ebuild 1547 BLAKE2B 395b4aa38cc23b46dcfad2f6628758599145ce49f9b527a3fb7c0ab99f3e4d69ddf822a7fc6690f8f9ae058b2207db7f5389a943e2dbe0a72fb711b66018ddd1 SHA512 80bc2673f42b1258939204e052f582342b67775cf377208572d1a873dc02b9d072be4dc369e6987258aef0e8d0785b524c9aac0e6d1634e3f14929b30c718e46 -EBUILD urllib3-1.25.7.ebuild 2255 BLAKE2B 84acdca971d5a9fc383322ae91f2883655b7de7a24c2e3bfc60637f9ff92dddda45a63ec72fa3d3736b678639ced3761964b5c5ca7d6f0b333c045489d235e4c SHA512 f998e4723410b7516dee1e64805146a20c3ef2a5b9dcdf5d0556b529af04b13535694205ecf3ceb1c6d1086ad27a52810980c5f7322cc57c6248c710e0b77761 -EBUILD urllib3-1.25.8.ebuild 2255 BLAKE2B 84acdca971d5a9fc383322ae91f2883655b7de7a24c2e3bfc60637f9ff92dddda45a63ec72fa3d3736b678639ced3761964b5c5ca7d6f0b333c045489d235e4c SHA512 f998e4723410b7516dee1e64805146a20c3ef2a5b9dcdf5d0556b529af04b13535694205ecf3ceb1c6d1086ad27a52810980c5f7322cc57c6248c710e0b77761 +EBUILD urllib3-1.24.2.ebuild 1786 BLAKE2B 3c413607941e08872efa7f4f598e69d6a858adea7505b183ae2efeb7bf418edf8b06fbd04d0f3aa640a50f9ee18616f8b5186f382fb8fc6f250a667348c7d088 SHA512 4f217cb09fc22adb26371a336d42c274be4ca2aa1e8ea5404b8ac97f573b7d7f6c577b8e12a5f9281e1df39e4967614c8f9d9aa626c3544bef20c86053f1a95e +EBUILD urllib3-1.25.8.ebuild 2530 BLAKE2B cf8bbd3f39ada0e25de0b95af611dd41790d73cc53de895b8eb2fa5ec962e1cf6995ed9eb9524a212612ad17bf94f8bb77a4788cb335cab091d34b47bee8149f SHA512 49602f7db54213b27bbd4af0329bf3d2b360cc8a73bf8e74bb7dfb3acd63d767393119a66fa93d1b4e1ced0337499f79987eb0a18bce64c585f953c48d222899 MISC metadata.xml 462 BLAKE2B fa1a23ff540c36b4d00a665f92e4fbc3651ef0d91669c3181b01c6caa3c0c2824ae5ad498c784e13b2b6bbd1763a6eda891385ac584c8657843d61eed03ee952 SHA512 b82fc435e84e67e5536dde9edcd40644706eec6198a65233db5e43f20027ecf70a827f33f7d6b34095151ec7d33b6935bd16022355ac2ba87657185d35210aa0 diff --git a/dev-python/urllib3/urllib3-1.24.2.ebuild b/dev-python/urllib3/urllib3-1.24.2.ebuild index 5c781b4effa6..82e560366169 100644 --- a/dev-python/urllib3/urllib3-1.24.2.ebuild +++ b/dev-python/urllib3/urllib3-1.24.2.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="test" RESTRICT="!test? ( test )" @@ -25,15 +25,19 @@ RDEPEND=" >=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}] >=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}] >=dev-python/idna-2.0.0[${PYTHON_USEDEP}] - virtual/python-ipaddress[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/ipaddress[${PYTHON_USEDEP}] + ' -2) " DEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] test? ( - ${RDEPEND} - dev-python/mock[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] - >=www-servers/tornado-4.2.1[$(python_gen_usedep python{2_7,3_{5,6,7}})] + $(python_gen_cond_dep " + ${RDEPEND} + dev-python/mock[\${PYTHON_USEDEP}] + dev-python/pytest[\${PYTHON_USEDEP}] + >=www-servers/tornado-4.2.1[\${PYTHON_USEDEP}] + " 'python3*') ) " @@ -51,7 +55,12 @@ python_prepare_all() { python_test() { # FIXME: get tornado ported case ${EPYTHON} in - python2*|python3.[567]) + python2*) + ewarn "Tests are being skipped for Python 2 in order to reduce the number" + ewarn "of circular dependencies for Python 2 removal. Please test" + ewarn "manually in a virtualenv." + ;; + python3*) pytest -vv || die "Tests fail with ${EPYTHON}" ;; esac diff --git a/dev-python/urllib3/urllib3-1.25.7.ebuild b/dev-python/urllib3/urllib3-1.25.7.ebuild deleted file mode 100644 index 7d7b50ac8af2..000000000000 --- a/dev-python/urllib3/urllib3-1.25.7.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 ) -PYTHON_REQ_USE="ssl(+)" - -inherit distutils-r1 - -DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more" -HOMEPAGE="https://github.com/urllib3/urllib3" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" -IUSE="brotli test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}] - =dev-python/cryptography-1.3.4[${PYTHON_USEDEP}] - >=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}] - >=dev-python/idna-2.0.0[${PYTHON_USEDEP}] - virtual/python-ipaddress[${PYTHON_USEDEP}] - brotli? ( dev-python/brotlipy[${PYTHON_USEDEP}] ) -" -BDEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - ${RDEPEND} - dev-python/brotlipy[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] - >=dev-python/trustme-0.5.3[${PYTHON_USEDEP}] - $(python_gen_cond_dep ' - >=www-servers/tornado-4.2.1[${PYTHON_USEDEP}] - ' python{2_7,3_{5,6,7}}) - ) -" - -distutils_enable_sphinx docs \ - dev-python/alabaster \ - dev-python/mock - -python_prepare_all() { - # tests requiring a route to be present - sed -e 's:test_enhanced_timeout:_&:' \ - -e 's:test_https_timeout:_&:' \ - -i test/with_dummyserver/test_https.py || die - sed -e 's:test_https_proxy_.*timeout:_&:' \ - -i test/with_dummyserver/test_proxy_poolmanager.py || die - # no clue why those fail, might be tornado's fault, might be just - # very flaky - sed -e 's:test_client_no_intermediate:_&:' \ - -i test/with_dummyserver/test_https.py || die - sed -e 's:test_cross_host_redirect:_&:' \ - -e 's:test_cross_protocol_redirect:_&:' \ - -e 's:test_basic_ipv6_proxy:_&:' \ - -i test/with_dummyserver/test_proxy_poolmanager.py || die - sed -e 's:test_connection_closed_on_read_timeout_preload_false:_&:' \ - -i test/with_dummyserver/test_socketlevel.py || die - - distutils-r1_python_prepare_all -} - -python_test() { - # FIXME: get tornado ported - case ${EPYTHON} in - python2*|python3.[567]) - pytest -vv || die "Tests fail with ${EPYTHON}" - ;; - esac -} diff --git a/dev-python/urllib3/urllib3-1.25.8.ebuild b/dev-python/urllib3/urllib3-1.25.8.ebuild index 7d7b50ac8af2..6db8a9e9ea98 100644 --- a/dev-python/urllib3/urllib3-1.25.8.ebuild +++ b/dev-python/urllib3/urllib3-1.25.8.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86" IUSE="brotli test" RESTRICT="!test? ( test )" @@ -25,20 +25,22 @@ RDEPEND=" >=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}] >=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}] >=dev-python/idna-2.0.0[${PYTHON_USEDEP}] - virtual/python-ipaddress[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/ipaddress[${PYTHON_USEDEP}] + ' -2) brotli? ( dev-python/brotlipy[${PYTHON_USEDEP}] ) " BDEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] test? ( - ${RDEPEND} - dev-python/brotlipy[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] - >=dev-python/trustme-0.5.3[${PYTHON_USEDEP}] - $(python_gen_cond_dep ' - >=www-servers/tornado-4.2.1[${PYTHON_USEDEP}] - ' python{2_7,3_{5,6,7}}) + $(python_gen_cond_dep " + ${RDEPEND} + dev-python/brotlipy[\${PYTHON_USEDEP}] + dev-python/mock[\${PYTHON_USEDEP}] + dev-python/pytest[\${PYTHON_USEDEP}] + >=dev-python/trustme-0.5.3[\${PYTHON_USEDEP}] + >=www-servers/tornado-4.2.1[\${PYTHON_USEDEP}] + " 'python3*') ) " @@ -47,19 +49,19 @@ distutils_enable_sphinx docs \ dev-python/mock python_prepare_all() { - # tests requiring a route to be present - sed -e 's:test_enhanced_timeout:_&:' \ - -e 's:test_https_timeout:_&:' \ + # https://github.com/urllib3/urllib3/issues/1756 + sed -e 's:10.255.255.1:240.0.0.0:' \ + -i test/__init__.py || die + # tests failing if 'localhost.' cannot be resolved + sed -e 's:test_dotted_fqdn:_&:' \ -i test/with_dummyserver/test_https.py || die - sed -e 's:test_https_proxy_.*timeout:_&:' \ - -i test/with_dummyserver/test_proxy_poolmanager.py || die + sed -e 's:test_request_host_header_ignores_fqdn_dot:_&:' \ + -i test/with_dummyserver/test_socketlevel.py || die # no clue why those fail, might be tornado's fault, might be just # very flaky sed -e 's:test_client_no_intermediate:_&:' \ -i test/with_dummyserver/test_https.py || die - sed -e 's:test_cross_host_redirect:_&:' \ - -e 's:test_cross_protocol_redirect:_&:' \ - -e 's:test_basic_ipv6_proxy:_&:' \ + sed -e 's:test_basic_ipv6_proxy:_&:' \ -i test/with_dummyserver/test_proxy_poolmanager.py || die sed -e 's:test_connection_closed_on_read_timeout_preload_false:_&:' \ -i test/with_dummyserver/test_socketlevel.py || die @@ -68,9 +70,15 @@ python_prepare_all() { } python_test() { + local -x CI=1 # FIXME: get tornado ported case ${EPYTHON} in - python2*|python3.[567]) + python2*) + ewarn "Tests are being skipped for Python 2 in order to reduce the number" + ewarn "of circular dependencies for Python 2 removal. Please test" + ewarn "manually in a virtualenv." + ;; + python3*) pytest -vv || die "Tests fail with ${EPYTHON}" ;; esac -- cgit v1.2.3