1 |
commit: 71144f18904771559c8fe835266c0517bf8e6f66 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed May 26 08:32:59 2021 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed May 26 08:36:07 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71144f18 |
7 |
|
8 |
dev-python/pip: Remove old |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
dev-python/pip/Manifest | 3 - |
13 |
.../pip/files/pip-19.3-disable-version-check.patch | 24 ----- |
14 |
dev-python/pip/files/pip-21.0-no-coverage.patch | 53 --------- |
15 |
dev-python/pip/pip-21.0.1.ebuild | 120 --------------------- |
16 |
dev-python/pip/pip-21.1.ebuild | 120 --------------------- |
17 |
5 files changed, 320 deletions(-) |
18 |
|
19 |
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest |
20 |
index e522c4c25e4..d25199fe58c 100644 |
21 |
--- a/dev-python/pip/Manifest |
22 |
+++ b/dev-python/pip/Manifest |
23 |
@@ -1,7 +1,4 @@ |
24 |
-DIST pip-21.0.1.tar.gz 8772082 BLAKE2B 2fdd78e2db8ceda2bd21fdeb4d29c0c2eda412827b87cc97ec1996a5b71b9c6e5938c0a6ef696163780bbbc55d81b8b3b1b6e2e79b05fbe9ce4bdd52e3ebdf13 SHA512 2db5397f4ca3a3f56f5add3f827bf1f0a4296019703438d68498266b9d2559b6baa3132061c5ad4c2a08bec6e76a2768763fdca02d86cf32aadd4640afbf3664 |
25 |
DIST pip-21.1.1.tar.gz 8771867 BLAKE2B 1cb920ab52510e816a7c3b8b6d1b47576a27cf1b208ab8fefa102ff36c09eb4e99b34f213a043550a9e6fb37bb8b6306f9e939371661ff7f23ba03f21b4a643b SHA512 05157ed586597f16948afdad43d98cc095803d2d22b1427ac1028ca2a73a26d65e597446808194343ed36f9eb7cb910ac89e73a6a9a90ee868ec822fdbe641c5 |
26 |
DIST pip-21.1.2.tar.gz 8772481 BLAKE2B 23dbcc5dd7e7f66934282b9c93958267eb367d418b6c814032b7b89e0d94c73c143626781b8df081394019d2e575030b7a2fd61bb5221992ce2060cf069e8b04 SHA512 54a2b6074fcb2640868dedcabb5087b79a53a8ad57ec4ab5acf2862b8037403d8f156c2853ab60c2f10c6af999a0a90774f0bc3eca2978a82590935d37af167f |
27 |
-DIST pip-21.1.tar.gz 8771224 BLAKE2B 2056a741b7f51d56c3984e2b0bcd1fa9cc12ba9677f80505fa5182fc0afad9c7dfe4ecf9429cf5ed5f8534f0a6a003b12455e90537a5dacbe188c8db548b71c3 SHA512 2617ae852cd52db980ab4131d711946b63930d30f480e050555bc61acb78577aa447b88065c6c8eba7e29c7167f78f04b11404cb0c1975caac464fa768ee7de8 |
28 |
-DIST setuptools-51.3.3-py3-none-any.whl 786243 BLAKE2B cc8a98cdfd5cb78a342a3d50049c0ebd0965451e9bd4050b7a133346f505a17842a498531ade9bf932064a6cac81277ecf60d94ef94faa39b78740de87f9fd86 SHA512 1d4f29e392371b7f0e427d0570fddbdd1204f6c98e48a0a289db23b20f7c048551584ac946e30b90d720cce4f508b3c39208e9a70f87067d66734432963d141c |
29 |
DIST setuptools-56.0.0-py3-none-any.whl 784941 BLAKE2B 136352bcaeeb803f94983db2e0f9ec79dacc23a6742a2f6f1b4bdd2b29a104f4965d78f9b4adf1a501c7bf39d4ed85a6786b03489f90872661afbf5e674fd3f9 SHA512 32405236e9c2936cde137bc4d4d07b548391336ce0511cd5677dcd1f85c7a142b0947e03cdceaeb37067874f5aa71daacaa1a6af95ae9fe3ad8af264f61e10f4 |
30 |
DIST wheel-0.36.2-py2.py3-none-any.whl 35046 BLAKE2B bc4e8dab7c74eea34d3b4a813b7eaf6295a99a396a861b6cdd76f743043e89140bad132bdd13e385e8945ce02e0798e1d3ac73fc1b23bde5b2a83e4bb4dd5cdc SHA512 6bb5119b4d3704fe1e3c1eaaa3124edab13f61b46f8a0a8e75974fac4e5b25d8b53606071a03a8d8990ad1cfe2ab247ddea260098df2c0c35ae965be47080284 |
31 |
|
32 |
diff --git a/dev-python/pip/files/pip-19.3-disable-version-check.patch b/dev-python/pip/files/pip-19.3-disable-version-check.patch |
33 |
deleted file mode 100644 |
34 |
index e8fe868431d..00000000000 |
35 |
--- a/dev-python/pip/files/pip-19.3-disable-version-check.patch |
36 |
+++ /dev/null |
37 |
@@ -1,24 +0,0 @@ |
38 |
-diff --git a/src/pip/_internal/cli/req_command.py b/src/pip/_internal/cli/req_command.py |
39 |
-index 203e86a4..a2183f10 100644 |
40 |
---- a/src/pip/_internal/cli/req_command.py |
41 |
-+++ b/src/pip/_internal/cli/req_command.py |
42 |
-@@ -129,17 +129,8 @@ class IndexGroupCommand(Command, SessionCommandMixin): |
43 |
- # Make sure the index_group options are present. |
44 |
- assert hasattr(options, 'no_index') |
45 |
- |
46 |
-- if options.disable_pip_version_check or options.no_index: |
47 |
-- return |
48 |
-- |
49 |
-- # Otherwise, check if we're using the latest version of pip available. |
50 |
-- session = self._build_session( |
51 |
-- options, |
52 |
-- retries=0, |
53 |
-- timeout=min(5, options.timeout) |
54 |
-- ) |
55 |
-- with session: |
56 |
-- pip_self_version_check(session, options) |
57 |
-+ # Disabled on Gentoo |
58 |
-+ return |
59 |
- |
60 |
- |
61 |
- class RequirementCommand(IndexGroupCommand): |
62 |
|
63 |
diff --git a/dev-python/pip/files/pip-21.0-no-coverage.patch b/dev-python/pip/files/pip-21.0-no-coverage.patch |
64 |
deleted file mode 100644 |
65 |
index 82e3e1b30f7..00000000000 |
66 |
--- a/dev-python/pip/files/pip-21.0-no-coverage.patch |
67 |
+++ /dev/null |
68 |
@@ -1,53 +0,0 @@ |
69 |
-From 7f61ba983025cbfab7b7b810b13f1a89cb503568 Mon Sep 17 00:00:00 2001 |
70 |
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o> |
71 |
-Date: Wed, 29 Jul 2020 07:42:25 +0200 |
72 |
-Subject: [PATCH] Disable coverage testing support inside test venvs |
73 |
- |
74 |
---- |
75 |
- tests/conftest.py | 16 +--------------- |
76 |
- 1 file changed, 1 insertion(+), 15 deletions(-) |
77 |
- |
78 |
-diff --git a/tests/conftest.py b/tests/conftest.py |
79 |
-index 0bb69dae6..02da6c573 100644 |
80 |
---- a/tests/conftest.py |
81 |
-+++ b/tests/conftest.py |
82 |
-@@ -311,13 +311,6 @@ def wheel_install(tmpdir_factory, common_wheels): |
83 |
- 'wheel') |
84 |
- |
85 |
- |
86 |
--@××××××.fixture(scope='session') |
87 |
--def coverage_install(tmpdir_factory, common_wheels): |
88 |
-- return _common_wheel_editable_install(tmpdir_factory, |
89 |
-- common_wheels, |
90 |
-- 'coverage') |
91 |
-- |
92 |
-- |
93 |
- def install_egg_link(venv, project_name, egg_info_dir): |
94 |
- with open(venv.site / 'easy-install.pth', 'a') as fp: |
95 |
- fp.write(str(egg_info_dir.resolve()) + '\n') |
96 |
-@@ -327,7 +320,7 @@ def install_egg_link(venv, project_name, egg_info_dir): |
97 |
- |
98 |
- @pytest.fixture(scope='session') |
99 |
- def virtualenv_template(request, tmpdir_factory, pip_src, |
100 |
-- setuptools_install, coverage_install): |
101 |
-+ setuptools_install, common_wheels): |
102 |
- |
103 |
- if request.config.getoption('--use-venv'): |
104 |
- venv_type = 'venv' |
105 |
-@@ -351,13 +344,6 @@ def virtualenv_template(request, tmpdir_factory, pip_src, |
106 |
- subprocess.check_call([venv.bin / 'python', 'setup.py', '-q', 'develop'], |
107 |
- cwd=pip_editable) |
108 |
- |
109 |
-- # Install coverage and pth file for executing it in any spawned processes |
110 |
-- # in this virtual environment. |
111 |
-- install_egg_link(venv, 'coverage', coverage_install) |
112 |
-- # zz prefix ensures the file is after easy-install.pth. |
113 |
-- with open(venv.site / 'zz-coverage-helper.pth', 'a') as f: |
114 |
-- f.write('import coverage; coverage.process_startup()') |
115 |
-- |
116 |
- # Drop (non-relocatable) launchers. |
117 |
- for exe in os.listdir(venv.bin): |
118 |
- if not ( |
119 |
--- |
120 |
-2.30.0 |
121 |
- |
122 |
|
123 |
diff --git a/dev-python/pip/pip-21.0.1.ebuild b/dev-python/pip/pip-21.0.1.ebuild |
124 |
deleted file mode 100644 |
125 |
index 90285879935..00000000000 |
126 |
--- a/dev-python/pip/pip-21.0.1.ebuild |
127 |
+++ /dev/null |
128 |
@@ -1,120 +0,0 @@ |
129 |
-# Copyright 1999-2021 Gentoo Authors |
130 |
-# Distributed under the terms of the GNU General Public License v2 |
131 |
- |
132 |
-EAPI=7 |
133 |
- |
134 |
-DISTUTILS_USE_SETUPTOOLS=rdepend |
135 |
-PYTHON_COMPAT=( python3_{7..9} pypy3 ) |
136 |
-PYTHON_REQ_USE="ssl(+),threads(+)" |
137 |
- |
138 |
-inherit bash-completion-r1 distutils-r1 |
139 |
- |
140 |
-# setuptools & wheel .whl files are required for testing, |
141 |
-# the exact version is not very important. |
142 |
-SETUPTOOLS_WHL="setuptools-51.3.3-py3-none-any.whl" |
143 |
-WHEEL_WHL="wheel-0.36.2-py2.py3-none-any.whl" |
144 |
- |
145 |
-DESCRIPTION="Installs python packages -- replacement for easy_install" |
146 |
-HOMEPAGE=" |
147 |
- https://pip.pypa.io/en/stable/ |
148 |
- https://pypi.org/project/pip/ |
149 |
- https://github.com/pypa/pip/" |
150 |
-SRC_URI=" |
151 |
- https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz |
152 |
- test? ( |
153 |
- https://files.pythonhosted.org/packages/py3/s/setuptools/${SETUPTOOLS_WHL} |
154 |
- https://files.pythonhosted.org/packages/py2.py3/w/wheel/${WHEEL_WHL} |
155 |
- ) |
156 |
-" |
157 |
- |
158 |
-LICENSE="MIT" |
159 |
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos" |
160 |
-SLOT="0" |
161 |
-IUSE="test -vanilla" |
162 |
-RESTRICT="!test? ( test )" |
163 |
- |
164 |
-RDEPEND=" |
165 |
- >=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}] |
166 |
-" |
167 |
-BDEPEND=" |
168 |
- ${RDEPEND} |
169 |
- test? ( |
170 |
- dev-python/cryptography[${PYTHON_USEDEP}] |
171 |
- dev-python/csv23[${PYTHON_USEDEP}] |
172 |
- dev-python/freezegun[${PYTHON_USEDEP}] |
173 |
- dev-python/mock[${PYTHON_USEDEP}] |
174 |
- dev-python/pretend[${PYTHON_USEDEP}] |
175 |
- dev-python/pytest[${PYTHON_USEDEP}] |
176 |
- dev-python/pyyaml[${PYTHON_USEDEP}] |
177 |
- dev-python/scripttest[${PYTHON_USEDEP}] |
178 |
- <dev-python/virtualenv-20[${PYTHON_USEDEP}] |
179 |
- dev-python/werkzeug[${PYTHON_USEDEP}] |
180 |
- dev-python/wheel[${PYTHON_USEDEP}] |
181 |
- ) |
182 |
-" |
183 |
- |
184 |
-python_prepare_all() { |
185 |
- local PATCHES=( |
186 |
- "${FILESDIR}/${PN}-19.3-disable-version-check.patch" |
187 |
- "${FILESDIR}/${PN}-21.0-no-coverage.patch" |
188 |
- ) |
189 |
- if ! use vanilla; then |
190 |
- PATCHES+=( "${FILESDIR}/pip-20.0.2-disable-system-install.patch" ) |
191 |
- fi |
192 |
- |
193 |
- distutils-r1_python_prepare_all |
194 |
- |
195 |
- if use test; then |
196 |
- mkdir tests/data/common_wheels/ || die |
197 |
- cp "${DISTDIR}"/{${SETUPTOOLS_WHL},${WHEEL_WHL}} \ |
198 |
- tests/data/common_wheels/ || die |
199 |
- fi |
200 |
-} |
201 |
- |
202 |
-python_test() { |
203 |
- if [[ ${EPYTHON} == pypy* ]]; then |
204 |
- ewarn "Skipping tests on ${EPYTHON} since they are very broken" |
205 |
- return 0 |
206 |
- fi |
207 |
- |
208 |
- local deselect=( |
209 |
- tests/functional/test_install.py::test_double_install_fail |
210 |
- tests/functional/test_list.py::test_multiple_exclude_and_normalization |
211 |
- 'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-download]' |
212 |
- 'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-install]' |
213 |
- 'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-list]' |
214 |
- 'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-wheel]' |
215 |
- ) |
216 |
- |
217 |
- distutils_install_for_testing --via-root |
218 |
- |
219 |
- local -x GENTOO_PIP_TESTING=1 \ |
220 |
- PATH="${TEST_DIR}/scripts:${PATH}" \ |
221 |
- PYTHONPATH="${TEST_DIR}/lib:${BUILD_DIR}/lib" |
222 |
- |
223 |
- pytest -vv ${deselect[@]/#/--deselect } -m "not network" || |
224 |
- die "Tests fail with ${EPYTHON}" |
225 |
-} |
226 |
- |
227 |
-python_install_all() { |
228 |
- # Prevent dbus auto-launch |
229 |
- # https://bugs.gentoo.org/692178 |
230 |
- export DBUS_SESSION_BUS_ADDRESS="disabled:" |
231 |
- |
232 |
- local DOCS=( AUTHORS.txt docs/html/**/*.rst ) |
233 |
- distutils-r1_python_install_all |
234 |
- |
235 |
- COMPLETION="${T}"/completion.tmp |
236 |
- |
237 |
- # 'pip completion' command embeds full $0 into completion script, which confuses |
238 |
- # 'complete' and causes QA warning when running as "${PYTHON} -m pip". |
239 |
- # This trick sets correct $0 while still calling just installed pip. |
240 |
- local pipcmd='import sys; sys.argv[0] = "pip"; import pip.__main__; sys.exit(pip.__main__._main())' |
241 |
- |
242 |
- ${PYTHON} -c "${pipcmd}" completion --bash > "${COMPLETION}" || die |
243 |
- newbashcomp "${COMPLETION}" ${PN} |
244 |
- |
245 |
- ${PYTHON} -c "${pipcmd}" completion --zsh > "${COMPLETION}" || die |
246 |
- insinto /usr/share/zsh/site-functions |
247 |
- newins "${COMPLETION}" _pip |
248 |
-} |
249 |
|
250 |
diff --git a/dev-python/pip/pip-21.1.ebuild b/dev-python/pip/pip-21.1.ebuild |
251 |
deleted file mode 100644 |
252 |
index f6ec7e81791..00000000000 |
253 |
--- a/dev-python/pip/pip-21.1.ebuild |
254 |
+++ /dev/null |
255 |
@@ -1,120 +0,0 @@ |
256 |
-# Copyright 1999-2021 Gentoo Authors |
257 |
-# Distributed under the terms of the GNU General Public License v2 |
258 |
- |
259 |
-EAPI=7 |
260 |
- |
261 |
-DISTUTILS_USE_SETUPTOOLS=rdepend |
262 |
-PYTHON_COMPAT=( python3_{7..9} pypy3 ) |
263 |
-PYTHON_REQ_USE="ssl(+),threads(+)" |
264 |
- |
265 |
-inherit bash-completion-r1 distutils-r1 |
266 |
- |
267 |
-# setuptools & wheel .whl files are required for testing, |
268 |
-# the exact version is not very important. |
269 |
-SETUPTOOLS_WHL="setuptools-56.0.0-py3-none-any.whl" |
270 |
-WHEEL_WHL="wheel-0.36.2-py2.py3-none-any.whl" |
271 |
- |
272 |
-DESCRIPTION="Installs python packages -- replacement for easy_install" |
273 |
-HOMEPAGE=" |
274 |
- https://pip.pypa.io/en/stable/ |
275 |
- https://pypi.org/project/pip/ |
276 |
- https://github.com/pypa/pip/" |
277 |
-SRC_URI=" |
278 |
- https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz |
279 |
- test? ( |
280 |
- https://files.pythonhosted.org/packages/py3/s/setuptools/${SETUPTOOLS_WHL} |
281 |
- https://files.pythonhosted.org/packages/py2.py3/w/wheel/${WHEEL_WHL} |
282 |
- ) |
283 |
-" |
284 |
- |
285 |
-LICENSE="MIT" |
286 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos" |
287 |
-SLOT="0" |
288 |
-IUSE="test -vanilla" |
289 |
-RESTRICT="!test? ( test )" |
290 |
- |
291 |
-RDEPEND=" |
292 |
- >=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}] |
293 |
-" |
294 |
-BDEPEND=" |
295 |
- ${RDEPEND} |
296 |
- test? ( |
297 |
- dev-python/cryptography[${PYTHON_USEDEP}] |
298 |
- dev-python/csv23[${PYTHON_USEDEP}] |
299 |
- dev-python/freezegun[${PYTHON_USEDEP}] |
300 |
- dev-python/mock[${PYTHON_USEDEP}] |
301 |
- dev-python/pretend[${PYTHON_USEDEP}] |
302 |
- dev-python/pytest[${PYTHON_USEDEP}] |
303 |
- dev-python/pyyaml[${PYTHON_USEDEP}] |
304 |
- dev-python/scripttest[${PYTHON_USEDEP}] |
305 |
- <dev-python/virtualenv-20[${PYTHON_USEDEP}] |
306 |
- dev-python/werkzeug[${PYTHON_USEDEP}] |
307 |
- dev-python/wheel[${PYTHON_USEDEP}] |
308 |
- ) |
309 |
-" |
310 |
- |
311 |
-python_prepare_all() { |
312 |
- local PATCHES=( |
313 |
- "${FILESDIR}/${PN}-21.1-no-coverage.patch" |
314 |
- ) |
315 |
- if ! use vanilla; then |
316 |
- PATCHES+=( "${FILESDIR}/pip-20.0.2-disable-system-install.patch" ) |
317 |
- fi |
318 |
- |
319 |
- distutils-r1_python_prepare_all |
320 |
- |
321 |
- if use test; then |
322 |
- mkdir tests/data/common_wheels/ || die |
323 |
- cp "${DISTDIR}"/{${SETUPTOOLS_WHL},${WHEEL_WHL}} \ |
324 |
- tests/data/common_wheels/ || die |
325 |
- fi |
326 |
-} |
327 |
- |
328 |
-python_test() { |
329 |
- if [[ ${EPYTHON} == pypy* ]]; then |
330 |
- ewarn "Skipping tests on ${EPYTHON} since they are very broken" |
331 |
- return 0 |
332 |
- fi |
333 |
- |
334 |
- local deselect=( |
335 |
- tests/functional/test_install.py::test_double_install_fail |
336 |
- tests/functional/test_list.py::test_multiple_exclude_and_normalization |
337 |
- 'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-download]' |
338 |
- 'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-install]' |
339 |
- 'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-list]' |
340 |
- 'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-wheel]' |
341 |
- tests/functional/test_install.py::test_install_pip_does_not_modify_pip_when_satisfied |
342 |
- # Internet |
343 |
- tests/functional/test_install.py::test_install_editable_with_prefix_setup_cfg |
344 |
- ) |
345 |
- |
346 |
- distutils_install_for_testing --via-root |
347 |
- |
348 |
- local -x GENTOO_PIP_TESTING=1 \ |
349 |
- PATH="${TEST_DIR}/scripts:${PATH}" \ |
350 |
- PYTHONPATH="${TEST_DIR}/lib:${BUILD_DIR}/lib" |
351 |
- epytest ${deselect[@]/#/--deselect } -m "not network" |
352 |
-} |
353 |
- |
354 |
-python_install_all() { |
355 |
- # Prevent dbus auto-launch |
356 |
- # https://bugs.gentoo.org/692178 |
357 |
- export DBUS_SESSION_BUS_ADDRESS="disabled:" |
358 |
- |
359 |
- local DOCS=( AUTHORS.txt docs/html/**/*.rst ) |
360 |
- distutils-r1_python_install_all |
361 |
- |
362 |
- COMPLETION="${T}"/completion.tmp |
363 |
- |
364 |
- # 'pip completion' command embeds full $0 into completion script, which confuses |
365 |
- # 'complete' and causes QA warning when running as "${PYTHON} -m pip". |
366 |
- # This trick sets correct $0 while still calling just installed pip. |
367 |
- local pipcmd='import sys; sys.argv[0] = "pip"; from pip._internal.cli.main import main; sys.exit(main())' |
368 |
- |
369 |
- ${PYTHON} -c "${pipcmd}" completion --bash > "${COMPLETION}" || die |
370 |
- newbashcomp "${COMPLETION}" ${PN} |
371 |
- |
372 |
- ${PYTHON} -c "${pipcmd}" completion --zsh > "${COMPLETION}" || die |
373 |
- insinto /usr/share/zsh/site-functions |
374 |
- newins "${COMPLETION}" _pip |
375 |
-} |