commit: 125eb590df07b5972d36b0cb8ad427ad6e3d6b2b Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sat May 31 08:35:17 2025 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sat May 31 09:24:25 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=125eb590
dev-python/virtualenv: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-python/virtualenv/Manifest | 2 - .../files/virtualenv-20.26.3-ensurepip.patch | 37 ------ dev-python/virtualenv/virtualenv-20.30.0.ebuild | 134 -------------------- dev-python/virtualenv/virtualenv-20.31.1.ebuild | 138 --------------------- 4 files changed, 311 deletions(-) diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest index 6e00bee6117d..e808055ae304 100644 --- a/dev-python/virtualenv/Manifest +++ b/dev-python/virtualenv/Manifest @@ -1,3 +1 @@ -DIST virtualenv-20.30.0.tar.gz 4346945 BLAKE2B 67e78ae9e0b51799da4d3b1f981b70e4727d43f044cb699fcf93c00af181457f0bce8f5519e2b9b36b7713608a14da21bc1a8767d5c10a7791830f52580af70c SHA512 c7a43fe7ba1fa5224252d4d0982120b5ef353a20fd3b48c52f62a0ef46f63a795dcf2c5388449cdec3f24316dda77724f801358330baa71501e1dfd16dcda2ab -DIST virtualenv-20.31.1.tar.gz 6076234 BLAKE2B d97adc477cf09d8944289d7e395428454e3867516bf3a84da08b598299b0a293eff5d6ea3a25dc906b1023d32eefcb0aa37f8515a68ab338de8d61c3c998df8f SHA512 1bac09af8a8db0104332e129f2a7a6623408547a1af63a2168a3e1519ff708c33d0665be489085548c0ae17962d787c5eec81d02920e32e256085ea4de5e7774 DIST virtualenv-20.31.2.tar.gz 6076316 BLAKE2B 23584e0b5f556d95dcc1c24da4c140749fe8edd9abee9213cb47c89a43c7b8aa26d0f539523d93600c2d023db4153bd1ae2e2c33996677dfc3eef3ec4d9d7201 SHA512 b253fdd81412cbde1358a885ab25db62d7ee05309fd37c6d81cccde570f70acdd4ae13204dcf0a97cea67b6d6524d8d083ff6ca43a0ee22c513b39f1e37ee6f3 diff --git a/dev-python/virtualenv/files/virtualenv-20.26.3-ensurepip.patch b/dev-python/virtualenv/files/virtualenv-20.26.3-ensurepip.patch deleted file mode 100644 index c4b631e5a2b6..000000000000 --- a/dev-python/virtualenv/files/virtualenv-20.26.3-ensurepip.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 468118fcf55abf1fd4927ad0ab0b48bbb25c0a3c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <[email protected]> -Date: Sat, 22 Jun 2024 14:28:23 +0200 -Subject: [PATCH] [Gentoo] Use ensurepip wheels instead of local bundle - ---- - src/virtualenv/seed/wheels/embed/__init__.py | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/src/virtualenv/seed/wheels/embed/__init__.py b/src/virtualenv/seed/wheels/embed/__init__.py -index 102ed8e..66ba52b 100644 ---- a/src/virtualenv/seed/wheels/embed/__init__.py -+++ b/src/virtualenv/seed/wheels/embed/__init__.py -@@ -1,5 +1,6 @@ - from __future__ import annotations - -+import sysconfig - from pathlib import Path - - from virtualenv.seed.wheels.util import Wheel -@@ -51,6 +52,13 @@ MAX = "3.7" - - - def get_embed_wheel(distribution, for_py_version): -+ # Gentoo hack: get wheel from ensurepip directory -+ bundle_dir = Path(sysconfig.get_config_var("WHEEL_PKG_DIR")) -+ try: -+ return Wheel.from_path(next(bundle_dir.glob(f"{distribution}-*.whl"))) -+ except StopIteration: -+ return None -+ - path = BUNDLE_FOLDER / (BUNDLE_SUPPORT.get(for_py_version, {}) or BUNDLE_SUPPORT[MAX]).get(distribution) - return Wheel.from_path(path) - --- -2.45.2 - diff --git a/dev-python/virtualenv/virtualenv-20.30.0.ebuild b/dev-python/virtualenv/virtualenv-20.30.0.ebuild deleted file mode 100644 index 4cd9d91edca7..000000000000 --- a/dev-python/virtualenv/virtualenv-20.30.0.ebuild +++ /dev/null @@ -1,134 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=hatchling -PYTHON_TESTED=( python3_{10..13} pypy3 pypy3_11 ) -PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_13t ) - -inherit distutils-r1 multiprocessing pypi - -DESCRIPTION="Virtual Python Environment builder" -HOMEPAGE=" - https://virtualenv.pypa.io/en/stable/ - https://pypi.org/project/virtualenv/ - https://github.com/pypa/virtualenv/ -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" - -RDEPEND=" - >=dev-python/distlib-0.3.7[${PYTHON_USEDEP}] - >=dev-python/filelock-3.12.2[${PYTHON_USEDEP}] - >=dev-python/platformdirs-3.9.1[${PYTHON_USEDEP}] - - dev-python/ensurepip-pip - dev-python/ensurepip-setuptools - dev-python/ensurepip-wheel -" -# coverage is used somehow magically in virtualenv, maybe it actually -# tests something useful -BDEPEND=" - dev-python/hatch-vcs[${PYTHON_USEDEP}] - test? ( - $(python_gen_cond_dep ' - dev-python/coverage[${PYTHON_USEDEP}] - dev-python/flaky[${PYTHON_USEDEP}] - >=dev-python/pip-22.2.1[${PYTHON_USEDEP}] - >=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}] - dev-python/pytest-xdist[${PYTHON_USEDEP}] - >=dev-python/setuptools-67.8[${PYTHON_USEDEP}] - dev-python/wheel[${PYTHON_USEDEP}] - >=dev-python/packaging-20.0[${PYTHON_USEDEP}] - ' "${PYTHON_TESTED[@]}") - $(python_gen_cond_dep ' - dev-python/time-machine[${PYTHON_USEDEP}] - ' python3_{10..13}) - $(python_gen_cond_dep ' - >=dev-python/pytest-freezer-0.4.6[${PYTHON_USEDEP}] - ' 'pypy3*') - ) -" - -EPYTEST_TIMEOUT=180 -distutils_enable_tests pytest - -src_prepare() { - local PATCHES=( - # use wheels from ensurepip bundle - "${FILESDIR}/${PN}-20.26.3-ensurepip.patch" - ) - - distutils-r1_src_prepare - - # workaround test failures due to warnings from setuptools-scm, sigh - echo '[tool.setuptools_scm]' >> pyproject.toml || die - - # remove useless pins - sed -i -e 's:,<[0-9.]*::' pyproject.toml || die - - # remove bundled wheels - rm src/virtualenv/seed/wheels/embed/*.whl || die -} - -python_test() { - if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then - einfo "Skipping testing on ${EPYTHON}" - return - fi - - local EPYTEST_DESELECT=( - tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data - # tests for old wheels with py3.7 support - tests/unit/seed/embed/test_pip_invoke.py::test_base_bootstrap_via_pip_invoke - tests/unit/seed/wheels/test_wheels_util.py::test_wheel_not_support - # broken by different wheel versions in ensurepip - tests/unit/seed/wheels/test_acquire_find_wheel.py::test_find_latest_string - tests/unit/seed/wheels/test_acquire_find_wheel.py::test_find_exact - tests/unit/seed/wheels/test_acquire_find_wheel.py::test_find_latest_none - tests/unit/seed/wheels/test_acquire.py::test_download_wheel_bad_output - # hangs on a busy system, sigh - tests/unit/test_util.py::test_reentrant_file_lock_is_thread_safe - ) - case ${EPYTHON} in - pypy3.11) - EPYTEST_DESELECT+=( - # these don't like the executable called pypy3.11? - tests/unit/activation/test_bash.py::test_bash - tests/unit/activation/test_fish.py::test_fish - tests/unit/discovery/py_info/test_py_info.py::test_fallback_existent_system_executable - ) - ;; - python3.1[23]) - EPYTEST_DESELECT+=( - tests/unit/create/via_global_ref/test_build_c_ext.py - ) - ;& - python3.11) - EPYTEST_DESELECT+=( - # TODO - tests/unit/discovery/py_info/test_py_info.py::test_fallback_existent_system_executable - ) - ;; - esac - - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - local -x TZ=UTC - local plugins=( -p flaky -p pytest_mock ) - if [[ ${EPYTHON} == pypy3* ]]; then - plugins+=( -p freezer ) - else - plugins+=( -p time_machine ) - fi - epytest "${plugins[@]}" -p xdist -n "$(makeopts_jobs)" --dist=worksteal -} - -src_install() { - distutils-r1_src_install - - # remove bundled wheels, we're using ensurepip bundle instead - find "${ED}" -name '*.whl' -delete || die -} diff --git a/dev-python/virtualenv/virtualenv-20.31.1.ebuild b/dev-python/virtualenv/virtualenv-20.31.1.ebuild deleted file mode 100644 index affd12204e66..000000000000 --- a/dev-python/virtualenv/virtualenv-20.31.1.ebuild +++ /dev/null @@ -1,138 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=hatchling -PYTHON_TESTED=( python3_{11..13} pypy3_11 ) -PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_13t ) - -inherit distutils-r1 pypi - -DESCRIPTION="Virtual Python Environment builder" -HOMEPAGE=" - https://virtualenv.pypa.io/en/stable/ - https://pypi.org/project/virtualenv/ - https://github.com/pypa/virtualenv/ -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" - -RDEPEND=" - >=dev-python/distlib-0.3.7[${PYTHON_USEDEP}] - >=dev-python/filelock-3.12.2[${PYTHON_USEDEP}] - >=dev-python/platformdirs-3.9.1[${PYTHON_USEDEP}] - - dev-python/ensurepip-pip - dev-python/ensurepip-setuptools - dev-python/ensurepip-wheel -" -# coverage is used somehow magically in virtualenv, maybe it actually -# tests something useful -BDEPEND=" - dev-python/hatch-vcs[${PYTHON_USEDEP}] - test? ( - $(python_gen_cond_dep ' - dev-python/coverage[${PYTHON_USEDEP}] - dev-python/flaky[${PYTHON_USEDEP}] - >=dev-python/pip-22.2.1[${PYTHON_USEDEP}] - >=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}] - dev-python/pytest-timeout[${PYTHON_USEDEP}] - dev-python/pytest-xdist[${PYTHON_USEDEP}] - >=dev-python/setuptools-67.8[${PYTHON_USEDEP}] - dev-python/wheel[${PYTHON_USEDEP}] - >=dev-python/packaging-20.0[${PYTHON_USEDEP}] - ' "${PYTHON_TESTED[@]}") - $(python_gen_cond_dep ' - dev-python/time-machine[${PYTHON_USEDEP}] - ' python3_{11..13}) - $(python_gen_cond_dep ' - >=dev-python/pytest-freezer-0.4.6[${PYTHON_USEDEP}] - ' 'pypy3*') - ) -" - -distutils_enable_tests pytest - -src_prepare() { - local PATCHES=( - # use wheels from ensurepip bundle - "${FILESDIR}/${PN}-20.31.1-ensurepip.patch" - ) - - distutils-r1_src_prepare - - # workaround test failures due to warnings from setuptools-scm, sigh - echo '[tool.setuptools_scm]' >> pyproject.toml || die - - # remove useless pins - sed -i -e 's:,<[0-9.]*::' pyproject.toml || die - - # remove bundled wheels - rm src/virtualenv/seed/wheels/embed/*.whl || die -} - -python_test() { - if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then - einfo "Skipping testing on ${EPYTHON}" - return - fi - - local EPYTEST_DESELECT=( - tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data - # tests for old wheels with py3.7 support - tests/unit/seed/embed/test_pip_invoke.py::test_base_bootstrap_via_pip_invoke - tests/unit/seed/wheels/test_wheels_util.py::test_wheel_not_support - # broken by different wheel versions in ensurepip - tests/unit/seed/wheels/test_acquire_find_wheel.py::test_find_latest_string - tests/unit/seed/wheels/test_acquire_find_wheel.py::test_find_exact - tests/unit/seed/wheels/test_acquire_find_wheel.py::test_find_latest_none - tests/unit/seed/wheels/test_acquire.py::test_download_wheel_bad_output - # hangs on a busy system, sigh - tests/unit/test_util.py::test_reentrant_file_lock_is_thread_safe - # TODO - tests/unit/create/via_global_ref/test_build_c_ext.py::test_can_build_c_extensions - ) - case ${EPYTHON} in - pypy3.11) - EPYTEST_DESELECT+=( - # these don't like the executable called pypy3.11? - tests/unit/activation/test_bash.py::test_bash - tests/unit/activation/test_fish.py::test_fish - tests/unit/discovery/py_info/test_py_info.py::test_fallback_existent_system_executable - ) - ;; - python3.1[23]) - EPYTEST_DESELECT+=( - tests/unit/create/via_global_ref/test_build_c_ext.py - ) - ;& - python3.11) - EPYTEST_DESELECT+=( - # TODO - tests/unit/discovery/py_info/test_py_info.py::test_fallback_existent_system_executable - ) - ;; - esac - - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - local -x TZ=UTC - local plugins=( -p flaky -p pytest_mock ) - if [[ ${EPYTHON} == pypy3* ]]; then - plugins+=( -p freezer ) - else - plugins+=( -p time_machine ) - fi - local EPYTEST_TIMEOUT=180 - local EPYTEST_XDIST=1 - epytest "${plugins[@]}" -} - -src_install() { - distutils-r1_src_install - - # remove bundled wheels, we're using ensurepip bundle instead - find "${ED}" -name '*.whl' -delete || die -}
