Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/virtualenv/files/, dev-python/virtualenv/
Date: Sat, 03 Jul 2021 06:21:26
Message-Id: 1625293276.dee418093fc8386988748c254285662108b13f5b.mgorny@gentoo
1 commit: dee418093fc8386988748c254285662108b13f5b
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jul 3 06:20:16 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat Jul 3 06:21:16 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dee41809
7
8 dev-python/virtualenv: Remove old
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 dev-python/virtualenv/Manifest | 2 -
13 .../files/virtualenv-16.7.7-tests-internet.patch | 50 -----------
14 .../virtualenv/files/virtualenv-16.7.7-tests.patch | 53 ------------
15 .../files/virtualenv-16.7.8-tests-pypy.patch | 64 --------------
16 dev-python/virtualenv/virtualenv-16.7.10-r1.ebuild | 66 ---------------
17 dev-python/virtualenv/virtualenv-20.4.4.ebuild | 99 ----------------------
18 6 files changed, 334 deletions(-)
19
20 diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
21 index 33a5d2a2571..25331c19f09 100644
22 --- a/dev-python/virtualenv/Manifest
23 +++ b/dev-python/virtualenv/Manifest
24 @@ -1,3 +1 @@
25 -DIST virtualenv-16.7.10.tar.gz 5116776 BLAKE2B 42f0a4b4330850b504f8febd991ef6ecdcbb0821efdd94ca324a8cc34a68a760a8a98de97f0cb2384d8e6cbb0ce8f261995c6433886444e29b75ba0ce09ca12c SHA512 f06d7c354ce1910f04dbcbe1a77e60392653bbe4f638bafbe9284454db2c0e5d63cf9159201d0916fc01aaba91d45fb733b63096c38517fcd83fd00ed8b26d28
26 -DIST virtualenv-20.4.4.tar.gz 10579531 BLAKE2B 9e10c07bd191d745d6904f304787a3913c0c574bb4453549796052f27329cbc2e3700fbc6f40ff02f4e94b8f1c21458c8fbd706b05ae458c033722d3eaf04f2e SHA512 acc528cccfc80aeed2fcd7209cab7ff0f1a7d1dc01a59fdb6a07703c7905904ab68d3f4ff312e108c687d03495e82ed8d26ecc15c2b17b9e771605a46164b4bd
27 DIST virtualenv-20.4.7.tar.gz 10625204 BLAKE2B 1233ea45f771fb425b99c966904e2c5444e5fcb617b1d7cd34cdac097ee15566b7f4c841d444393723ed369193f33bef90ea7caa5b3c20aaf65fbde2f865abf7 SHA512 a554fb32cc46cb1cef2a2655bdae598efb52a4e71223eb10d9a36b124390546250aa11cf7da991a41ef4697523ec4562a31e35b5ab7ee8aba748ea4ff28e088b
28
29 diff --git a/dev-python/virtualenv/files/virtualenv-16.7.7-tests-internet.patch b/dev-python/virtualenv/files/virtualenv-16.7.7-tests-internet.patch
30 deleted file mode 100644
31 index 97baeb59c4e..00000000000
32 --- a/dev-python/virtualenv/files/virtualenv-16.7.7-tests-internet.patch
33 +++ /dev/null
34 @@ -1,50 +0,0 @@
35 -diff --git a/tests/test_from_source.py b/tests/test_from_source.py
36 -index 39d7c05..76834f7 100644
37 ---- a/tests/test_from_source.py
38 -+++ b/tests/test_from_source.py
39 -@@ -40,6 +40,7 @@ def test_use_from_source_sdist(sdist, tmp_path, clean_python, monkeypatch, call_
40 - )
41 -
42 -
43 -+@×××××××××××.skip(reason="needs internet access")
44 - def test_use_from_wheel(tmp_path, extracted_wheel, clean_python, monkeypatch, call_subprocess):
45 - """test that we can create a virtual environment by feeding to a clean python the wheels content"""
46 - virtualenv_file = extracted_wheel / "virtualenv.py"
47 -diff --git a/tests/test_source_content.py b/tests/test_source_content.py
48 -index 8eae6bc..06763ee 100644
49 ---- a/tests/test_source_content.py
50 -+++ b/tests/test_source_content.py
51 -@@ -41,6 +41,7 @@ def test_sdist_contains(sdist):
52 - assert not extra, " | ".join(extra)
53 -
54 -
55 -+@×××××××××××.skip(reason="needs internet access")
56 - def test_wheel_contains(extracted_wheel):
57 - content = set(extracted_wheel.iterdir())
58 -
59 -diff --git a/tests/test_zipapp.py b/tests/test_zipapp.py
60 -index d084af6..93d29e1 100644
61 ---- a/tests/test_zipapp.py
62 -+++ b/tests/test_zipapp.py
63 -@@ -51,11 +51,13 @@ def call_wheel(tmp_path_factory, call_subprocess):
64 - return wheel_make_env
65 -
66 -
67 -+@×××××××××××.skip(reason="needs internet access")
68 - @pytest.mark.skipif(six.PY2, reason="seems to be broken on python2")
69 - def test_zipapp_basic_invocation(call_zipapp, tmp_path):
70 - _test_basic_invocation(call_zipapp, tmp_path)
71 -
72 -
73 -+@×××××××××××.skip(reason="needs internet access")
74 - @pytest.mark.skipif(six.PY2, reason="seems to be broken on python2")
75 - def test_wheel_basic_invocation(call_wheel, tmp_path):
76 - _test_basic_invocation(call_wheel, tmp_path)
77 -@@ -97,6 +99,7 @@ def test_zipapp_invocation_dash_p(call_zipapp, tmp_path):
78 - _test_invocation_dash_p(call_zipapp, tmp_path)
79 -
80 -
81 -+@×××××××××××.skip(reason="needs internet access")
82 - @pytest.mark.skipif(six.PY2, reason="seems to be broken on python2")
83 - @pytest.mark.skipif(sys.platform == "win32" and six.PY2, reason="no python 3 for windows on CI")
84 - def test_wheel_invocation_dash_p(call_wheel, tmp_path):
85
86 diff --git a/dev-python/virtualenv/files/virtualenv-16.7.7-tests.patch b/dev-python/virtualenv/files/virtualenv-16.7.7-tests.patch
87 deleted file mode 100644
88 index 41d3240d47d..00000000000
89 --- a/dev-python/virtualenv/files/virtualenv-16.7.7-tests.patch
90 +++ /dev/null
91 @@ -1,53 +0,0 @@
92 -diff --git a/tests/test_virtualenv.py b/tests/test_virtualenv.py
93 -index 620c0cb..946233b 100644
94 ---- a/tests/test_virtualenv.py
95 -+++ b/tests/test_virtualenv.py
96 -@@ -356,6 +356,7 @@ def test_install_python_bin():
97 - shutil.rmtree(tmp_virtualenv)
98 -
99 -
100 -+@×××××××××××.skip(reason="This test does not seem to be working, and I have no idea why")
101 - @pytest.mark.skipif("platform.python_implementation() == 'PyPy'")
102 - def test_always_copy_option():
103 - """Should be no symlinks in directory tree"""
104 -diff --git a/tests/test_zipapp.py b/tests/test_zipapp.py
105 -index 8ef8bd1..d084af6 100644
106 ---- a/tests/test_zipapp.py
107 -+++ b/tests/test_zipapp.py
108 -@@ -51,10 +51,12 @@ def call_wheel(tmp_path_factory, call_subprocess):
109 - return wheel_make_env
110 -
111 -
112 -+@×××××××××××.skipif(six.PY2, reason="seems to be broken on python2")
113 - def test_zipapp_basic_invocation(call_zipapp, tmp_path):
114 - _test_basic_invocation(call_zipapp, tmp_path)
115 -
116 -
117 -+@×××××××××××.skipif(six.PY2, reason="seems to be broken on python2")
118 - def test_wheel_basic_invocation(call_wheel, tmp_path):
119 - _test_basic_invocation(call_wheel, tmp_path)
120 -
121 -@@ -95,6 +97,7 @@ def test_zipapp_invocation_dash_p(call_zipapp, tmp_path):
122 - _test_invocation_dash_p(call_zipapp, tmp_path)
123 -
124 -
125 -+@×××××××××××.skipif(six.PY2, reason="seems to be broken on python2")
126 - @pytest.mark.skipif(sys.platform == "win32" and six.PY2, reason="no python 3 for windows on CI")
127 - def test_wheel_invocation_dash_p(call_wheel, tmp_path):
128 - _test_invocation_dash_p(call_wheel, tmp_path)
129 -diff --git a/virtualenv.py b/virtualenv.py
130 -index 0c47e4f..d4a1747 100755
131 ---- a/virtualenv.py
132 -+++ b/virtualenv.py
133 -@@ -80,9 +80,9 @@ else:
134 - DEFAULT_CONFIG_FILE = os.path.join(DEFAULT_STORAGE_DIR, "virtualenv.ini")
135 -
136 - if IS_PYPY:
137 -- EXPECTED_EXE = "pypy"
138 -+ EXPECTED_EXE = "pypy{}".format('' if sys.hexversion < 0x3000000 else '3')
139 - else:
140 -- EXPECTED_EXE = "python"
141 -+ EXPECTED_EXE = "python{}.{}".format(sys.version_info.major, sys.version_info.minor)
142 -
143 - # Return a mapping of version -> Python executable
144 - # Only provided for Windows, where the information in the registry is used
145
146 diff --git a/dev-python/virtualenv/files/virtualenv-16.7.8-tests-pypy.patch b/dev-python/virtualenv/files/virtualenv-16.7.8-tests-pypy.patch
147 deleted file mode 100644
148 index 1e9268a5f97..00000000000
149 --- a/dev-python/virtualenv/files/virtualenv-16.7.8-tests-pypy.patch
150 +++ /dev/null
151 @@ -1,64 +0,0 @@
152 -diff --git a/tests/test_virtualenv.py b/tests/test_virtualenv.py
153 -index 620c0cb..3284cea 100644
154 ---- a/tests/test_virtualenv.py
155 -+++ b/tests/test_virtualenv.py
156 -@@ -5,6 +5,7 @@ import optparse
157 - import os
158 - import shutil
159 - import subprocess
160 -+import platform
161 - import sys
162 - import tempfile
163 - import textwrap
164 -@@ -342,6 +343,11 @@ def test_install_python_bin():
165 -
166 - if virtualenv.IS_WIN:
167 - required_executables = ["python.exe", "pythonw.exe"]
168 -+ elif platform.python_implementation() == 'PyPy':
169 -+ if sys.version_info.major < 3:
170 -+ required_executables = ["pypy"]
171 -+ else:
172 -+ required_executables = ["pypy3"]
173 - else:
174 - py_exe_no_version = "python"
175 - py_exe_version_major = "python%s" % sys.version_info[0]
176 -@@ -549,7 +555,7 @@ def check_pypy_pre_import():
177 - assert module in sys.modules, "missing {!r} in sys.modules".format(module)
178 -
179 -
180 --@×××××××××××.skipif("platform.python_implementation() != 'PyPy'")
181 -+@×××××××××××.skipif("platform.python_implementation() == 'PyPy'")
182 - def test_pypy_pre_import(tmp_path):
183 - """For PyPy, some built-in modules should be pre-imported because
184 - some programs expect them to be in sys.modules on startup.
185 -@@ -622,7 +628,7 @@ def test_create_environment_from_venv(tmpdir):
186 - builder.setup_python(ctx)
187 - builder.setup_scripts(ctx)
188 - subprocess.check_call([ctx.env_exe, virtualenv.__file__, "--no-setuptools", "--no-pip", "--no-wheel", ve_venv_dir])
189 -- ve_exe = os.path.join(bin_dir, "python")
190 -+ ve_exe = os.path.join(bin_dir, os.getenv('EPYTHON'))
191 - out = subprocess.check_output([ve_exe, "-c", "import sys; print(sys.real_prefix)"], universal_newlines=True)
192 - # Test against real_prefix if present - we might be running the test from a virtualenv (e.g. tox).
193 - assert out.strip() == getattr(sys, "real_prefix", sys.prefix)
194 -@@ -639,7 +645,7 @@ def test_create_environment_from_venv_no_pip(tmpdir):
195 - builder.setup_python(ctx)
196 - builder.setup_scripts(ctx)
197 - subprocess.check_call([ctx.env_exe, virtualenv.__file__, "--no-pip", ve_venv_dir])
198 -- ve_exe = os.path.join(bin_dir, "python")
199 -+ ve_exe = os.path.join(bin_dir, os.getenv('EPYTHON'))
200 - out = subprocess.check_output([ve_exe, "-c", "import sys; print(sys.real_prefix)"], universal_newlines=True)
201 - # Test against real_prefix if present - we might be running the test from a virtualenv (e.g. tox).
202 - assert out.strip() == getattr(sys, "real_prefix", sys.prefix)
203 -@@ -657,10 +663,11 @@ def test_create_environment_with_old_pip(tmpdir):
204 - virtualenv.create_environment(venvdir, search_dirs=[support_dir], no_wheel=True)
205 -
206 -
207 -+@×××××××××××.skipif("platform.python_implementation() == 'PyPy'")
208 - def test_license_builtin(clean_python):
209 - _, bin_dir, _ = clean_python
210 - proc = subprocess.Popen(
211 -- (os.path.join(bin_dir, "python"), "-c", "license()"), stdin=subprocess.PIPE, stdout=subprocess.PIPE
212 -+ (os.path.join(bin_dir, os.getenv('EPYTHON')), "-c", "license()"), stdin=subprocess.PIPE, stdout=subprocess.PIPE
213 - )
214 - out_b, _ = proc.communicate(b"q\n")
215 - out = out_b.decode()
216
217 diff --git a/dev-python/virtualenv/virtualenv-16.7.10-r1.ebuild b/dev-python/virtualenv/virtualenv-16.7.10-r1.ebuild
218 deleted file mode 100644
219 index 1699ef11452..00000000000
220 --- a/dev-python/virtualenv/virtualenv-16.7.10-r1.ebuild
221 +++ /dev/null
222 @@ -1,66 +0,0 @@
223 -# Copyright 1999-2021 Gentoo Authors
224 -# Distributed under the terms of the GNU General Public License v2
225 -
226 -EAPI=7
227 -
228 -PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
229 -DISTUTILS_USE_SETUPTOOLS=manual
230 -
231 -inherit distutils-r1
232 -
233 -DESCRIPTION="Virtual Python Environment builder"
234 -HOMEPAGE="
235 - https://virtualenv.pypa.io/en/stable/
236 - https://pypi.org/project/virtualenv/
237 - https://github.com/pypa/virtualenv/
238 -"
239 -SRC_URI="https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
240 -
241 -LICENSE="MIT"
242 -#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
243 -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
244 -SLOT="0"
245 -IUSE="test"
246 -RESTRICT="!test? ( test )"
247 -
248 -RDEPEND=">=dev-python/setuptools-19.6.2[${PYTHON_USEDEP}]"
249 -BDEPEND="${RDEPEND}
250 - test? (
251 - >=dev-python/pip-19.3.1-r1[${PYTHON_USEDEP}]
252 - dev-python/mock[${PYTHON_USEDEP}]
253 - dev-python/pypiserver[${PYTHON_USEDEP}]
254 - dev-python/pytest-localserver[${PYTHON_USEDEP}]
255 - dev-python/pytest-timeout[${PYTHON_USEDEP}]
256 - dev-python/pytest[${PYTHON_USEDEP}]
257 - dev-python/six[${PYTHON_USEDEP}]
258 - dev-python/wheel[${PYTHON_USEDEP}]
259 - )"
260 -
261 -DOCS=( docs/index.rst docs/changes.rst )
262 -
263 -PATCHES=(
264 - "${FILESDIR}/virtualenv-16.7.7-tests.patch"
265 -
266 - # disable tests that need internet access
267 - "${FILESDIR}/virtualenv-16.7.7-tests-internet.patch"
268 -
269 - # test fixes for pypy
270 - "${FILESDIR}/virtualenv-16.7.8-tests-pypy.patch"
271 -)
272 -
273 -distutils_enable_sphinx docs \
274 - dev-python/sphinx_rtd_theme \
275 - dev-python/towncrier
276 -
277 -python_test() {
278 - cp "${S}"/LICENSE.txt "${BUILD_DIR}"/lib || \
279 - die "Could not copy LICENSE.txt with ${EPYTHON}"
280 -
281 - pytest -vv tests || die "Tests fail with ${EPYTHON}"
282 -}
283 -
284 -pkg_postinst() {
285 - elog "Please note that while virtualenv package no longer supports"
286 - elog "Python 2.7, you can still create py2.7 virtualenvs via:"
287 - elog " $ virtualenv -p /usr/bin/python2.7 ..."
288 -}
289
290 diff --git a/dev-python/virtualenv/virtualenv-20.4.4.ebuild b/dev-python/virtualenv/virtualenv-20.4.4.ebuild
291 deleted file mode 100644
292 index 5de5c2f6118..00000000000
293 --- a/dev-python/virtualenv/virtualenv-20.4.4.ebuild
294 +++ /dev/null
295 @@ -1,99 +0,0 @@
296 -# Copyright 1999-2021 Gentoo Authors
297 -# Distributed under the terms of the GNU General Public License v2
298 -
299 -EAPI=7
300 -
301 -PYTHON_COMPAT=( python3_{7..9} pypy3 )
302 -DISTUTILS_USE_SETUPTOOLS=manual
303 -
304 -inherit distutils-r1
305 -
306 -DESCRIPTION="Virtual Python Environment builder"
307 -HOMEPAGE="
308 - https://virtualenv.pypa.io/en/stable/
309 - https://pypi.org/project/virtualenv/
310 - https://github.com/pypa/virtualenv/
311 -"
312 -SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
313 -
314 -LICENSE="MIT"
315 -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
316 -SLOT="0"
317 -
318 -RDEPEND="
319 - >=dev-python/appdirs-1.4.3[${PYTHON_USEDEP}]
320 - >=dev-python/distlib-0.3.1[${PYTHON_USEDEP}]
321 - >=dev-python/filelock-3[${PYTHON_USEDEP}]
322 - >=dev-python/setuptools-41[${PYTHON_USEDEP}]
323 - >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
324 - $(python_gen_cond_dep '
325 - >=dev-python/importlib_metadata-0.12[${PYTHON_USEDEP}]
326 - ' python3_{6,7} pypy3)
327 - $(python_gen_cond_dep '
328 - >=dev-python/importlib_resources-1.0[${PYTHON_USEDEP}]
329 - ' python3_6 pypy3)"
330 -# coverage is used somehow magically in virtualenv, maybe it actually
331 -# tests something useful
332 -BDEPEND="
333 - dev-python/setuptools_scm[${PYTHON_USEDEP}]
334 - test? (
335 - $(python_gen_cond_dep '
336 - dev-python/coverage[${PYTHON_USEDEP}]
337 - dev-python/flaky[${PYTHON_USEDEP}]
338 - >=dev-python/pip-20.0.2[${PYTHON_USEDEP}]
339 - >=dev-python/pytest-freezegun-0.4.1[${PYTHON_USEDEP}]
340 - >=dev-python/pytest-mock-2.0.0[${PYTHON_USEDEP}]
341 - >=dev-python/pytest-timeout-1.3.4[${PYTHON_USEDEP}]
342 - dev-python/wheel[${PYTHON_USEDEP}]
343 - >=dev-python/packaging-20.0[${PYTHON_USEDEP}]
344 - ' 'python3*')
345 - )"
346 -
347 -distutils_enable_sphinx docs \
348 - dev-python/sphinx_rtd_theme \
349 - dev-python/towncrier
350 -distutils_enable_tests pytest
351 -
352 -src_configure() {
353 - export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
354 -}
355 -
356 -python_test() {
357 - local deselect=(
358 - tests/unit/activation/test_xonsh.py
359 - tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
360 - tests/unit/create/test_creator.py::test_cross_major
361 - )
362 - [[ ${EPYTHON} == pypy3 ]] && deselect+=(
363 - 'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
364 - 'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
365 - 'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
366 - 'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
367 - 'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
368 - 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
369 - 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
370 - 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10-64-bin-]'
371 - 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10--bin-]'
372 - 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
373 - 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
374 - 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
375 - 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
376 - 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
377 - 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
378 - 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10-64-bin-]'
379 - 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10--bin-]'
380 - 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
381 - 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
382 - 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
383 - 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
384 - )
385 -
386 - distutils_install_for_testing
387 - epytest ${deselect[@]/#/--deselect }
388 -}
389 -
390 -pkg_postinst() {
391 - elog "Please note that while virtualenv package no longer supports"
392 - elog "Python 2.7, you can still create py2.7 virtualenvs via:"
393 - elog " $ virtualenv -p 2.7 ..."
394 -}