From bff543bb632933380da922cbfc07c67157d72d42 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 23 Jun 2024 00:11:31 +0100 Subject: gentoo auto-resync : 23:06:2024 - 00:11:30 --- dev-python/virtualenv/Manifest | 5 + .../files/virtualenv-20.26.3-ensurepip.patch | 37 +++++++ dev-python/virtualenv/virtualenv-20.26.3-r1.ebuild | 97 ++++++++++++++++ dev-python/virtualenv/virtualenv-20.26.3-r2.ebuild | 118 ++++++++++++++++++++ dev-python/virtualenv/virtualenv-20.26.3.ebuild | 123 +++++++++++++++++++++ 5 files changed, 380 insertions(+) create mode 100644 dev-python/virtualenv/files/virtualenv-20.26.3-ensurepip.patch create mode 100644 dev-python/virtualenv/virtualenv-20.26.3-r1.ebuild create mode 100644 dev-python/virtualenv/virtualenv-20.26.3-r2.ebuild create mode 100644 dev-python/virtualenv/virtualenv-20.26.3.ebuild (limited to 'dev-python/virtualenv') diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest index f74c74b57e51..b610d6df3557 100644 --- a/dev-python/virtualenv/Manifest +++ b/dev-python/virtualenv/Manifest @@ -1,3 +1,8 @@ +AUX virtualenv-20.26.3-ensurepip.patch 1231 BLAKE2B e70cb1a5f8dc8ccf6e08fce67aa3485c0f584937d8e7b693f0d0859d6ec9d9b16bf1492b9abe96d4c8c8eb12814eaa54f76ed8e318f3871ee956189ce08b3dff SHA512 86c98d7ce4a9ea073c72cd103cbce66ed720794fa4fa2b68ac19382e3c4f53303613aed80a6984a68cab513cb198d648c5c6f103308eacb3c7306b72e4321129 DIST virtualenv-20.26.2.tar.gz 7290363 BLAKE2B 7b9ee7bd49d8fbb90de2716ea928b228b71ce3e344e9eeb2666974db41c389c9c0e14db66a77bf31cd7fe68c6f24a09686f2c0d40b9d1a0ef6974f50c8cd3d37 SHA512 49b78bb2b339a41637faa887728f195b042133506092e0793adf049b5b1523fab89222809449323a1eb771fa40d2f55df6dd97c16d765d7a78dc9299185fb864 +DIST virtualenv-20.26.3.tar.gz 9057588 BLAKE2B 74268cab291e7f1e3db6a4c56f0ede1d7995069cb5594341d9af0609196a8154e9153f920043b48100c2263b7020c819135e29532483b233f3c37bf3b780592f SHA512 0cd3b4dc082d071305b44dd2aba2b28527e630b6b4bf28b7b6c59f3e061b01c1dfcfb64293f2b1904109e9e27b70a873cc8c3f1a3cde73bfee114943cef92ca7 EBUILD virtualenv-20.26.2.ebuild 5109 BLAKE2B cfa6a24d3135e961836ca5e90504e6d61124257bc708f15b1159b2f9d0111b223077eedda7420bb289f285562f9a261fc79a0ea3d826d81eb51dbced81328924 SHA512 656d528f0f183f525b0a4d2ad524a4499e7729b6e31703caf6e091e3f08ed6c7bc7e4ba866601c6a8a4a717dd12c22af94af3037fbfbf2a7011e71eb442dcfdf +EBUILD virtualenv-20.26.3-r1.ebuild 2857 BLAKE2B c44af35f100b989c8926aff08b0c62001ea4b9c61399774e903cbea1a92d4ef1df217c70273ceecbea5f2fdd87d9487671dc8f83b5239f09d09172a7ae3291e5 SHA512 75b7b835e9f1e2befc1cc7273aeffe6a7bfada1f9d7e6d32108ef2f82c130af0aeaa5b87e4d776d20c04589164cf7335024892432d34902c4bd3fbd569fa660a +EBUILD virtualenv-20.26.3-r2.ebuild 3434 BLAKE2B 7a4df00d6f72faadc29b237b41ed13f89e8bdc706f8d629c384e7524d6211ed18cfd5ecd22cd8198e04998482fdba2cadffe19009bdb1d246db671652b1030eb SHA512 9b60ae8923b116f715c242131301f4f68829ad895a2a34cdb40baeccba43cf3e31df8a6933d05213a40cf866be58f8b33176ac6ca184cbcf640f42a655545bfb +EBUILD virtualenv-20.26.3.ebuild 5115 BLAKE2B 667e5029439b21fdceaf89837b52fec3bbd9db1271d026e603740b42bf03690d01a4a253c1814b656afb07888f6e36cef699f65d681ce506886f4f873e9acfd9 SHA512 373385554fd4159aec5a15fdbb6ea7cc987262bac947b5dc767b96ae738a2ec4a5837796ca5907503fb92288b72915fb5b4a46ab098f96f589ef5477f266c2a5 MISC metadata.xml 406 BLAKE2B 97fee04c2662c5c36b6e16538284def46eb2454424770f42edf2567ed804ca15c4e969c714c57573f897b0946246577ab6e35204ed1f3f1735713d8ab5d24667 SHA512 356d42db463b63a3b3a55c1e98eb661de0a10aa6a5fde4f8b3f888ec73020c6679e86efd8dbb0b3e4a5a720af95e658612ba460fe548e081a90beec75fb9c1b2 diff --git a/dev-python/virtualenv/files/virtualenv-20.26.3-ensurepip.patch b/dev-python/virtualenv/files/virtualenv-20.26.3-ensurepip.patch new file mode 100644 index 000000000000..c4b631e5a2b6 --- /dev/null +++ b/dev-python/virtualenv/files/virtualenv-20.26.3-ensurepip.patch @@ -0,0 +1,37 @@ +From 468118fcf55abf1fd4927ad0ab0b48bbb25c0a3c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +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.26.3-r1.ebuild b/dev-python/virtualenv/virtualenv-20.26.3-r1.ebuild new file mode 100644 index 000000000000..d1b4351e7808 --- /dev/null +++ b/dev-python/virtualenv/virtualenv-20.26.3-r1.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=hatchling +PYTHON_COMPAT=( python3_{10..13} pypy3 ) + +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 ~ia64 ~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}] +" +# coverage is used somehow magically in virtualenv, maybe it actually +# tests something useful +BDEPEND=" + dev-python/hatch-vcs[${PYTHON_USEDEP}] + test? ( + dev-python/coverage[${PYTHON_USEDEP}] + dev-python/flaky[${PYTHON_USEDEP}] + >=dev-python/pip-22.2.1[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + >=dev-python/pytest-freezer-0.4.6[${PYTHON_USEDEP}] + ' pypy3) + >=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}] + dev-python/pytest-xdist[${PYTHON_USEDEP}] + >=dev-python/setuptools-67.8[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/time-machine[${PYTHON_USEDEP}] + ' 'python3*') + dev-python/wheel[${PYTHON_USEDEP}] + >=dev-python/packaging-20.0[${PYTHON_USEDEP}] + ) +" + +EPYTEST_TIMEOUT=180 +distutils_enable_tests pytest + +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 wheels bundled for Python 3.7 -- we don't have it anymore + rm src/virtualenv/seed/wheels/embed/{pip-24.0,setuptools-68.0.0,wheel-0.42.0}-py3-none-any.whl || die + + distutils-r1_src_prepare +} + +python_test() { + local EPYTEST_DESELECT=( + tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data + # tests old wheels for py3.7 support (that we're removing) + 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 + # hangs on a busy system, sigh + tests/unit/test_util.py::test_reentrant_file_lock_is_thread_safe + ) + case ${EPYTHON} in + 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 +} diff --git a/dev-python/virtualenv/virtualenv-20.26.3-r2.ebuild b/dev-python/virtualenv/virtualenv-20.26.3-r2.ebuild new file mode 100644 index 000000000000..ad9030250af1 --- /dev/null +++ b/dev-python/virtualenv/virtualenv-20.26.3-r2.ebuild @@ -0,0 +1,118 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=hatchling +PYTHON_COMPAT=( python3_{10..13} pypy3 ) + +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 ~ia64 ~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? ( + dev-python/coverage[${PYTHON_USEDEP}] + dev-python/flaky[${PYTHON_USEDEP}] + >=dev-python/pip-22.2.1[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + >=dev-python/pytest-freezer-0.4.6[${PYTHON_USEDEP}] + ' pypy3) + >=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}] + dev-python/pytest-xdist[${PYTHON_USEDEP}] + >=dev-python/setuptools-67.8[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/time-machine[${PYTHON_USEDEP}] + ' 'python3*') + dev-python/wheel[${PYTHON_USEDEP}] + >=dev-python/packaging-20.0[${PYTHON_USEDEP}] + ) +" + +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() { + 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 + 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.26.3.ebuild b/dev-python/virtualenv/virtualenv-20.26.3.ebuild new file mode 100644 index 000000000000..761735493c2b --- /dev/null +++ b/dev-python/virtualenv/virtualenv-20.26.3.ebuild @@ -0,0 +1,123 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=hatchling +PYTHON_COMPAT=( python3_{10..13} pypy3 ) + +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 ~ia64 ~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}] +" +# coverage is used somehow magically in virtualenv, maybe it actually +# tests something useful +BDEPEND=" + dev-python/hatch-vcs[${PYTHON_USEDEP}] + test? ( + dev-python/coverage[${PYTHON_USEDEP}] + dev-python/flaky[${PYTHON_USEDEP}] + >=dev-python/pip-22.2.1[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + >=dev-python/pytest-freezer-0.4.6[${PYTHON_USEDEP}] + ' pypy3) + >=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}] + dev-python/pytest-xdist[${PYTHON_USEDEP}] + >=dev-python/setuptools-67.8[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/time-machine[${PYTHON_USEDEP}] + ' 'python3*') + dev-python/wheel[${PYTHON_USEDEP}] + >=dev-python/packaging-20.0[${PYTHON_USEDEP}] + ) +" + +EPYTEST_TIMEOUT=180 +distutils_enable_tests pytest + +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 + + distutils-r1_src_prepare +} + +python_test() { + local EPYTEST_DESELECT=( + tests/unit/activation/test_xonsh.py + tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data + tests/unit/create/test_creator.py::test_cross_major + # tests failing without python2 installed + "tests/unit/create/test_creator.py::test_py_pyc_missing[True-False]" + "tests/unit/create/test_creator.py::test_py_pyc_missing[False-False]" + ) + case ${EPYTHON} in + pypy3) + EPYTEST_DESELECT+=( + 'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]' + 'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]' + 'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]' + 'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]' + 'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-isolated]' + 'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-global]' + 'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-isolated]' + 'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-global]' + 'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools' + 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]' + 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]' + 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10-64-bin-]' + 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10--bin-]' + 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]' + 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]' + 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]' + 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]' + 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]' + 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]' + 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10-64-bin-]' + 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10--bin-]' + 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]' + 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]' + 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]' + 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]' + ) + ;; + 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 +} -- cgit v1.2.3