From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Aug 2020 10:45:55 +0100 Subject: gentoo resync : 25.08.2020 --- dev-python/urllib3/Manifest | 8 +-- dev-python/urllib3/metadata.xml | 1 + dev-python/urllib3/urllib3-1.25.10.ebuild | 76 +++++++++++++++++++++++++++ dev-python/urllib3/urllib3-1.25.8.ebuild | 85 ------------------------------- dev-python/urllib3/urllib3-1.25.9.ebuild | 2 +- 5 files changed, 82 insertions(+), 90 deletions(-) create mode 100644 dev-python/urllib3/urllib3-1.25.10.ebuild delete mode 100644 dev-python/urllib3/urllib3-1.25.8.ebuild (limited to 'dev-python/urllib3') diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest index 16134f42e692..ccd4c3c230c0 100644 --- a/dev-python/urllib3/Manifest +++ b/dev-python/urllib3/Manifest @@ -1,7 +1,7 @@ DIST urllib3-1.24.2.tar.gz 230699 BLAKE2B 9c2f2be8fa743f542493d75072c02423d1bd40189561fa0ea393a8a2515b24da9a2a383aeec35b55bdd2a9954d3d585450d759548358ed91ecfdb9ec03d391b6 SHA512 9939e9e7c4da30b5effb334969cd835c9d0404a136761098203c699570aab02e63fb3f1b4ab680def0bc0906fabe5f0782ab94cf3095ff10ccf9b3c371653cf2 -DIST urllib3-1.25.8.tar.gz 261077 BLAKE2B 9625c8bce484e3a0ae8b49a776377d5420a496652d75220438f8f9cfbfa96c22a6fbea29380f45f18d8620d14568056dcb3e8b6a08fe711085298d2f6b2ea870 SHA512 6e380d98d9a8b06534abfab4eb67b685a8311a091e31adcefe2b0ffc61d2b728229df067790b20358f2646e9054a546450c3351e4aa618f31d85573ea50ceaa2 +DIST urllib3-1.25.10.tar.gz 256875 BLAKE2B 3f2ad2cb3ac9a09f73c1ec03e89aa7313055afa443c53ec82fd9227348859566e20ca33b803972134be24eeed070c63b98e6ae75efde4006e2a4bb7b4cf3f054 SHA512 5718dab472a476bfd555753758ceef46c81dc358131205b6db05d186a66f397dc07252eda1622d12586390ccf14e8e17acdb9486c17cb7d34e323287a67373af DIST urllib3-1.25.9.tar.gz 254921 BLAKE2B bd78d7a1de71ffe3b1f62352bb49f94fd402870f57e86ae07ea5462706c19b0ae1f8e23a7e8a4a83482b57e007cb95f5ae242d179cec7e9568fcb440b9d95b82 SHA512 505f1d9137e469a48ee0de417f2be36946cf1d9bbcf1233280be399a6c6d8650b5b3c6cfcf884b04e0156974da703f48843381b9aab377738a2e60f7d2d3799b EBUILD urllib3-1.24.2.ebuild 1786 BLAKE2B 3c413607941e08872efa7f4f598e69d6a858adea7505b183ae2efeb7bf418edf8b06fbd04d0f3aa640a50f9ee18616f8b5186f382fb8fc6f250a667348c7d088 SHA512 4f217cb09fc22adb26371a336d42c274be4ca2aa1e8ea5404b8ac97f573b7d7f6c577b8e12a5f9281e1df39e4967614c8f9d9aa626c3544bef20c86053f1a95e -EBUILD urllib3-1.25.8.ebuild 2536 BLAKE2B 1a5167611d39195efd2367a47f709e4e0350f879a27f90ef4ede33fc5c167aabd1b3cfca4e24177649e2a1b12cbb1924860d2ee930bc683d581dd3d857d7be3f SHA512 c257bc9443f3f5464c5d33a79cace27e9305bfbc2b1c2e374a46613cd5d926acf24b298bb79b4fe55a30ea816f6b41f8f9fd3b16fbe129b96e48e45e8ec2af4e -EBUILD urllib3-1.25.9.ebuild 2108 BLAKE2B baf4fc80008da78cbecfdbd23bf43eda778c04df3aa4b833c8da23505a1e01ce2844e719c917715ac5c2ec5f9fdee8120cc25fd4c32e81da745489fd05a431c1 SHA512 56e0175d192771e81513167872a0df697ed6fab1ffad6447e6ec11659656b3d2052e117290c829a2202d7839c439cfa1a0792c2cfb27bea0dd410e859cc2165b -MISC metadata.xml 523 BLAKE2B b5104cb8130aa670af99f36a2853f4ccbe78f367d5e80a3626a5323237af5f7da1ba6fa5d83586afa1072753f63d918197aa97a578f7e2f1faa82f457c7947a9 SHA512 3c384cd1d75e038ba7b7d3aee93f2f9cc05b61710cd6f45f2f250392994caa253b6c783ce5f321dc72a94e1e94e12527a229d652920492637dfca4eb7b13c457 +EBUILD urllib3-1.25.10.ebuild 2114 BLAKE2B 94beae886893b2e331b28b0cbe14b98dc1346a0a60aaa2e845252438599b1c39f4cc70f965531bc2b8a49ebeb397390226dda0eff10af1a88f664d287da96940 SHA512 a16b329a40683179c291f13f9c97b5be28dd10767a04f927cbb10a2f93f624bc7720fd4e784826ed68db1021a20de70451833d23f5d0ed6c1afb47c542866841 +EBUILD urllib3-1.25.9.ebuild 2106 BLAKE2B 365be3ed3d45043b7f2bb1f8c414570d412273c879984c1d9ab41f486f0e8a39867414f0d11afb0758f7620086da92ff134739852de82cd3bc5af2b7e094e164 SHA512 3c9b415e8aaf9ea37d7ba4643ce5efef645d4e00b4c687295eb3057acb9e95e4dd23043107a269bb64b21e78dfe991e55129bf7f707a5d0684793fa441868a79 +MISC metadata.xml 548 BLAKE2B 47edce866bd0c727c4b945630c97f2944c34f8e81c43bdbe57e28c4859dd3e681c64eb2d3b75101ad41c85587890ddbc819a2fd04188331dd5fad23a1d9d0ba9 SHA512 014f625e8de5ea3f00628fe360db47dde9dc82efd0b11218b4118a20b7638bd4e6ac14253888073740c0dca4a19a196567cc2af1864d52f3e1c959389c77c9d2 diff --git a/dev-python/urllib3/metadata.xml b/dev-python/urllib3/metadata.xml index b3b12e9ba782..c5e3b54263ca 100644 --- a/dev-python/urllib3/metadata.xml +++ b/dev-python/urllib3/metadata.xml @@ -5,6 +5,7 @@ python@gentoo.org Python + Enable support for brotli compression diff --git a/dev-python/urllib3/urllib3-1.25.10.ebuild b/dev-python/urllib3/urllib3-1.25.10.ebuild new file mode 100644 index 000000000000..e724f3938f78 --- /dev/null +++ b/dev-python/urllib3/urllib3-1.25.10.ebuild @@ -0,0 +1,76 @@ +# 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,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 ~ppc ~ppc64 ~s390 ~sparc ~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}] + $(python_gen_cond_dep ' + dev-python/ipaddress[${PYTHON_USEDEP}] + ' -2) + 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/trustme-0.5.3[\${PYTHON_USEDEP}] + >=www-servers/tornado-4.2.1[\${PYTHON_USEDEP}] + " python3_{6,7,8,9}) + ) +" + +distutils_enable_sphinx docs \ + dev-python/alabaster \ + dev-python/mock + +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 + 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.8.ebuild b/dev-python/urllib3/urllib3-1.25.8.ebuild deleted file mode 100644 index 06d98f955dbd..000000000000 --- a/dev-python/urllib3/urllib3-1.25.8.ebuild +++ /dev/null @@ -1,85 +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="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc 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}] - $(python_gen_cond_dep ' - dev-python/ipaddress[${PYTHON_USEDEP}] - ' -2) - brotli? ( dev-python/brotlipy[${PYTHON_USEDEP}] ) -" -BDEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - $(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*') - ) -" - -distutils_enable_sphinx docs \ - dev-python/alabaster \ - dev-python/mock - -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 - # 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_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() { - local -x CI=1 - # FIXME: get tornado ported - case ${EPYTHON} in - 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.9.ebuild b/dev-python/urllib3/urllib3-1.25.9.ebuild index a3c2ed92451e..7281a44b4413 100644 --- a/dev-python/urllib3/urllib3-1.25.9.ebuild +++ b/dev-python/urllib3/urllib3-1.25.9.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 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="brotli test" RESTRICT="!test? ( test )" -- cgit v1.2.3