1 |
commit: 5e7f79ca19a545aa0489e2b6c1df63008a772719 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jan 6 13:49:45 2018 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 6 14:13:23 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e7f79ca |
7 |
|
8 |
dev-python/urllib3: Clean old up |
9 |
|
10 |
dev-python/urllib3/Manifest | 3 - |
11 |
.../urllib3/files/urllib3-1.16.0-unbundle.patch | 17 ---- |
12 |
dev-python/urllib3/urllib3-1.12.ebuild | 88 ---------------- |
13 |
dev-python/urllib3/urllib3-1.16.ebuild | 113 --------------------- |
14 |
dev-python/urllib3/urllib3-1.20.ebuild | 61 ----------- |
15 |
5 files changed, 282 deletions(-) |
16 |
|
17 |
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest |
18 |
index 6c53f5a0983..dda22c47eda 100644 |
19 |
--- a/dev-python/urllib3/Manifest |
20 |
+++ b/dev-python/urllib3/Manifest |
21 |
@@ -1,5 +1,2 @@ |
22 |
-DIST urllib3-1.12.tar.gz 151072 BLAKE2B 28ea69d758103d82498f85dbc3ade097503445215c4be48d33ef5fcc3c432f25fc33b2aa6fe44ad052722be163a883253fc8585ed8f06e5bcec3b50ce9066f6e SHA512 44f1cf9c5d5538e35d026551a2d1dc7119786c1148b9a769fa9f652f0368e996512962c6245c92d1f4bb1d8e816e2fb0ffebeb0060b01f92b2a5d6e01d15426f |
23 |
-DIST urllib3-1.16.tar.gz 179763 BLAKE2B 5dd8d988671c2d0ad64351da7f6824e2c87134694f973b8d970f09d18f7688150d1e29c61f679c1fa9cffb90f564a355bc0b4333f00b0e08866f4daa157a7c7f SHA512 646b35a9a4490b2d1f068883a29cbb5be5050a6eea7bb7842f77cd666b7f88101a7612e8eb45ae0eb900d914518db5202f548ab688b8db1c20ed248ba2edac66 |
24 |
-DIST urllib3-1.20.tar.gz 201873 BLAKE2B 5c08abee5353ad17efc3396418f2322d0841c972d7e0d749057dee9f7b3ec6c414692f892cac026edc98ffd5ded430bbdfbdeecbfa8cac413dc147a984f4aadb SHA512 5e2c960ad8641b7e7faf3df966ceb5a2fbb898d9fb4d4459ba607448bab096e3d5df6bc42fdf5fbc2ea58fb6199ba3eb16613b63fd109401d6a2b6e46aade6c3 |
25 |
DIST urllib3-1.21.1.tar.gz 224266 BLAKE2B 35f521698c0b05fc9122650dde5ac00954eb2ad99ea3771d2a9e4fcb210b404a8173ee369f46b5e61ef7104621571386ad114c833522748b96294a87d0afa601 SHA512 0d2e9c2a0b895e4e232cad5ecc645ea9fd9b70191df045a220ee1f32e284c613c6790bcdfd9e40a22ea9d25ec397278fa700a3c3747e7b04222719d50df07859 |
26 |
DIST urllib3-1.22.tar.gz 226083 BLAKE2B 6d3067ea1c9c90e2e759e6319115ed3d29ca1e31c4d1721d7e7aeed432ea4df22635d92fdb9ea91a411bbe67c72160abaa19e0d42870be0b0a866c003db6ec62 SHA512 132b69d7f390916bdcde66d46fbf0189d0c1f976f91778dcb0a9ef8174487b7bb4b37b9139e84f7c70234803be95284448aba0b820f3b54530c0c497ca7a1dc9 |
27 |
|
28 |
diff --git a/dev-python/urllib3/files/urllib3-1.16.0-unbundle.patch b/dev-python/urllib3/files/urllib3-1.16.0-unbundle.patch |
29 |
deleted file mode 100644 |
30 |
index 9a8a11e4a77..00000000000 |
31 |
--- a/dev-python/urllib3/files/urllib3-1.16.0-unbundle.patch |
32 |
+++ /dev/null |
33 |
@@ -1,17 +0,0 @@ |
34 |
- setup.py | 2 +- |
35 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
36 |
- |
37 |
-diff --git a/setup.py b/setup.py |
38 |
-index 0a2dac3..b7ad412 100644 |
39 |
---- a/setup.py |
40 |
-+++ b/setup.py |
41 |
-@@ -42,7 +42,7 @@ setup(name='urllib3', |
42 |
- url='http://urllib3.readthedocs.org/', |
43 |
- license='MIT', |
44 |
- packages=['urllib3', |
45 |
-- 'urllib3.packages', 'urllib3.packages.ssl_match_hostname', |
46 |
-+ 'urllib3.packages', |
47 |
- 'urllib3.packages.backports', 'urllib3.contrib', |
48 |
- 'urllib3.util', |
49 |
- ], |
50 |
- requires=[], |
51 |
|
52 |
diff --git a/dev-python/urllib3/urllib3-1.12.ebuild b/dev-python/urllib3/urllib3-1.12.ebuild |
53 |
deleted file mode 100644 |
54 |
index be217fa8403..00000000000 |
55 |
--- a/dev-python/urllib3/urllib3-1.12.ebuild |
56 |
+++ /dev/null |
57 |
@@ -1,88 +0,0 @@ |
58 |
-# Copyright 1999-2015 Gentoo Foundation |
59 |
-# Distributed under the terms of the GNU General Public License v2 |
60 |
- |
61 |
-EAPI=5 |
62 |
- |
63 |
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy ) |
64 |
- |
65 |
-inherit distutils-r1 |
66 |
- |
67 |
-DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more" |
68 |
-HOMEPAGE="https://github.com/shazow/urllib3" |
69 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
70 |
- |
71 |
-LICENSE="MIT" |
72 |
-SLOT="0" |
73 |
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86" |
74 |
-IUSE="doc test" |
75 |
- |
76 |
-RDEPEND=" |
77 |
- dev-python/certifi[${PYTHON_USEDEP}] |
78 |
- dev-python/six[${PYTHON_USEDEP}] |
79 |
- $(python_gen_cond_dep 'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' python2_7 pypy) |
80 |
- $(python_gen_cond_dep 'dev-python/pyopenssl[${PYTHON_USEDEP}]' python2_7 pypy) |
81 |
- $(python_gen_cond_dep 'dev-python/ndg-httpsclient[${PYTHON_USEDEP}]' python2_7 pypy) |
82 |
- $(python_gen_cond_dep 'dev-python/pyasn1[${PYTHON_USEDEP}]' python2_7 pypy) |
83 |
- " |
84 |
-DEPEND=" |
85 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
86 |
- test? ( |
87 |
- ${RDEPEND} |
88 |
- >=www-servers/tornado-4.2.1[$(python_gen_usedep 'python*')] |
89 |
- >=dev-python/mock-1.3.0[${PYTHON_USEDEP}] |
90 |
- >=dev-python/nose-1.3.7[${PYTHON_USEDEP}] |
91 |
- >=dev-python/nose-exclude-0.4.1[${PYTHON_USEDEP}] |
92 |
- ) |
93 |
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) |
94 |
- " |
95 |
- |
96 |
-# Testsuite written requiring mock to be installed under all Cpythons |
97 |
- |
98 |
-python_prepare_all() { |
99 |
- # Replace bundled copy of dev-python/six |
100 |
- cat > urllib3/packages/six.py <<-EOF |
101 |
- from __future__ import absolute_import |
102 |
- from six import * |
103 |
- EOF |
104 |
- |
105 |
- sed \ |
106 |
- -e 's:\.packages\.six:six:g' \ |
107 |
- -e 's:\.six:six:g' \ |
108 |
- -i urllib3/util/response.py urllib3/response.py || die |
109 |
- |
110 |
- sed -i '/cover-min-percentage/d' setup.cfg || die |
111 |
- # Fix tests |
112 |
- sed -i 's/urllib3.packages.six/six/' test/test_retry.py || die |
113 |
- |
114 |
- # Reset source of objects.inv |
115 |
- if use doc; then |
116 |
- local PYTHON_DOC_ATOM=$(best_version --host-root dev-python/python-docs:2.7) |
117 |
- local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}" |
118 |
- local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html" |
119 |
- local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv" |
120 |
- sed \ |
121 |
- -e "s|'python': ('http://docs.python.org/2.7', None|'${PYTHON_DOC}': ('${PYTHON_DOC_INVENTORY}'|" \ |
122 |
- -i docs/conf.py || die |
123 |
- fi |
124 |
- |
125 |
- distutils-r1_python_prepare_all |
126 |
-} |
127 |
- |
128 |
-python_compile_all() { |
129 |
- use doc && emake -C docs html |
130 |
-} |
131 |
- |
132 |
-python_test() { |
133 |
- # Failures still occur under py2.7. |
134 |
- # https://github.com/shazow/urllib3/issues/621 |
135 |
- |
136 |
- [[ "${EPYTHON}" == pypy ]] && return |
137 |
- |
138 |
- nosetests -v test || die "Tests fail with ${EPYTHON}" |
139 |
-} |
140 |
- |
141 |
-python_install_all() { |
142 |
- use doc && local HTML_DOCS=( docs/_build/html/. ) |
143 |
- |
144 |
- distutils-r1_python_install_all |
145 |
-} |
146 |
|
147 |
diff --git a/dev-python/urllib3/urllib3-1.16.ebuild b/dev-python/urllib3/urllib3-1.16.ebuild |
148 |
deleted file mode 100644 |
149 |
index cc6e64ff750..00000000000 |
150 |
--- a/dev-python/urllib3/urllib3-1.16.ebuild |
151 |
+++ /dev/null |
152 |
@@ -1,113 +0,0 @@ |
153 |
-# Copyright 1999-2017 Gentoo Foundation |
154 |
-# Distributed under the terms of the GNU General Public License v2 |
155 |
- |
156 |
-EAPI=6 |
157 |
- |
158 |
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy ) |
159 |
-PYTHON_REQ_USE="ssl(+)" |
160 |
- |
161 |
-inherit distutils-r1 |
162 |
- |
163 |
-DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more" |
164 |
-HOMEPAGE="https://github.com/shazow/urllib3" |
165 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
166 |
- |
167 |
-LICENSE="MIT" |
168 |
-SLOT="0" |
169 |
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux" |
170 |
-IUSE="doc test" |
171 |
- |
172 |
-RDEPEND=" |
173 |
- dev-python/PySocks[${PYTHON_USEDEP}] |
174 |
- dev-python/certifi[${PYTHON_USEDEP}] |
175 |
- dev-python/six[${PYTHON_USEDEP}] |
176 |
- >=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}] |
177 |
- $(python_gen_cond_dep 'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' python2_7 pypy) |
178 |
- $(python_gen_cond_dep 'dev-python/ndg-httpsclient[${PYTHON_USEDEP}]' python2_7 pypy) |
179 |
- $(python_gen_cond_dep 'dev-python/pyasn1[${PYTHON_USEDEP}]' python2_7 pypy) |
180 |
- " |
181 |
-DEPEND=" |
182 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
183 |
- test? ( |
184 |
- ${RDEPEND} |
185 |
- >=www-servers/tornado-4.2.1[$(python_gen_usedep 'python*')] |
186 |
- >=dev-python/mock-1.3.0[${PYTHON_USEDEP}] |
187 |
- >=dev-python/nose-1.3.7[${PYTHON_USEDEP}] |
188 |
- >=dev-python/nose-exclude-0.4.1[${PYTHON_USEDEP}] |
189 |
- ) |
190 |
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) |
191 |
- " |
192 |
- |
193 |
-# Testsuite written requiring mock to be installed under all Cpythons |
194 |
- |
195 |
-PATCHES=( "${FILESDIR}"/${PN}-1.16.0-unbundle.patch ) |
196 |
- |
197 |
-python_prepare_all() { |
198 |
- # Replace bundled copy of dev-python/six |
199 |
- cat > urllib3/packages/six.py <<-EOF |
200 |
- from __future__ import absolute_import |
201 |
- from six import * |
202 |
- EOF |
203 |
- |
204 |
- rm -r urllib3/packages/ssl_match_hostname || die |
205 |
- cat > urllib3/packages/ssl_match_hostname.py <<- EOF |
206 |
- from __future__ import absolute_import |
207 |
- try: |
208 |
- from backports.ssl_match_hostname import CertificateError, match_hostname |
209 |
- except ImportError: |
210 |
- from ssl import CertificateError, match_hostname |
211 |
- EOF |
212 |
- |
213 |
- cat > urllib3/packages/ordered_dict.py <<- EOF |
214 |
- from __future__ import absolute_import |
215 |
- from collections import OrderedDict |
216 |
- EOF |
217 |
- |
218 |
- sed \ |
219 |
- -e 's:\.packages\.six:six:g' \ |
220 |
- -e 's:\.six:six:g' \ |
221 |
- -i urllib3/util/response.py urllib3/response.py || die |
222 |
- |
223 |
- sed -i '/cover-min-percentage/d' setup.cfg || die |
224 |
- # Fix tests |
225 |
- sed -i 's/urllib3.packages.six/six/' test/test_retry.py || die |
226 |
- |
227 |
- # Reset source of objects.inv |
228 |
- if use doc; then |
229 |
- local PYTHON_DOC_ATOM=$(best_version --host-root dev-python/python-docs:2.7) |
230 |
- local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}" |
231 |
- local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html" |
232 |
- local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv" |
233 |
- sed \ |
234 |
- -e "s|'python': ('http://docs.python.org/2.7', None|'${PYTHON_DOC}': ('${PYTHON_DOC_INVENTORY}'|" \ |
235 |
- -i docs/conf.py || die |
236 |
- fi |
237 |
- |
238 |
- distutils-r1_python_prepare_all |
239 |
-} |
240 |
- |
241 |
-python_compile_all() { |
242 |
- use doc && emake -C docs html |
243 |
-} |
244 |
- |
245 |
-python_test() { |
246 |
- # Failures still occur under py2.7. |
247 |
- # https://github.com/shazow/urllib3/issues/621 |
248 |
- |
249 |
- [[ "${EPYTHON}" == pypy ]] && return |
250 |
- |
251 |
- nosetests -v \ |
252 |
- --exclude test_headerdict \ |
253 |
- --exclude test_headers \ |
254 |
- --exclude test_source_address_error \ |
255 |
- --exclude test_no_ssl \ |
256 |
- --exclude test_ca_dir_verified \ |
257 |
- --exclude test_verified \ |
258 |
- test || die "Tests fail with ${EPYTHON}" |
259 |
-} |
260 |
- |
261 |
-python_install_all() { |
262 |
- use doc && local HTML_DOCS=( docs/_build/html/. ) |
263 |
- |
264 |
- distutils-r1_python_install_all |
265 |
-} |
266 |
|
267 |
diff --git a/dev-python/urllib3/urllib3-1.20.ebuild b/dev-python/urllib3/urllib3-1.20.ebuild |
268 |
deleted file mode 100644 |
269 |
index 7ccaed36684..00000000000 |
270 |
--- a/dev-python/urllib3/urllib3-1.20.ebuild |
271 |
+++ /dev/null |
272 |
@@ -1,61 +0,0 @@ |
273 |
-# Copyright 1999-2017 Gentoo Foundation |
274 |
-# Distributed under the terms of the GNU General Public License v2 |
275 |
- |
276 |
-EAPI=6 |
277 |
- |
278 |
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} ) |
279 |
-PYTHON_REQ_USE="ssl(+)" |
280 |
- |
281 |
-inherit distutils-r1 |
282 |
- |
283 |
-DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more" |
284 |
-HOMEPAGE="https://github.com/shazow/urllib3" |
285 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
286 |
- |
287 |
-LICENSE="MIT" |
288 |
-SLOT="0" |
289 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux" |
290 |
-IUSE="doc test" |
291 |
-RESTRICT="test" |
292 |
- |
293 |
-RDEPEND=" |
294 |
- >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}] |
295 |
- dev-python/certifi[${PYTHON_USEDEP}] |
296 |
- >=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}] |
297 |
- >=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}] |
298 |
- >=dev-python/idna-2.0[${PYTHON_USEDEP}] |
299 |
- virtual/python-ipaddress[${PYTHON_USEDEP}] |
300 |
-" |
301 |
-DEPEND=" |
302 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
303 |
- test? ( |
304 |
- ${RDEPEND} |
305 |
- >=www-servers/tornado-4.2.1[$(python_gen_usedep 'python*')] |
306 |
- >=dev-python/mock-1.3.0[${PYTHON_USEDEP}] |
307 |
- >=dev-python/nose-1.3.7[${PYTHON_USEDEP}] |
308 |
- >=dev-python/nose-exclude-0.4.1[${PYTHON_USEDEP}] |
309 |
- ) |
310 |
- doc? ( |
311 |
- dev-python/mock[${PYTHON_USEDEP}] |
312 |
- dev-python/sphinx[${PYTHON_USEDEP}] |
313 |
- ) |
314 |
-" |
315 |
- |
316 |
-# Testsuite written requiring mock to be installed under all Cpythons |
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 |
- nosetests -v test || die "Testing failed with ${EPYTHON}" |
326 |
- fi |
327 |
-} |
328 |
- |
329 |
-python_install_all() { |
330 |
- use doc && local HTML_DOCS=( docs/_build/html/. ) |
331 |
- |
332 |
- distutils-r1_python_install_all |
333 |
-} |