diff --git a/dev-python/ensurepip-pip/Manifest b/dev-python/ensurepip-pip/Manifest index ae87a2282350f..7c9d7e727ef6f 100644 --- a/dev-python/ensurepip-pip/Manifest +++ b/dev-python/ensurepip-pip/Manifest @@ -1,4 +1,2 @@ DIST flit_core-3.12.0-py3-none-any.whl 45594 BLAKE2B 7c6cb6eb03d45bbba27f27b3728881b57fe82dd38e03f884d3b7c46116eb2b9dd76f92bdaf7f594ef8ccbe12ec8f9a56424ff9e9fc7a839c4818a113fdf0c3d3 SHA512 790c12b1f43201e365fb3f8f2f0a54e1a578876799dfdf8bfeea679a25ea096bf62946d006618c1458ae6e37ce6d00998f37e9aba426d5ab80d32ef2d75da4e0 -DIST pip-25.3.gh.tar.gz 9115712 BLAKE2B 87d848c497163a45ee3de8f6f75c80b5051b07062c5a15450ae98b59a6cebc6bf03ca8525d57929493f2cfeb28d5623401eba69f0bdfc734389efbb84eafdf53 SHA512 f50db092213ec3bb819d3da5669f73d119b5ec7f7ac5e8a587a17c27eafa32bc17a057df09389c526a3769ef3577f5553187d54ceffa89aed63f4b4498ff044e DIST pip-26.0.1.gh.tar.gz 9227871 BLAKE2B 96a2fab2de472b3cde570f3bcbd6bc5e5c48ef2f0808ca9b2b6c0f57a611f723cd0f5d592b6b5f553fb57a6909459f57b4130f2451cd95c3b18678e02215e0c9 SHA512 3786df7522ea65bc20fb9885ce5c2ddc60200a536a1f754a8d7dc278115c73258863e4c51ac7e9a60dda0b70263730dc194f70e1e8f8d00178a8b3c724333bf0 -DIST pip-26.0.gh.tar.gz 9226836 BLAKE2B fe24bd8fca7fa2b64ed865a880a430c420a9e73e35a9f1f2405473d4778467f48a8bc0607c1423760ff23706d3e11ddfeb20cd5a7f6522530a679994278ee1d8 SHA512 62a62b2db4e7a6c795cf01ab553b94068f0d1c62470c1f5c2b3164344a84fa68f7854eec99d93b9f56193c61276d95d8af21a3cb6b78f0db4f013d9997e78199 diff --git a/dev-python/ensurepip-pip/ensurepip-pip-25.3.ebuild b/dev-python/ensurepip-pip/ensurepip-pip-25.3.ebuild deleted file mode 100644 index 52b52013ad926..0000000000000 --- a/dev-python/ensurepip-pip/ensurepip-pip-25.3.ebuild +++ /dev/null @@ -1,189 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=flit -# PYTHON_COMPAT is used only for testing -PYTHON_COMPAT=( pypy3_11 python3_{11..14} ) -PYTHON_REQ_USE="ssl(+),threads(+)" - -inherit distutils-r1 pypi - -FLIT_CORE_PV=3.12.0 - -MY_P=${P#ensurepip-} -DESCRIPTION="Shared pip wheel for ensurepip Python module" -HOMEPAGE=" - https://pip.pypa.io/en/stable/ - https://pypi.org/project/pip/ - https://github.com/pypa/pip/ -" -SRC_URI=" - https://github.com/pypa/pip/archive/${PV}.tar.gz -> ${MY_P}.gh.tar.gz - test? ( - $(pypi_wheel_url flit-core "${FLIT_CORE_PV}") - ) -" -S=${WORKDIR}/${MY_P} - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris" -IUSE="test test-rust" -RESTRICT="!test? ( test )" - -BDEPEND=" - ${RDEPEND} - test? ( - -Date: Thu, 31 Jul 2025 05:10:08 +0200 -Subject: [PATCH] Disable coverage & socket plugins inside test venvs - ---- - tests/conftest.py | 33 --------------------------------- - 1 file changed, 33 deletions(-) - -diff --git a/tests/conftest.py b/tests/conftest.py -index c98b87117..f4ef35a7e 100644 ---- a/tests/conftest.py -+++ b/tests/conftest.py -@@ -444,25 +444,6 @@ def wheel_install(tmpdir_factory: pytest.TempPathFactory, common_wheels: Path) - - return _common_wheel_editable_install(tmpdir_factory, common_wheels, "wheel") - - --@pytest.fixture(scope="session") --def coverage_install( -- tmpdir_factory: pytest.TempPathFactory, common_wheels: Path --) -> Path: -- return _common_wheel_editable_install(tmpdir_factory, common_wheels, "coverage") -- -- --@pytest.fixture(scope="session") --def socket_install(tmpdir_factory: pytest.TempPathFactory, common_wheels: Path) -> Path: -- lib_dir = _common_wheel_editable_install( -- tmpdir_factory, common_wheels, "pytest_subket" -- ) -- # pytest-subket is only included so it can intercept and block unexpected -- # network requests. It should NOT be visible to the pip under test. -- dist_info = next(lib_dir.glob("*.dist-info")) -- shutil.rmtree(dist_info) -- return lib_dir -- -- - def install_pth_link( - venv: VirtualEnvironment, project_name: str, lib_dir: Path - ) -> None: -@@ -479,8 +460,6 @@ def virtualenv_template( - pip_editable_parts: tuple[Path, ...], - setuptools_install: Path, - wheel_install: Path, -- coverage_install: Path, -- socket_install: Path, - ) -> VirtualEnvironment: - venv_type: VirtualEnvironmentType - if request.config.getoption("--use-venv"): -@@ -494,11 +473,7 @@ def virtualenv_template( - - # Install setuptools, wheel, pytest-subket, and pip. - install_pth_link(venv, "setuptools", setuptools_install) - install_pth_link(venv, "wheel", wheel_install) -- install_pth_link(venv, "pytest_subket", socket_install) -- # Also copy pytest-subket's .pth file so it can intercept socket calls. -- with open(venv.site / "pytest_socket.pth", "w") as f: -- f.write(socket_install.joinpath("pytest_socket.pth").read_text()) - - pth, dist_info = pip_editable_parts - -@@ -511,13 +485,6 @@ def virtualenv_template( - # detects changed files. - venv.site.joinpath("easy-install.pth").touch() - -- # Install coverage and pth file for executing it in any spawned processes -- # in this virtual environment. -- install_pth_link(venv, "coverage", coverage_install) -- # zz prefix ensures the file is after easy-install.pth. -- with open(venv.site / "zz-coverage-helper.pth", "a") as f: -- f.write("import coverage; coverage.process_startup()") -- - # Drop (non-relocatable) launchers. - for exe in os.listdir(venv.bin): - if not exe.startswith(("python", "libpy")): # Don't remove libpypy-c.so...