commit: dfd9b99758aa243e6d0f3e950f6ee8cf6fb1f76e Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Thu Aug 15 19:50:29 2019 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Fri Aug 16 13:40:33 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfd9b997
dev-python/urllib3: Clean old up Bug: https://bugs.gentoo.org/683890 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/12719 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-python/urllib3/Manifest | 3 - .../urllib3/files/urllib3-1.23-tornado5.patch | 72 ---------------------- dev-python/urllib3/urllib3-1.22.ebuild | 63 ------------------- dev-python/urllib3/urllib3-1.23.ebuild | 72 ---------------------- dev-python/urllib3/urllib3-1.24.1.ebuild | 67 -------------------- 5 files changed, 277 deletions(-) diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest index 3013380bd0a..233ac6c6a3e 100644 --- a/dev-python/urllib3/Manifest +++ b/dev-python/urllib3/Manifest @@ -1,4 +1 @@ -DIST urllib3-1.22.tar.gz 226083 BLAKE2B 6d3067ea1c9c90e2e759e6319115ed3d29ca1e31c4d1721d7e7aeed432ea4df22635d92fdb9ea91a411bbe67c72160abaa19e0d42870be0b0a866c003db6ec62 SHA512 132b69d7f390916bdcde66d46fbf0189d0c1f976f91778dcb0a9ef8174487b7bb4b37b9139e84f7c70234803be95284448aba0b820f3b54530c0c497ca7a1dc9 -DIST urllib3-1.23.tar.gz 228314 BLAKE2B 63cd0ed046ade8b775067df92f3589bdfa21788481292724ec6af85b5789cc990cd267e1a0dfd925529d147441232a89b4f1b23a1276fc7a68a7047cbf2ae8a4 SHA512 6baa76ad3bebc639d7ec0a042d809fba7ef3110de6164a321756389c250e218728d178708611049d91f39d17f24b8b08585edb2f2c260c987bd4c7204e0c0b5f -DIST urllib3-1.24.1.tar.gz 229688 BLAKE2B ee72e61d417ef266af43b5c4d3eb0b154eac41a392b0a7e9d19523fdb00786b60f8067a8e876c1b7813b127431b1625b1480d9812d623a6d3c540a8ecf646242 SHA512 4c12d08076b0f260727d5aac780f5e9a24e0164755ff05b02a1f5a697876741ff13ba278fdd6e46ef678e8e1146bc39de1fc49ee10ee839229a70540a9424a99 DIST urllib3-1.24.2.tar.gz 230699 BLAKE2B 9c2f2be8fa743f542493d75072c02423d1bd40189561fa0ea393a8a2515b24da9a2a383aeec35b55bdd2a9954d3d585450d759548358ed91ecfdb9ec03d391b6 SHA512 9939e9e7c4da30b5effb334969cd835c9d0404a136761098203c699570aab02e63fb3f1b4ab680def0bc0906fabe5f0782ab94cf3095ff10ccf9b3c371653cf2 diff --git a/dev-python/urllib3/files/urllib3-1.23-tornado5.patch b/dev-python/urllib3/files/urllib3-1.23-tornado5.patch deleted file mode 100644 index b5224564c56..00000000000 --- a/dev-python/urllib3/files/urllib3-1.23-tornado5.patch +++ /dev/null @@ -1,72 +0,0 @@ -From f8c3e96df731eccda202e0dc909f0a51cdc41267 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <[email protected]> -Date: Sat, 14 Jul 2018 12:21:50 +0200 -Subject: [PATCH] dummyserver: Update for tornado-5 API changes - -Tornado 5 has apparently removed support for multiple IOLoops, -and appropriately removed the io_loop parameter to the server class -in favor of using IOLoop.current(). Update the tests to use the latter. -The code remains compatible with tornado-4. ---- - dummyserver/server.py | 9 +++++---- - dummyserver/testcase.py | 4 ++-- - 2 files changed, 7 insertions(+), 6 deletions(-) - -diff --git a/dummyserver/server.py b/dummyserver/server.py -index e1745b7..3ba5124 100755 ---- a/dummyserver/server.py -+++ b/dummyserver/server.py -@@ -226,15 +226,16 @@ def bind_sockets(port, address=None, family=socket.AF_UNSPEC, backlog=128, - - - def run_tornado_app(app, io_loop, certs, scheme, host): -+ assert io_loop == tornado.ioloop.IOLoop.current() -+ - # We can't use fromtimestamp(0) because of CPython issue 29097, so we'll - # just construct the datetime object directly. - app.last_req = datetime(1970, 1, 1) - - if scheme == 'https': -- http_server = tornado.httpserver.HTTPServer(app, ssl_options=certs, -- io_loop=io_loop) -+ http_server = tornado.httpserver.HTTPServer(app, ssl_options=certs) - else: -- http_server = tornado.httpserver.HTTPServer(app, io_loop=io_loop) -+ http_server = tornado.httpserver.HTTPServer(app) - - sockets = bind_sockets(None, address=host) - port = sockets[0].getsockname()[1] -@@ -268,7 +269,7 @@ if __name__ == '__main__': - from .testcase import TestingApp - host = '127.0.0.1' - -- io_loop = tornado.ioloop.IOLoop() -+ io_loop = tornado.ioloop.IOLoop.current() - app = tornado.web.Application([(r".*", TestingApp)]) - server, port = run_tornado_app(app, io_loop, None, - 'http', host) -diff --git a/dummyserver/testcase.py b/dummyserver/testcase.py -index f73f028..d9ff8cf 100644 ---- a/dummyserver/testcase.py -+++ b/dummyserver/testcase.py -@@ -124,7 +124,7 @@ class HTTPDummyServerTestCase(unittest.TestCase): - - @classmethod - def _start_server(cls): -- cls.io_loop = ioloop.IOLoop() -+ cls.io_loop = ioloop.IOLoop.current() - app = web.Application([(r".*", TestingApp)]) - cls.server, cls.port = run_tornado_app(app, cls.io_loop, cls.certs, - cls.scheme, cls.host) -@@ -170,7 +170,7 @@ class HTTPDummyProxyTestCase(unittest.TestCase): - - @classmethod - def setUpClass(cls): -- cls.io_loop = ioloop.IOLoop() -+ cls.io_loop = ioloop.IOLoop.current() - - app = web.Application([(r'.*', TestingApp)]) - cls.http_server, cls.http_port = run_tornado_app( --- -2.18.0 - diff --git a/dev-python/urllib3/urllib3-1.22.ebuild b/dev-python/urllib3/urllib3-1.22.ebuild deleted file mode 100644 index 3536bcedb1e..00000000000 --- a/dev-python/urllib3/urllib3-1.22.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{5,6} pypy{,3} ) -PYTHON_REQ_USE="ssl(+)" - -inherit distutils-r1 - -DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more" -HOMEPAGE="https://github.com/shazow/urllib3"; -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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" -IUSE="doc test" -RESTRICT="test" - -RDEPEND=" - >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}] - !~dev-python/PySocks-1.5.7[${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}] - virtual/python-ipaddress[${PYTHON_USEDEP}] -" -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - ${RDEPEND} - >=www-servers/tornado-4.2.1[$(python_gen_usedep 'python*')] - >=dev-python/mock-1.3.0[${PYTHON_USEDEP}] - >=dev-python/nose-1.3.7[${PYTHON_USEDEP}] - >=dev-python/nose-exclude-0.4.1[${PYTHON_USEDEP}] - ) - doc? ( - dev-python/mock[${PYTHON_USEDEP}] - dev-python/sphinx[${PYTHON_USEDEP}] - ) -" - -# Testsuite written requiring mock to be installed under all Cpythons - -python_compile_all() { - use doc && emake -C docs SPHINXOPTS= html -} - -python_test() { - # FIXME: get tornado ported - if [[ ${EPYTHON} == python* ]]; then - nosetests -v test || die "Testing failed with ${EPYTHON}" - fi -} - -python_install_all() { - use doc && local HTML_DOCS=( docs/_build/html/. ) - - distutils-r1_python_install_all -} diff --git a/dev-python/urllib3/urllib3-1.23.ebuild b/dev-python/urllib3/urllib3-1.23.ebuild deleted file mode 100644 index 2d6c9670697..00000000000 --- a/dev-python/urllib3/urllib3-1.23.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} ) -PYTHON_REQ_USE="ssl(+)" - -inherit distutils-r1 - -DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more" -HOMEPAGE="https://github.com/shazow/urllib3"; -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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc test" -#RESTRICT="test" - -RDEPEND=" - >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}] - !~dev-python/PySocks-1.5.7[${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}] - virtual/python-ipaddress[${PYTHON_USEDEP}] -" -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - ${RDEPEND} - >=www-servers/tornado-4.2.1[$(python_gen_usedep 'python*')] - dev-python/pytest[${PYTHON_USEDEP}] - ) - doc? ( - dev-python/mock[${PYTHON_USEDEP}] - dev-python/sphinx[${PYTHON_USEDEP}] - ) -" - -# Testsuite written requiring mock to be installed under all Cpythons - -python_prepare_all() { - local PATCHES=( - # support tornado-5 - "${FILESDIR}"/urllib3-1.23-tornado5.patch - ) - - # skip appengine tests - rm -r test/appengine || die - - distutils-r1_python_prepare_all -} - -python_compile_all() { - use doc && emake -C docs SPHINXOPTS= html -} - -python_test() { - # FIXME: get tornado ported - if [[ ${EPYTHON} == python* ]]; then - py.test -v || die "Tests fail with ${EPYTHON}" - fi -} - -python_install_all() { - use doc && local HTML_DOCS=( docs/_build/html/. ) - distutils-r1_python_install_all -} diff --git a/dev-python/urllib3/urllib3-1.24.1.ebuild b/dev-python/urllib3/urllib3-1.24.1.ebuild deleted file mode 100644 index 08d3d35b05c..00000000000 --- a/dev-python/urllib3/urllib3-1.24.1.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} ) -PYTHON_REQ_USE="ssl(+)" - -inherit distutils-r1 - -DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more" -HOMEPAGE="https://github.com/shazow/urllib3"; -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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc test" -#RESTRICT="test" - -RDEPEND=" - >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}] - !~dev-python/PySocks-1.5.7[${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}] - virtual/python-ipaddress[${PYTHON_USEDEP}] -" -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - ${RDEPEND} - >=www-servers/tornado-4.2.1[$(python_gen_usedep 'python*')] - dev-python/pytest[${PYTHON_USEDEP}] - ) - doc? ( - dev-python/mock[${PYTHON_USEDEP}] - dev-python/sphinx[${PYTHON_USEDEP}] - ) -" - -# Testsuite written requiring mock to be installed under all Cpythons - -python_prepare_all() { - # skip appengine tests - rm -r test/appengine || die - - distutils-r1_python_prepare_all -} - -python_compile_all() { - use doc && emake -C docs SPHINXOPTS= html -} - -python_test() { - # FIXME: get tornado ported - if [[ ${EPYTHON} == python* ]]; then - py.test -v || die "Tests fail with ${EPYTHON}" - fi -} - -python_install_all() { - use doc && local HTML_DOCS=( docs/_build/html/. ) - distutils-r1_python_install_all -}
