From 53f08d4be4a7489488002f7b4bc0a45eb9c3b53c Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 20 Feb 2024 11:42:28 +0100 Subject: [PATCH] dev-python/pip: Add from Gentoo It's from Gentoo commit 09e4204374adb30c3c315588ef318bc81ead9720. --- .../portage-stable/dev-python/pip/Manifest | 1 + .../pip/files/pip-23.1-no-coverage.patch | 52 +++++++ .../pip/files/pip-23.3.1-no-color.patch | 35 +++++ .../dev-python/pip/metadata.xml | 13 ++ .../dev-python/pip/pip-24.0.ebuild | 136 ++++++++++++++++++ 5 files changed, 237 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/dev-python/pip/Manifest create mode 100644 sdk_container/src/third_party/portage-stable/dev-python/pip/files/pip-23.1-no-coverage.patch create mode 100644 sdk_container/src/third_party/portage-stable/dev-python/pip/files/pip-23.3.1-no-color.patch create mode 100644 sdk_container/src/third_party/portage-stable/dev-python/pip/metadata.xml create mode 100644 sdk_container/src/third_party/portage-stable/dev-python/pip/pip-24.0.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pip/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/pip/Manifest new file mode 100644 index 0000000000..3116dbf304 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/pip/Manifest @@ -0,0 +1 @@ +DIST pip-24.0.gh.tar.gz 9398156 BLAKE2B 17a7ed9e15e9b8efa0d3e3c5586dc446958b62cf9ba52155a0d1ad97a3e212ee7a08a0e88a592718fc3d542eb8f434155a75cb98d90c008904bd8f59bd2b40b6 SHA512 0c2ecb2ecde4f155c83468d35bc4f52f37efffc16821ae7c706d035e1e8cc3709b41cb10f8140ff09205e8bbdba2c76128ad76d1cbd18401328b619228e834df diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pip/files/pip-23.1-no-coverage.patch b/sdk_container/src/third_party/portage-stable/dev-python/pip/files/pip-23.1-no-coverage.patch new file mode 100644 index 0000000000..943cc281cd --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/pip/files/pip-23.1-no-coverage.patch @@ -0,0 +1,52 @@ +From d915b0eec7b5844c06b5d8853544c8c5b538b0b9 Mon Sep 17 00:00:00 2001 +From: Arthur Zamarin +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 57dd7e68a..af2af9ffa 100644 +--- a/tests/conftest.py ++++ b/tests/conftest.py +@@ -408,13 +408,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") +- +- + def install_pth_link( + venv: VirtualEnvironment, project_name: str, lib_dir: Path + ) -> None: +@@ -430,7 +423,6 @@ def virtualenv_template( + pip_src: Path, + setuptools_install: Path, + wheel_install: Path, +- coverage_install: Path, + ) -> Iterator[VirtualEnvironment]: + venv_type: VirtualEnvironmentType + if request.config.getoption("--use-venv"): +@@ -457,13 +449,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.40.0 + diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pip/files/pip-23.3.1-no-color.patch b/sdk_container/src/third_party/portage-stable/dev-python/pip/files/pip-23.3.1-no-color.patch new file mode 100644 index 0000000000..528e2c6cf4 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/pip/files/pip-23.3.1-no-color.patch @@ -0,0 +1,35 @@ +From ad01e9c2a965d395c5902c8ad70c970c7631316b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +Date: Sat, 25 Nov 2023 07:36:59 +0100 +Subject: [PATCH] Fix tests when NO_COLOR is set in the calling environment + +Add `FORCE_COLOR` and `NO_COLOR` variables to the `isolate()` fixture +to ensure that these two variables do not affect internal test output. +This fixes the following two test failures when pytest is called with +`NO_COLOR` set: + +``` +FAILED tests/unit/test_exceptions.py::TestDiagnosticPipErrorPresentation_ASCII::test_complete_color - AssertionError: assert '\x1b[1merror...ing harder.\n' == '\x1b[1;31mer...ing harder.\n' +FAILED tests/unit/test_exceptions.py::TestDiagnosticPipErrorPresentation_Unicode::test_complete_color - AssertionError: assert '\x1b[1merror...ing harder.\n' == '\x1b[1;31mer...ing harder.\n' +``` +--- + news/7ae28a10-04c4-4a1f-a276-4c9e04f2e0c1.trivial.rst | 0 + tests/conftest.py | 4 ++++ + 2 files changed, 4 insertions(+) + create mode 100644 news/7ae28a10-04c4-4a1f-a276-4c9e04f2e0c1.trivial.rst + +diff --git a/tests/conftest.py b/tests/conftest.py +index c5bf4bb9567..8d9eb029c79 100644 +--- a/tests/conftest.py ++++ b/tests/conftest.py +@@ -318,6 +318,10 @@ def isolate(tmpdir: Path, monkeypatch: pytest.MonkeyPatch) -> None: + # Make sure tests don't share a requirements tracker. + monkeypatch.delenv("PIP_BUILD_TRACKER", False) + ++ # Make sure color control variables don't affect internal output. ++ monkeypatch.delenv("FORCE_COLOR", False) ++ monkeypatch.delenv("NO_COLOR", False) ++ + # FIXME: Windows... + os.makedirs(os.path.join(home_dir, ".config", "git")) + with open(os.path.join(home_dir, ".config", "git", "config"), "wb") as fp: diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pip/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-python/pip/metadata.xml new file mode 100644 index 0000000000..632fe93333 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/pip/metadata.xml @@ -0,0 +1,13 @@ + + + + + python@gentoo.org + Python + + + + pip + pypa/pip + + diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pip/pip-24.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/pip/pip-24.0.ebuild new file mode 100644 index 0000000000..8e9ed08586 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/pip/pip-24.0.ebuild @@ -0,0 +1,136 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# please bump dev-python/ensurepip-pip along with this package! + +DISTUTILS_USE_PEP517=setuptools +PYTHON_TESTED=( python3_{10..12} ) +PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" pypy3 ) +PYTHON_REQ_USE="ssl(+),threads(+)" + +inherit bash-completion-r1 distutils-r1 + +DESCRIPTION="The PyPA recommended tool for installing Python packages" +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 -> ${P}.gh.tar.gz +" + +LICENSE="MIT" +# bundled deps +LICENSE+=" Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MPL-2.0 PSF-2" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +SLOT="0" +IUSE="test-rust" + +RDEPEND=" + >=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}] +" +BDEPEND=" + ${RDEPEND} + test? ( + $(python_gen_cond_dep ' + dev-python/ensurepip-setuptools + dev-python/ensurepip-wheel + dev-python/freezegun[${PYTHON_USEDEP}] + dev-python/pretend[${PYTHON_USEDEP}] + dev-python/pytest-xdist[${PYTHON_USEDEP}] + dev-python/scripttest[${PYTHON_USEDEP}] + dev-python/tomli-w[${PYTHON_USEDEP}] + dev-python/virtualenv[${PYTHON_USEDEP}] + dev-python/werkzeug[${PYTHON_USEDEP}] + dev-python/wheel[${PYTHON_USEDEP}] + test-rust? ( + dev-python/cryptography[${PYTHON_USEDEP}] + ) + ' "${PYTHON_TESTED[@]}") + ) +" + +distutils_enable_tests pytest + +python_prepare_all() { + local PATCHES=( + "${FILESDIR}/pip-23.1-no-coverage.patch" + # https://github.com/pypa/pip/pull/12415 + "${FILESDIR}/pip-23.3.1-no-color.patch" + ) + + distutils-r1_python_prepare_all + + if use test; then + local wheels=( + "${BROOT}"/usr/lib/python/ensurepip/{setuptools,wheel}-*.whl + ) + mkdir tests/data/common_wheels/ || die + cp "${wheels[@]}" tests/data/common_wheels/ || die + fi +} + +python_compile_all() { + # 'pip completion' command embeds full $0 into completion script, which confuses + # 'complete' and causes QA warning when running as "${PYTHON} -m pip". + # This trick sets correct $0 while still calling just installed pip. + local pipcmd='import sys; sys.argv[0] = "pip"; __file__ = ""; from pip._internal.cli.main import main; sys.exit(main())' + "${EPYTHON}" -c "${pipcmd}" completion --bash > completion.bash || die + "${EPYTHON}" -c "${pipcmd}" completion --zsh > completion.zsh || die +} + +python_test() { + if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then + einfo "Skipping tests on ${EPYTHON}" + return 0 + fi + + local EPYTEST_DESELECT=( + tests/functional/test_inspect.py::test_inspect_basic + # Internet + tests/functional/test_config_settings.py::test_backend_sees_config_via_sdist + tests/functional/test_config_settings.py::test_config_settings_implies_pep517 + tests/functional/test_install.py::test_double_install_fail + tests/functional/test_install.py::test_editable_install__local_dir_setup_requires_with_pyproject + tests/functional/test_install.py::test_link_hash_in_dep_fails_require_hashes + tests/functional/test_install_config.py::test_prompt_for_keyring_if_needed + ) + + if ! has_version "dev-python/cryptography[${PYTHON_USEDEP}]"; then + EPYTEST_DESELECT+=( + tests/functional/test_install.py::test_install_sends_client_cert + tests/functional/test_install_config.py::test_do_not_prompt_for_authentication + tests/functional/test_install_config.py::test_prompt_for_authentication + tests/functional/test_install_config.py::test_prompt_for_keyring_if_needed + ) + fi + + case ${EPYTHON} in + python3.10) + EPYTEST_DESELECT+=( + # no clue why they fail + tests/unit/test_base_command.py::test_base_command_global_tempdir_cleanup + tests/unit/test_base_command.py::test_base_command_local_tempdir_cleanup + tests/unit/test_base_command.py::test_base_command_provides_tempdir_helpers + ) + ;; + esac + + local -x PIP_DISABLE_PIP_VERSION_CHECK=1 + local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 + local EPYTEST_XDIST=1 + epytest -m "not network" +} + +python_install_all() { + local DOCS=( AUTHORS.txt docs/html/**/*.rst ) + distutils-r1_python_install_all + + newbashcomp completion.bash pip + + insinto /usr/share/zsh/site-functions + newins completion.zsh _pip +}