1 |
commit: dfd9b99758aa243e6d0f3e950f6ee8cf6fb1f76e |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Aug 15 19:50:29 2019 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Aug 16 13:40:33 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfd9b997 |
7 |
|
8 |
dev-python/urllib3: Clean old up |
9 |
|
10 |
Bug: https://bugs.gentoo.org/683890 |
11 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
12 |
Closes: https://github.com/gentoo/gentoo/pull/12719 |
13 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
14 |
|
15 |
dev-python/urllib3/Manifest | 3 - |
16 |
.../urllib3/files/urllib3-1.23-tornado5.patch | 72 ---------------------- |
17 |
dev-python/urllib3/urllib3-1.22.ebuild | 63 ------------------- |
18 |
dev-python/urllib3/urllib3-1.23.ebuild | 72 ---------------------- |
19 |
dev-python/urllib3/urllib3-1.24.1.ebuild | 67 -------------------- |
20 |
5 files changed, 277 deletions(-) |
21 |
|
22 |
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest |
23 |
index 3013380bd0a..233ac6c6a3e 100644 |
24 |
--- a/dev-python/urllib3/Manifest |
25 |
+++ b/dev-python/urllib3/Manifest |
26 |
@@ -1,4 +1 @@ |
27 |
-DIST urllib3-1.22.tar.gz 226083 BLAKE2B 6d3067ea1c9c90e2e759e6319115ed3d29ca1e31c4d1721d7e7aeed432ea4df22635d92fdb9ea91a411bbe67c72160abaa19e0d42870be0b0a866c003db6ec62 SHA512 132b69d7f390916bdcde66d46fbf0189d0c1f976f91778dcb0a9ef8174487b7bb4b37b9139e84f7c70234803be95284448aba0b820f3b54530c0c497ca7a1dc9 |
28 |
-DIST urllib3-1.23.tar.gz 228314 BLAKE2B 63cd0ed046ade8b775067df92f3589bdfa21788481292724ec6af85b5789cc990cd267e1a0dfd925529d147441232a89b4f1b23a1276fc7a68a7047cbf2ae8a4 SHA512 6baa76ad3bebc639d7ec0a042d809fba7ef3110de6164a321756389c250e218728d178708611049d91f39d17f24b8b08585edb2f2c260c987bd4c7204e0c0b5f |
29 |
-DIST urllib3-1.24.1.tar.gz 229688 BLAKE2B ee72e61d417ef266af43b5c4d3eb0b154eac41a392b0a7e9d19523fdb00786b60f8067a8e876c1b7813b127431b1625b1480d9812d623a6d3c540a8ecf646242 SHA512 4c12d08076b0f260727d5aac780f5e9a24e0164755ff05b02a1f5a697876741ff13ba278fdd6e46ef678e8e1146bc39de1fc49ee10ee839229a70540a9424a99 |
30 |
DIST urllib3-1.24.2.tar.gz 230699 BLAKE2B 9c2f2be8fa743f542493d75072c02423d1bd40189561fa0ea393a8a2515b24da9a2a383aeec35b55bdd2a9954d3d585450d759548358ed91ecfdb9ec03d391b6 SHA512 9939e9e7c4da30b5effb334969cd835c9d0404a136761098203c699570aab02e63fb3f1b4ab680def0bc0906fabe5f0782ab94cf3095ff10ccf9b3c371653cf2 |
31 |
|
32 |
diff --git a/dev-python/urllib3/files/urllib3-1.23-tornado5.patch b/dev-python/urllib3/files/urllib3-1.23-tornado5.patch |
33 |
deleted file mode 100644 |
34 |
index b5224564c56..00000000000 |
35 |
--- a/dev-python/urllib3/files/urllib3-1.23-tornado5.patch |
36 |
+++ /dev/null |
37 |
@@ -1,72 +0,0 @@ |
38 |
-From f8c3e96df731eccda202e0dc909f0a51cdc41267 Mon Sep 17 00:00:00 2001 |
39 |
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o> |
40 |
-Date: Sat, 14 Jul 2018 12:21:50 +0200 |
41 |
-Subject: [PATCH] dummyserver: Update for tornado-5 API changes |
42 |
- |
43 |
-Tornado 5 has apparently removed support for multiple IOLoops, |
44 |
-and appropriately removed the io_loop parameter to the server class |
45 |
-in favor of using IOLoop.current(). Update the tests to use the latter. |
46 |
-The code remains compatible with tornado-4. |
47 |
---- |
48 |
- dummyserver/server.py | 9 +++++---- |
49 |
- dummyserver/testcase.py | 4 ++-- |
50 |
- 2 files changed, 7 insertions(+), 6 deletions(-) |
51 |
- |
52 |
-diff --git a/dummyserver/server.py b/dummyserver/server.py |
53 |
-index e1745b7..3ba5124 100755 |
54 |
---- a/dummyserver/server.py |
55 |
-+++ b/dummyserver/server.py |
56 |
-@@ -226,15 +226,16 @@ def bind_sockets(port, address=None, family=socket.AF_UNSPEC, backlog=128, |
57 |
- |
58 |
- |
59 |
- def run_tornado_app(app, io_loop, certs, scheme, host): |
60 |
-+ assert io_loop == tornado.ioloop.IOLoop.current() |
61 |
-+ |
62 |
- # We can't use fromtimestamp(0) because of CPython issue 29097, so we'll |
63 |
- # just construct the datetime object directly. |
64 |
- app.last_req = datetime(1970, 1, 1) |
65 |
- |
66 |
- if scheme == 'https': |
67 |
-- http_server = tornado.httpserver.HTTPServer(app, ssl_options=certs, |
68 |
-- io_loop=io_loop) |
69 |
-+ http_server = tornado.httpserver.HTTPServer(app, ssl_options=certs) |
70 |
- else: |
71 |
-- http_server = tornado.httpserver.HTTPServer(app, io_loop=io_loop) |
72 |
-+ http_server = tornado.httpserver.HTTPServer(app) |
73 |
- |
74 |
- sockets = bind_sockets(None, address=host) |
75 |
- port = sockets[0].getsockname()[1] |
76 |
-@@ -268,7 +269,7 @@ if __name__ == '__main__': |
77 |
- from .testcase import TestingApp |
78 |
- host = '127.0.0.1' |
79 |
- |
80 |
-- io_loop = tornado.ioloop.IOLoop() |
81 |
-+ io_loop = tornado.ioloop.IOLoop.current() |
82 |
- app = tornado.web.Application([(r".*", TestingApp)]) |
83 |
- server, port = run_tornado_app(app, io_loop, None, |
84 |
- 'http', host) |
85 |
-diff --git a/dummyserver/testcase.py b/dummyserver/testcase.py |
86 |
-index f73f028..d9ff8cf 100644 |
87 |
---- a/dummyserver/testcase.py |
88 |
-+++ b/dummyserver/testcase.py |
89 |
-@@ -124,7 +124,7 @@ class HTTPDummyServerTestCase(unittest.TestCase): |
90 |
- |
91 |
- @classmethod |
92 |
- def _start_server(cls): |
93 |
-- cls.io_loop = ioloop.IOLoop() |
94 |
-+ cls.io_loop = ioloop.IOLoop.current() |
95 |
- app = web.Application([(r".*", TestingApp)]) |
96 |
- cls.server, cls.port = run_tornado_app(app, cls.io_loop, cls.certs, |
97 |
- cls.scheme, cls.host) |
98 |
-@@ -170,7 +170,7 @@ class HTTPDummyProxyTestCase(unittest.TestCase): |
99 |
- |
100 |
- @classmethod |
101 |
- def setUpClass(cls): |
102 |
-- cls.io_loop = ioloop.IOLoop() |
103 |
-+ cls.io_loop = ioloop.IOLoop.current() |
104 |
- |
105 |
- app = web.Application([(r'.*', TestingApp)]) |
106 |
- cls.http_server, cls.http_port = run_tornado_app( |
107 |
--- |
108 |
-2.18.0 |
109 |
- |
110 |
|
111 |
diff --git a/dev-python/urllib3/urllib3-1.22.ebuild b/dev-python/urllib3/urllib3-1.22.ebuild |
112 |
deleted file mode 100644 |
113 |
index 3536bcedb1e..00000000000 |
114 |
--- a/dev-python/urllib3/urllib3-1.22.ebuild |
115 |
+++ /dev/null |
116 |
@@ -1,63 +0,0 @@ |
117 |
-# Copyright 1999-2019 Gentoo Authors |
118 |
-# Distributed under the terms of the GNU General Public License v2 |
119 |
- |
120 |
-EAPI=6 |
121 |
- |
122 |
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy{,3} ) |
123 |
-PYTHON_REQ_USE="ssl(+)" |
124 |
- |
125 |
-inherit distutils-r1 |
126 |
- |
127 |
-DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more" |
128 |
-HOMEPAGE="https://github.com/shazow/urllib3" |
129 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
130 |
- |
131 |
-LICENSE="MIT" |
132 |
-SLOT="0" |
133 |
-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" |
134 |
-IUSE="doc test" |
135 |
-RESTRICT="test" |
136 |
- |
137 |
-RDEPEND=" |
138 |
- >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}] |
139 |
- !~dev-python/PySocks-1.5.7[${PYTHON_USEDEP}] |
140 |
- <dev-python/PySocks-2.0[${PYTHON_USEDEP}] |
141 |
- dev-python/certifi[${PYTHON_USEDEP}] |
142 |
- >=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}] |
143 |
- >=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}] |
144 |
- >=dev-python/idna-2.0.0[${PYTHON_USEDEP}] |
145 |
- virtual/python-ipaddress[${PYTHON_USEDEP}] |
146 |
-" |
147 |
-DEPEND=" |
148 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
149 |
- test? ( |
150 |
- ${RDEPEND} |
151 |
- >=www-servers/tornado-4.2.1[$(python_gen_usedep 'python*')] |
152 |
- >=dev-python/mock-1.3.0[${PYTHON_USEDEP}] |
153 |
- >=dev-python/nose-1.3.7[${PYTHON_USEDEP}] |
154 |
- >=dev-python/nose-exclude-0.4.1[${PYTHON_USEDEP}] |
155 |
- ) |
156 |
- doc? ( |
157 |
- dev-python/mock[${PYTHON_USEDEP}] |
158 |
- dev-python/sphinx[${PYTHON_USEDEP}] |
159 |
- ) |
160 |
-" |
161 |
- |
162 |
-# Testsuite written requiring mock to be installed under all Cpythons |
163 |
- |
164 |
-python_compile_all() { |
165 |
- use doc && emake -C docs SPHINXOPTS= html |
166 |
-} |
167 |
- |
168 |
-python_test() { |
169 |
- # FIXME: get tornado ported |
170 |
- if [[ ${EPYTHON} == python* ]]; then |
171 |
- nosetests -v test || die "Testing failed with ${EPYTHON}" |
172 |
- fi |
173 |
-} |
174 |
- |
175 |
-python_install_all() { |
176 |
- use doc && local HTML_DOCS=( docs/_build/html/. ) |
177 |
- |
178 |
- distutils-r1_python_install_all |
179 |
-} |
180 |
|
181 |
diff --git a/dev-python/urllib3/urllib3-1.23.ebuild b/dev-python/urllib3/urllib3-1.23.ebuild |
182 |
deleted file mode 100644 |
183 |
index 2d6c9670697..00000000000 |
184 |
--- a/dev-python/urllib3/urllib3-1.23.ebuild |
185 |
+++ /dev/null |
186 |
@@ -1,72 +0,0 @@ |
187 |
-# Copyright 1999-2019 Gentoo Authors |
188 |
-# Distributed under the terms of the GNU General Public License v2 |
189 |
- |
190 |
-EAPI=6 |
191 |
- |
192 |
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} ) |
193 |
-PYTHON_REQ_USE="ssl(+)" |
194 |
- |
195 |
-inherit distutils-r1 |
196 |
- |
197 |
-DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more" |
198 |
-HOMEPAGE="https://github.com/shazow/urllib3" |
199 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
200 |
- |
201 |
-LICENSE="MIT" |
202 |
-SLOT="0" |
203 |
-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" |
204 |
-IUSE="doc test" |
205 |
-#RESTRICT="test" |
206 |
- |
207 |
-RDEPEND=" |
208 |
- >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}] |
209 |
- !~dev-python/PySocks-1.5.7[${PYTHON_USEDEP}] |
210 |
- <dev-python/PySocks-2.0[${PYTHON_USEDEP}] |
211 |
- dev-python/certifi[${PYTHON_USEDEP}] |
212 |
- >=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}] |
213 |
- >=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}] |
214 |
- >=dev-python/idna-2.0.0[${PYTHON_USEDEP}] |
215 |
- virtual/python-ipaddress[${PYTHON_USEDEP}] |
216 |
-" |
217 |
-DEPEND=" |
218 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
219 |
- test? ( |
220 |
- ${RDEPEND} |
221 |
- >=www-servers/tornado-4.2.1[$(python_gen_usedep 'python*')] |
222 |
- dev-python/pytest[${PYTHON_USEDEP}] |
223 |
- ) |
224 |
- doc? ( |
225 |
- dev-python/mock[${PYTHON_USEDEP}] |
226 |
- dev-python/sphinx[${PYTHON_USEDEP}] |
227 |
- ) |
228 |
-" |
229 |
- |
230 |
-# Testsuite written requiring mock to be installed under all Cpythons |
231 |
- |
232 |
-python_prepare_all() { |
233 |
- local PATCHES=( |
234 |
- # support tornado-5 |
235 |
- "${FILESDIR}"/urllib3-1.23-tornado5.patch |
236 |
- ) |
237 |
- |
238 |
- # skip appengine tests |
239 |
- rm -r test/appengine || die |
240 |
- |
241 |
- distutils-r1_python_prepare_all |
242 |
-} |
243 |
- |
244 |
-python_compile_all() { |
245 |
- use doc && emake -C docs SPHINXOPTS= html |
246 |
-} |
247 |
- |
248 |
-python_test() { |
249 |
- # FIXME: get tornado ported |
250 |
- if [[ ${EPYTHON} == python* ]]; then |
251 |
- py.test -v || die "Tests fail with ${EPYTHON}" |
252 |
- fi |
253 |
-} |
254 |
- |
255 |
-python_install_all() { |
256 |
- use doc && local HTML_DOCS=( docs/_build/html/. ) |
257 |
- distutils-r1_python_install_all |
258 |
-} |
259 |
|
260 |
diff --git a/dev-python/urllib3/urllib3-1.24.1.ebuild b/dev-python/urllib3/urllib3-1.24.1.ebuild |
261 |
deleted file mode 100644 |
262 |
index 08d3d35b05c..00000000000 |
263 |
--- a/dev-python/urllib3/urllib3-1.24.1.ebuild |
264 |
+++ /dev/null |
265 |
@@ -1,67 +0,0 @@ |
266 |
-# Copyright 1999-2019 Gentoo Authors |
267 |
-# Distributed under the terms of the GNU General Public License v2 |
268 |
- |
269 |
-EAPI=6 |
270 |
- |
271 |
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} ) |
272 |
-PYTHON_REQ_USE="ssl(+)" |
273 |
- |
274 |
-inherit distutils-r1 |
275 |
- |
276 |
-DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more" |
277 |
-HOMEPAGE="https://github.com/shazow/urllib3" |
278 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
279 |
- |
280 |
-LICENSE="MIT" |
281 |
-SLOT="0" |
282 |
-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" |
283 |
-IUSE="doc test" |
284 |
-#RESTRICT="test" |
285 |
- |
286 |
-RDEPEND=" |
287 |
- >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}] |
288 |
- !~dev-python/PySocks-1.5.7[${PYTHON_USEDEP}] |
289 |
- <dev-python/PySocks-2.0[${PYTHON_USEDEP}] |
290 |
- dev-python/certifi[${PYTHON_USEDEP}] |
291 |
- >=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}] |
292 |
- >=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}] |
293 |
- >=dev-python/idna-2.0.0[${PYTHON_USEDEP}] |
294 |
- virtual/python-ipaddress[${PYTHON_USEDEP}] |
295 |
-" |
296 |
-DEPEND=" |
297 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
298 |
- test? ( |
299 |
- ${RDEPEND} |
300 |
- >=www-servers/tornado-4.2.1[$(python_gen_usedep 'python*')] |
301 |
- dev-python/pytest[${PYTHON_USEDEP}] |
302 |
- ) |
303 |
- doc? ( |
304 |
- dev-python/mock[${PYTHON_USEDEP}] |
305 |
- dev-python/sphinx[${PYTHON_USEDEP}] |
306 |
- ) |
307 |
-" |
308 |
- |
309 |
-# Testsuite written requiring mock to be installed under all Cpythons |
310 |
- |
311 |
-python_prepare_all() { |
312 |
- # skip appengine tests |
313 |
- rm -r test/appengine || die |
314 |
- |
315 |
- distutils-r1_python_prepare_all |
316 |
-} |
317 |
- |
318 |
-python_compile_all() { |
319 |
- use doc && emake -C docs SPHINXOPTS= html |
320 |
-} |
321 |
- |
322 |
-python_test() { |
323 |
- # FIXME: get tornado ported |
324 |
- if [[ ${EPYTHON} == python* ]]; then |
325 |
- py.test -v || die "Tests fail with ${EPYTHON}" |
326 |
- fi |
327 |
-} |
328 |
- |
329 |
-python_install_all() { |
330 |
- use doc && local HTML_DOCS=( docs/_build/html/. ) |
331 |
- distutils-r1_python_install_all |
332 |
-} |