diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-03-20 14:27:17 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-03-20 14:27:17 +0000 |
commit | 5bb9ff1ee56d2b5e75e01a7f066d8b0cec84ec02 (patch) | |
tree | 66e860a5099bcad013f1cf667255dc372a7c11b3 /dev-python/urllib3 | |
parent | 7218e1b46bceac05841e90472501742d905fb3fc (diff) |
gentoo resync : 20.03.2021
Diffstat (limited to 'dev-python/urllib3')
-rw-r--r-- | dev-python/urllib3/Manifest | 11 | ||||
-rw-r--r-- | dev-python/urllib3/files/urllib3-1.26.2-byteswarning.patch | 25 | ||||
-rw-r--r-- | dev-python/urllib3/files/urllib3-1.26.2-fix-test_proxy_rejection-test-hang.patch | 87 | ||||
-rw-r--r-- | dev-python/urllib3/urllib3-1.26.2-r2.ebuild | 70 | ||||
-rw-r--r-- | dev-python/urllib3/urllib3-1.26.2-r3.ebuild | 77 | ||||
-rw-r--r-- | dev-python/urllib3/urllib3-1.26.2.ebuild | 69 | ||||
-rw-r--r-- | dev-python/urllib3/urllib3-1.26.3-r1.ebuild | 2 | ||||
-rw-r--r-- | dev-python/urllib3/urllib3-1.26.4.ebuild (renamed from dev-python/urllib3/urllib3-1.26.2-r1.ebuild) | 31 |
8 files changed, 17 insertions, 355 deletions
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest index af57496a6caf..bf1309237037 100644 --- a/dev-python/urllib3/Manifest +++ b/dev-python/urllib3/Manifest @@ -1,12 +1,7 @@ -AUX urllib3-1.26.2-byteswarning.patch 881 BLAKE2B 8d913aaf47edc874ce8b367e02aa01b4f4f59724cdd02f980ebaefb24968bd3a9cd3804f20d78984c5addce68c7a332b3e94415f348cb8c998e0944299150d6d SHA512 9d9306a5fd884c5ec6d05c74a10c1ee458604e1293986eab5c6b4061ce7d8df4796f5833fe1a8b4bdcb9025dfcf1a10ac000aa9da6f01ff13647299cca655131 -AUX urllib3-1.26.2-fix-test_proxy_rejection-test-hang.patch 3500 BLAKE2B ed204b228bbe0410fab37bc8d8ae6cb8f4849f3e31c17548e77bb0984712e298a7a5c486664debebcacd19dd1ac46371d583019a6ba279e5ead3a1d09f6b7a49 SHA512 e52cc96e11be6050df1c40f3c024de89423b5ffe4bdbcd98a0dd775354c999cf2ee9c99835b2b7b3c194bf8c15aed6a8b62b81c6c9d142afd1227614c50d88be DIST urllib3-1.25.11.tar.gz 260300 BLAKE2B 06bd2107bad479e36c6474f95567c3ecb119d18b193b358df9e345e4d09392366255b21597b26fbf2374220b921cc2117a1972f88021c3a6ebac3844a319acbe SHA512 58f77edb9ced62cbac7b0baf2651c07f9f413267f103730ee25f08c5d4d0bf52a2ace02f58841bcd55652db677c7a1dc9a756681e7e32d590bc69d8b93e8f173 -DIST urllib3-1.26.2.tar.gz 286877 BLAKE2B dc5884e2561fae476ba8695cf9e50abb63d8dfc45ad6219d07ba30ecae48e5f27fbdd9a324c0e71f739555c90a3653f18eda513f2ea45b76abcd8c6c714ec0f7 SHA512 4de7cf844ed0deb83c4129e1b1742eafefe95035dd7ffbeaeaaccabca8bd361de9fa240882ea4dec16a7f0b5c5684416656f0d58bea15e7aefd4132024a25c9e DIST urllib3-1.26.3.tar.gz 292598 BLAKE2B 31bcf03debd74a65004484f12c9ad4d71b8c065344f1e377c2f4a695fc0778cf4cb503dbe243133a20d5779ba4bea455213c62aa5dc3815a994acb4e0adf46b6 SHA512 d0dde67880212dc134add3e16e0aa391170963ed26b9a7eb65399235251131ce25488268df7b2f933afc71c9a94e55e08404f9326c0bf5142869dac912d3ee01 +DIST urllib3-1.26.4.tar.gz 293008 BLAKE2B 6ca88861baa87814d3856cd0f1fa0a6cb9e11ee745c782b598c4f5fe74b195ba47e8430b993ed8a5fb269153d700e4a803cd2ebc177e20e3186b3b26612262c7 SHA512 daf2ba432f2e4edaa6aa8c6bdaaea21fcb77cc5fdfd991f89b1f753b4f9901faab04120841e9fa8d93e2bd3d72cbdb647f1492d882266b4e0281c725e8d55a7a EBUILD urllib3-1.25.11.ebuild 1879 BLAKE2B c6a79fb4d9b36011fa0c0602e2853c1f8f289e3e87ce04da163d6c4af39654f8fe47e98c380c9e6f66f749118be3cdf237b66f86eab599fc0c0fc695a26ebdce SHA512 ff5c93995e8dc5c6b4a62e3c8035629ee79db816807a81805bc10dc4b30e51e0ee87fb47f51d13755f1097ccc1c76c26a69a0fe7f432fbd5ea3ac312d2783385 -EBUILD urllib3-1.26.2-r1.ebuild 1988 BLAKE2B 26f5b04b66559676c61460323f2a3a53ebd802581960ee674a76e7a73976f2033540375fbebcfa73b3632ae1c614fc7f649c150a324219031037a84c789b4549 SHA512 edb984d5f3733124863f20d7da469963980b14fa54de736947ddf5109e73aa86d27b9fadb9cd5e7c7bc877d704f56976d829add6880168a10f6aab4a2f5283d7 -EBUILD urllib3-1.26.2-r2.ebuild 1930 BLAKE2B 91598ad9fafe2c16e899efbce7c7d51b918b8b7ca25c421ec10541b2e3198c64d0403e41e06ea3bfb18b5012d943385bd249cb08970ea27015b8dcecf19c0038 SHA512 6d7efbb902fcf41841ae28c8e3a3444d10a6245d7f7014efe5b38c30c7871f730b20423070e6889306d595a369a5114bb7432fe3bb54edb8a18736d0c133af22 -EBUILD urllib3-1.26.2-r3.ebuild 2337 BLAKE2B c2e6a5e27d1859743e802aa67164f40700036034706320841e9dfa26b3c41b9a01045d18c677525f893ffb10ac891f13d37d89fa532aa34353a9148e160c4152 SHA512 a0e37882b07b63dbb10608399893d93de90cbcf97cdb29862121b94ea57176fdb5e50b2f7eb999b0b05ae9264a79ab6d038ca56fefa31588bffeaf379c26be33 -EBUILD urllib3-1.26.2.ebuild 1891 BLAKE2B 323e3851652351ba52778954d3d9731afd4846702049e14497836b250b352b4176daf83f1e4c45d8ab141474df2693dccdfbf4bba371ece5f47f1f351bdcd3db SHA512 e427406ad6efbdf95dc470f3c9864c52c70374bda2958b447770edff68f67f5fd00a2cd91b4c5d79070208d485cc0a6b1b380d3ad153cc1fdc7c96e50d264da4 -EBUILD urllib3-1.26.3-r1.ebuild 2245 BLAKE2B f43196d80fc5b56c121a5cf0b50a265f7d9725bbeb8f05fb63e63fbee63027ff0cc4f2b3dfbb1ad085fac0106ae46e4ede71d402a167b3231056c524292c00a0 SHA512 03d7aa95f3d71ee58827c4d4d30717a51e2e41c15849d621c11265a29df37a23bd1a0c8ab2d65082f98ce5dba965f2801ef43848a6bbfca8ab8ff3d5f9fc74ec +EBUILD urllib3-1.26.3-r1.ebuild 2236 BLAKE2B 1a82ac8ab31b5e3dfd01dac2fc3031b401ba3f1fd64fd796534483970ef9821683de544c1dc7b73c76ef274ceefd447e117ddc8f957ef8f36157863e8ec1334c SHA512 02c8ec9f32621eb34dbcebdd932add480c833a8e261eab52d96c1ed9f3c9df96c4fdc0ddaf4ee62336cc46681560982b69f2121424730284a132538fb134d578 +EBUILD urllib3-1.26.4.ebuild 1930 BLAKE2B 3a84a1ce3c4c409e474c0f7eef48f2e0858ae9034a48355c40f76b15644fbfeb348d58c31d984801fa79d60a5fa72c88427e75cd88fb049411ed6deca2265548 SHA512 2ac8fe4580351db9133005ba5a784a70297dab93b3c2afdcb856bb6fddf06d62e6c455a707e0922494b23cd9cbee21cb48a008ea7a4b955019d937cebe4e2a09 MISC metadata.xml 530 BLAKE2B 148b6a1936566b905f38f00ec231a832e827bbdd4f6c2ceabe521779b08c1dbf60bdfa182234e8e67b6708efadd09d29e93c151f7c3d1d4fcd5ece3e3d9c0839 SHA512 9ab9fa9ecb34855be0f6e7914f70eadca67854fde865765b1257feec6c841bccd8276ad81f8d9bbfb544ca753c3d27681d6cc841cee008efca5ba72f5a236f3e diff --git a/dev-python/urllib3/files/urllib3-1.26.2-byteswarning.patch b/dev-python/urllib3/files/urllib3-1.26.2-byteswarning.patch deleted file mode 100644 index dfa761c5631e..000000000000 --- a/dev-python/urllib3/files/urllib3-1.26.2-byteswarning.patch +++ /dev/null @@ -1,25 +0,0 @@ -From bab9ca9f7148d6a7f15b83cfa1126bf1c8ceb17d Mon Sep 17 00:00:00 2001 -From: Quentin Pradet <quentin@pradet.me> -Date: Tue, 26 Jan 2021 18:04:17 +0400 -Subject: [PATCH] Don't compare bytes and str in putheader() - ---- - src/urllib3/connection.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/urllib3/connection.py b/src/urllib3/connection.py -index 660d679c..387f3770 100644 ---- a/src/urllib3/connection.py -+++ b/src/urllib3/connection.py -@@ -215,7 +215,7 @@ class HTTPConnection(_HTTPConnection, object): - - def putheader(self, header, *values): - """""" -- if SKIP_HEADER not in values: -+ if not any(isinstance(v, str) and v == SKIP_HEADER for v in values): - _HTTPConnection.putheader(self, header, *values) - elif six.ensure_str(header.lower()) not in SKIPPABLE_HEADERS: - raise ValueError( --- -2.30.0 - diff --git a/dev-python/urllib3/files/urllib3-1.26.2-fix-test_proxy_rejection-test-hang.patch b/dev-python/urllib3/files/urllib3-1.26.2-fix-test_proxy_rejection-test-hang.patch deleted file mode 100644 index 2af65e84f016..000000000000 --- a/dev-python/urllib3/files/urllib3-1.26.2-fix-test_proxy_rejection-test-hang.patch +++ /dev/null @@ -1,87 +0,0 @@ -Fixes a hang on test_proxy_rejection. -https://github.com/urllib3/urllib3/commit/087d4de8487379033970898866625c00e0d51c85.patch - -From 087d4de8487379033970898866625c00e0d51c85 Mon Sep 17 00:00:00 2001 -From: Quentin Pradet <quentin.pradet@gmail.com> -Date: Tue, 3 Nov 2020 17:15:50 +0400 -Subject: [PATCH] Fix test_proxy_rejection even with two localhost entries - ---- - test/contrib/test_socks.py | 34 +++++++++++++++++++++++++++++++--- - 1 file changed, 31 insertions(+), 3 deletions(-) - -diff --git a/test/contrib/test_socks.py b/test/contrib/test_socks.py -index 1966513c1..ed716f188 100644 ---- a/test/contrib/test_socks.py -+++ b/test/contrib/test_socks.py -@@ -1,8 +1,12 @@ -+from __future__ import absolute_import -+ - import socket - import threading -+from socket import getaddrinfo as real_getaddrinfo - from test import SHORT_TIMEOUT - - import pytest -+import socks as py_socks - - from dummyserver.server import DEFAULT_CA, DEFAULT_CERTS - from dummyserver.testcase import IPV4SocketDummyServerTestCase -@@ -87,6 +91,26 @@ def _address_from_socket(sock): - raise RuntimeError("Unexpected addr type: %r" % addr_type) - - -+def _set_up_fake_getaddrinfo(monkeypatch): -+ # Work around https://github.com/urllib3/urllib3/pull/2034 -+ # Nothing prevents localhost to point to two different IPs. For example, in the -+ # Ubuntu set up by GitHub Actions, localhost points both to 127.0.0.1 and ::1. -+ # -+ # In case of failure, PySocks will try the same request on both IPs, but our -+ # handle_socks[45]_negotiation functions don't handle retries, which leads either to -+ # a deadlock or a timeout in case of a failure on the first address. -+ # -+ # However, some tests need to exercise failure. We don't want retries there, but -+ # can't affect PySocks retries via its API. Instead, we monkeypatch PySocks so that -+ # it only sees a single address, which effectively disables retries. -+ def fake_getaddrinfo(addr, port, family, socket_type): -+ gai_list = real_getaddrinfo(addr, port, family, socket_type) -+ gai_list = [gai for gai in gai_list if gai[0] == socket.AF_INET] -+ return gai_list[:1] -+ -+ monkeypatch.setattr(py_socks.socket, "getaddrinfo", fake_getaddrinfo) -+ -+ - def handle_socks5_negotiation(sock, negotiate, username=None, password=None): - """ - Handle the SOCKS5 handshake. -@@ -334,7 +358,8 @@ def request_handler(listener): - with pytest.raises(NewConnectionError): - pm.request("GET", "http://example.com", retries=False) - -- def test_proxy_rejection(self): -+ def test_proxy_rejection(self, monkeypatch): -+ _set_up_fake_getaddrinfo(monkeypatch) - evt = threading.Event() - - def request_handler(listener): -@@ -429,7 +454,9 @@ def request_handler(listener): - assert response.data == b"" - assert response.headers["Server"] == "SocksTestServer" - -- def test_socks_with_invalid_password(self): -+ def test_socks_with_invalid_password(self, monkeypatch): -+ _set_up_fake_getaddrinfo(monkeypatch) -+ - def request_handler(listener): - sock = listener.accept()[0] - -@@ -592,7 +619,8 @@ def request_handler(listener): - response = pm.request("GET", "http://example.com") - assert response.status == 200 - -- def test_proxy_rejection(self): -+ def test_proxy_rejection(self, monkeypatch): -+ _set_up_fake_getaddrinfo(monkeypatch) - evt = threading.Event() - - def request_handler(listener): diff --git a/dev-python/urllib3/urllib3-1.26.2-r2.ebuild b/dev-python/urllib3/urllib3-1.26.2-r2.ebuild deleted file mode 100644 index 5d6d29d94f13..000000000000 --- a/dev-python/urllib3/urllib3-1.26.2-r2.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} 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="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos" -IUSE="brotli test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}] - <dev-python/PySocks-2.0[${PYTHON_USEDEP}] - dev-python/certifi[${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}] - brotli? ( dev-python/brotlipy[${PYTHON_USEDEP}] ) -" -BDEPEND=" - test? ( - $(python_gen_cond_dep " - ${RDEPEND} - dev-python/brotlipy[\${PYTHON_USEDEP}] - dev-python/mock[\${PYTHON_USEDEP}] - dev-python/pytest[\${PYTHON_USEDEP}] - dev-python/pytest-freezegun[\${PYTHON_USEDEP}] - >=dev-python/trustme-0.5.3[\${PYTHON_USEDEP}] - >=www-servers/tornado-4.2.1[\${PYTHON_USEDEP}] - " python3_{6,7,8,9}) - ) -" - -PATCHES=( - "${FILESDIR}/${P}-fix-test_proxy_rejection-test-hang.patch" - "${FILESDIR}/${P}-byteswarning.patch" -) - -python_prepare_all() { - # 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_request_host_header_ignores_fqdn_dot:_&:' \ - -i test/with_dummyserver/test_socketlevel.py || die - - distutils-r1_python_prepare_all -} - -python_test() { - local -x CI=1 - # FIXME: get tornado ported - case ${EPYTHON} in - python3*) - pytest -vv || die "Tests fail with ${EPYTHON}" - ;; - esac -} diff --git a/dev-python/urllib3/urllib3-1.26.2-r3.ebuild b/dev-python/urllib3/urllib3-1.26.2-r3.ebuild deleted file mode 100644 index 33e9f7fbf871..000000000000 --- a/dev-python/urllib3/urllib3-1.26.2-r3.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} 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="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="brotli test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}] - <dev-python/PySocks-2.0[${PYTHON_USEDEP}] - dev-python/certifi[${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}] - brotli? ( dev-python/brotlicffi[${PYTHON_USEDEP}] ) -" -BDEPEND=" - test? ( - $(python_gen_cond_dep " - ${RDEPEND} - dev-python/brotlicffi[\${PYTHON_USEDEP}] - dev-python/mock[\${PYTHON_USEDEP}] - dev-python/pytest[\${PYTHON_USEDEP}] - dev-python/pytest-freezegun[\${PYTHON_USEDEP}] - >=dev-python/trustme-0.5.3[\${PYTHON_USEDEP}] - >=www-servers/tornado-4.2.1[\${PYTHON_USEDEP}] - " python3_{6,7,8,9}) - ) -" - -PATCHES=( - "${FILESDIR}/${P}-fix-test_proxy_rejection-test-hang.patch" - "${FILESDIR}/${P}-byteswarning.patch" -) - -python_prepare_all() { - # https://github.com/urllib3/urllib3/issues/1756 - sed -e 's:10.255.255.1:240.0.0.0:' \ - -i test/__init__.py || die - # upstream requires updates to this periodically. seriously?! - sed -e '/RECENT_DATE/s:date(.*):date(2020, 7, 1):' \ - -i src/urllib3/connection.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_request_host_header_ignores_fqdn_dot:_&:' \ - -i test/with_dummyserver/test_socketlevel.py || die - - distutils-r1_python_prepare_all -} - -python_test() { - local -x CI=1 - # FIXME: get tornado ported - [[ ${EPYTHON} == python3* ]] || continue - - local deselect=( - # TODO? - test/with_dummyserver/test_socketlevel.py::TestSocketClosing::test_timeout_errors_cause_retries - ) - - pytest -vv ${deselect[@]/#/--deselect } || - die "Tests fail with ${EPYTHON}" -} diff --git a/dev-python/urllib3/urllib3-1.26.2.ebuild b/dev-python/urllib3/urllib3-1.26.2.ebuild deleted file mode 100644 index 8ccfe1bd51f0..000000000000 --- a/dev-python/urllib3/urllib3-1.26.2.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} 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="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos" -IUSE="brotli test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}] - <dev-python/PySocks-2.0[${PYTHON_USEDEP}] - dev-python/certifi[${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}] - brotli? ( dev-python/brotlipy[${PYTHON_USEDEP}] ) -" -BDEPEND=" - test? ( - $(python_gen_cond_dep " - ${RDEPEND} - dev-python/brotlipy[\${PYTHON_USEDEP}] - dev-python/mock[\${PYTHON_USEDEP}] - dev-python/pytest[\${PYTHON_USEDEP}] - dev-python/pytest-freezegun[\${PYTHON_USEDEP}] - >=dev-python/trustme-0.5.3[\${PYTHON_USEDEP}] - >=www-servers/tornado-4.2.1[\${PYTHON_USEDEP}] - " python3_{6,7,8,9}) - ) -" - -PATCHES=( - "${FILESDIR}/${P}-fix-test_proxy_rejection-test-hang.patch" -) - -python_prepare_all() { - # 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_request_host_header_ignores_fqdn_dot:_&:' \ - -i test/with_dummyserver/test_socketlevel.py || die - - distutils-r1_python_prepare_all -} - -python_test() { - local -x CI=1 - # FIXME: get tornado ported - case ${EPYTHON} in - python3*) - pytest -vv || die "Tests fail with ${EPYTHON}" - ;; - esac -} diff --git a/dev-python/urllib3/urllib3-1.26.3-r1.ebuild b/dev-python/urllib3/urllib3-1.26.3-r1.ebuild index 4917ce1c8286..25ba58bf0bf0 100644 --- a/dev-python/urllib3/urllib3-1.26.3-r1.ebuild +++ b/dev-python/urllib3/urllib3-1.26.3-r1.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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="brotli test" RESTRICT="!test? ( test )" diff --git a/dev-python/urllib3/urllib3-1.26.2-r1.ebuild b/dev-python/urllib3/urllib3-1.26.4.ebuild index fe6cc7704231..3bcb2bb67bd3 100644 --- a/dev-python/urllib3/urllib3-1.26.2-r1.ebuild +++ b/dev-python/urllib3/urllib3-1.26.4.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} pypy3 ) +PYTHON_COMPAT=( python3_{7..9} pypy3 ) PYTHON_REQ_USE="ssl(+)" inherit distutils-r1 @@ -14,17 +14,16 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="brotli test" RESTRICT="!test? ( test )" +# dev-python/{pyopenssl,cryptography,idna,certifi} are optional runtime +# dependencies. Do not add them to RDEPEND. They should be unnecessary with +# modern versions of python (>= 3.2). RDEPEND=" >=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}] <dev-python/PySocks-2.0[${PYTHON_USEDEP}] - dev-python/certifi[${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}] brotli? ( dev-python/brotlicffi[${PYTHON_USEDEP}] ) " BDEPEND=" @@ -41,14 +40,7 @@ BDEPEND=" ) " -PATCHES=( - "${FILESDIR}/${P}-fix-test_proxy_rejection-test-hang.patch" -) - python_prepare_all() { - # 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 @@ -61,9 +53,12 @@ python_prepare_all() { python_test() { local -x CI=1 # FIXME: get tornado ported - case ${EPYTHON} in - python3*) - pytest -vv || die "Tests fail with ${EPYTHON}" - ;; - esac + [[ ${EPYTHON} == python3* ]] || continue + + local deselect=( + # TODO? + test/with_dummyserver/test_socketlevel.py::TestSocketClosing::test_timeout_errors_cause_retries + ) + + epytest ${deselect[@]/#/--deselect } } |