commit: 6d3800de1a35cbcb1da14d093bfd31319d248a71 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Tue May 16 16:10:07 2023 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Mon May 22 21:26:00 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d3800de
dev-python/pip: remove unused patches Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/31063 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> .../files/pip-20.0.2-disable-system-install.patch | 29 ------------ dev-python/pip/files/pip-22.2.1-no-coverage.patch | 52 ---------------------- 2 files changed, 81 deletions(-) diff --git a/dev-python/pip/files/pip-20.0.2-disable-system-install.patch b/dev-python/pip/files/pip-20.0.2-disable-system-install.patch deleted file mode 100644 index e0b0034e407a..000000000000 --- a/dev-python/pip/files/pip-20.0.2-disable-system-install.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 3aee04cbb93c0e479b040e682b2aef676629c9a2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <[email protected]> -Date: Sat, 1 Feb 2020 09:14:46 +0100 -Subject: [PATCH] install: Raise an error to avoid breaking python-exec - -Running pip without --target, --prefix, --root, or --user will result -in packages being installed systemwide. This has a tendency to break -python-exec if setuptools gets installed or upgraded. ---- - src/pip/_internal/commands/install.py | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/pip/_internal/commands/install.py b/src/pip/_internal/commands/install.py -index 8c2c32fd..41bac878 100644 ---- a/src/pip/_internal/commands/install.py -+++ b/src/pip/_internal/commands/install.py -@@ -238,6 +238,9 @@ class InstallCommand(RequirementCommand): - if options.upgrade: - upgrade_strategy = options.upgrade_strategy - -+ if not options.use_user_site and not options.target_dir and not options.root_path and not options.prefix_path and not os.getenv('GENTOO_PIP_TESTING'): -+ raise CommandError("(Gentoo) Please run pip with the --user option to avoid breaking python-exec") -+ - cmdoptions.check_dist_restriction(options, check_target=True) - - install_options = options.install_options or [] --- -2.28.0 - diff --git a/dev-python/pip/files/pip-22.2.1-no-coverage.patch b/dev-python/pip/files/pip-22.2.1-no-coverage.patch deleted file mode 100644 index bd9523956ca8..000000000000 --- a/dev-python/pip/files/pip-22.2.1-no-coverage.patch +++ /dev/null @@ -1,52 +0,0 @@ -From fe4438ee999938da3b6f67b4dd53d6676d67c3e7 Mon Sep 17 00:00:00 2001 -From: Arthur Zamarin <[email protected]> -Date: Fri, 29 Jul 2022 14:06:03 +0300 -Subject: [PATCH] Disable coverage testing support inside test venvs - ---- - tests/conftest.py | 15 --------------- - 1 file changed, 15 deletions(-) - -diff --git a/tests/conftest.py b/tests/conftest.py -index c9ab292..e7c14df 100644 ---- a/tests/conftest.py -+++ b/tests/conftest.py -@@ -403,13 +403,6 @@ def wheel_install(tmpdir_factory: pytest.TempPathFactory, common_wheels: Path) - - return _common_wheel_editable_install(tmpdir_factory, common_wheels, "wheel") - - [email protected](scope="session") --def coverage_install( -- tmpdir_factory: pytest.TempPathFactory, common_wheels: Path --) -> Path: -- return _common_wheel_editable_install(tmpdir_factory, common_wheels, "coverage") -- -- - def install_pth_link( - venv: VirtualEnvironment, project_name: str, lib_dir: Path - ) -> None: -@@ -424,7 +417,6 @@ def virtualenv_template( - tmpdir_factory: pytest.TempPathFactory, - pip_src: Path, - setuptools_install: Path, -- coverage_install: Path, - ) -> Iterator[VirtualEnvironment]: - - venv_type: VirtualEnvironmentType -@@ -451,13 +443,6 @@ def virtualenv_template( - [os.fspath(venv.bin / "python"), "setup.py", "-q", "develop"], cwd=pip_editable - ) - -- # 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 ( --- -2.35.1 -
