From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6DA221582EF for ; Sat, 01 Mar 2025 11:57:49 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 52D4C34310D for ; Sat, 01 Mar 2025 11:57:49 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 93EA51102F2; Sat, 01 Mar 2025 11:57:42 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 862DE1102F2 for ; Sat, 01 Mar 2025 11:57:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0A85134309A for ; Sat, 01 Mar 2025 11:57:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5A41A2803 for ; Sat, 01 Mar 2025 11:57:40 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1740829595.1d08bf702af4fc64f76bd6fce0d619c560ef2dac.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pip/files/, dev-python/pip/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/pip/Manifest dev-python/pip/files/pip-24.1-unbundle.patch dev-python/pip/files/pip-24.3.1-rich-13.8.patch dev-python/pip/pip-24.3.1-r2.ebuild dev-python/pip/pip-25.0.ebuild X-VCS-Directories: dev-python/pip/files/ dev-python/pip/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 1d08bf702af4fc64f76bd6fce0d619c560ef2dac X-VCS-Branch: master Date: Sat, 01 Mar 2025 11:57:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0f93dcca-1013-42ed-a6ac-de4b1bababb1 X-Archives-Hash: e769e6cd27cc592bf6b9ac71585ef1f3 commit: 1d08bf702af4fc64f76bd6fce0d619c560ef2dac Author: Michał Górny gentoo org> AuthorDate: Sat Mar 1 11:46:35 2025 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Mar 1 11:46:35 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d08bf70 dev-python/pip: Remove old Signed-off-by: Michał Górny gentoo.org> dev-python/pip/Manifest | 2 - dev-python/pip/files/pip-24.1-unbundle.patch | 193 ------------------------ dev-python/pip/files/pip-24.3.1-rich-13.8.patch | 47 ------ dev-python/pip/pip-24.3.1-r2.ebuild | 173 --------------------- dev-python/pip/pip-25.0.ebuild | 170 --------------------- 5 files changed, 585 deletions(-) diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest index d0ec7085b28d..45ac336813d8 100644 --- a/dev-python/pip/Manifest +++ b/dev-python/pip/Manifest @@ -1,4 +1,2 @@ DIST pip-24.1.gh.tar.gz 9188658 BLAKE2B 4a43ff0199d811dd30461e376f655a447f3f706a48dd97fe1d0ccf630f558e72209ccd06d98949a1541cd6b2942a816db23ce8aaa7fbbf9aef429502fb91ab92 SHA512 c60ab329fe91202ff64b5f0f90209085fbf8db0f0a05f0703f952ad69e39e2e3edb5dadc006a3f317cdd4ba4fb5abe56dfbd22792249a2d139702eec272186d1 -DIST pip-24.3.1.gh.tar.gz 9198711 BLAKE2B c70524bfedf46776d5ab8da24754e8177caac6d87cc90aa86b144c0fe9718860fe3d08823f655495c059dbece6e0ecbb2ac8e655cff3124693f64a35deac512e SHA512 9cf5f18eefd559cf27bc026e5206b0028ea77fd904a61fea9a6682b519305c962dd19170b841581bd05ff72192a9c458ec0eba173fa66db0438b046111ff5856 DIST pip-25.0.1.gh.tar.gz 9224526 BLAKE2B db729b8c75d8e15c6fed1dbc9e08adc4e82114f2bbd953859ec03c7948e521629afd8cea6adb08110b987d6adf48fd600a59a3bcc27774db61ea92675ad90d42 SHA512 a6850c8567082bbf98483a45e523c4de12132136d2b0aa388ac619c02ffd0c8f6aea7d727f7d84167dadec5f1e56dd478b2233b0caa5d9b3e5cadc9e1f3dc12c -DIST pip-25.0.gh.tar.gz 9224545 BLAKE2B 9606eea2b08d5220f9ed7528c14251ef20499693bdb817a2280124672860cb24111999bdb67af1107006ae4dd02c52d395fddea7e6b09dbc820a41ee8618fd50 SHA512 023db908a1da1cbbd2134bb83cc69a7a35e6d010b3f846bb8abcab14ca79a8cee4d02ead9346220e05fe137039377074c732b4bf2a9e6eee5c0d9161f1754f95 diff --git a/dev-python/pip/files/pip-24.1-unbundle.patch b/dev-python/pip/files/pip-24.1-unbundle.patch deleted file mode 100644 index 676ffa36094b..000000000000 --- a/dev-python/pip/files/pip-24.1-unbundle.patch +++ /dev/null @@ -1,193 +0,0 @@ -diff --git a/src/pip/_internal/commands/debug.py b/src/pip/_internal/commands/debug.py -index 567ca967e..427bfcf04 100644 ---- a/src/pip/_internal/commands/debug.py -+++ b/src/pip/_internal/commands/debug.py -@@ -6,7 +6,6 @@ from optparse import Values - from types import ModuleType - from typing import Any, Dict, List, Optional - --import pip._vendor - from pip._vendor.certifi import where - from pip._vendor.packaging.version import parse as parse_version - -@@ -192,9 +191,7 @@ class DebugCommand(Command): - show_value("REQUESTS_CA_BUNDLE", os.environ.get("REQUESTS_CA_BUNDLE")) - show_value("CURL_CA_BUNDLE", os.environ.get("CURL_CA_BUNDLE")) - show_value("pip._vendor.certifi.where()", where()) -- show_value("pip._vendor.DEBUNDLED", pip._vendor.DEBUNDLED) -- -- show_vendor_versions() -+ show_value("pip._vendor.DEBUNDLED", True) - - show_tags(options) - -diff --git a/tests/conftest.py b/tests/conftest.py -index 35101cef2..840663fed 100644 ---- a/tests/conftest.py -+++ b/tests/conftest.py -@@ -413,6 +413,7 @@ def _common_wheel_editable_install( - assert len(wheel_candidates) == 1, wheel_candidates - install_dir = tmpdir_factory.mktemp(package) / "install" - lib_install_dir = install_dir / "lib" -+ return lib_install_dir - bin_install_dir = install_dir / "bin" - with WheelFile.open(wheel_candidates[0]) as source: - install( -diff --git a/tests/functional/test_check.py b/tests/functional/test_check.py -index 46ecdcc64..6507febfa 100644 ---- a/tests/functional/test_check.py -+++ b/tests/functional/test_check.py -@@ -6,10 +6,8 @@ from tests.lib import PipTestEnvironment, create_test_package_with_setup - def matches_expected_lines(string: str, expected_lines: Collection[str]) -> bool: - # Ignore empty lines - output_lines = list(filter(None, string.splitlines())) -- # We'll match the last n lines, given n lines to match. -- last_few_output_lines = output_lines[-len(expected_lines) :] - # And order does not matter -- return set(last_few_output_lines) == set(expected_lines) -+ return set(expected_lines).issubset(set(output_lines)) - - - def test_basic_check_clean(script: PipTestEnvironment) -> None: -diff --git a/tests/functional/test_freeze.py b/tests/functional/test_freeze.py -index b7af974ea..144f79483 100644 ---- a/tests/functional/test_freeze.py -+++ b/tests/functional/test_freeze.py -@@ -80,8 +80,8 @@ def test_basic_freeze(script: PipTestEnvironment) -> None: - result = script.pip("freeze", expect_stderr=True) - expected = textwrap.dedent( - """\ -- ...simple==2.0 -- simple2==3.0... -+ ...simple==2.0... -+ ...simple2==3.0... - """ - ) - _check_output(result.stdout, expected) -@@ -1014,7 +1014,7 @@ def test_freeze_skip_work_dir_pkg(script: PipTestEnvironment) -> None: - - # Freeze should not include package simple when run from package directory - result = script.pip("freeze", cwd=pkg_path) -- assert "simple" not in result.stdout -+ assert "\nsimple==" not in result.stdout - - - def test_freeze_include_work_dir_pkg(script: PipTestEnvironment) -> None: -diff --git a/tests/functional/test_install_check.py b/tests/functional/test_install_check.py -index 8a8a7c93a..bbda083f7 100644 ---- a/tests/functional/test_install_check.py -+++ b/tests/functional/test_install_check.py -@@ -57,6 +57,7 @@ def test_check_install_canonicalization(script: PipTestEnvironment) -> None: - ) - assert "requires" not in result.stderr - assert result.returncode == 0 -+ return - - # Double check that all errors are resolved in the end - result = script.pip("check") -diff --git a/tests/functional/test_list.py b/tests/functional/test_list.py -index 5164c1d5c..ce0a81aea 100644 ---- a/tests/functional/test_list.py -+++ b/tests/functional/test_list.py -@@ -1,5 +1,6 @@ - import json - import os -+import re - from pathlib import Path - - import pytest -@@ -41,8 +42,8 @@ def test_basic_list(simple_script: PipTestEnvironment) -> None: - - """ - result = simple_script.pip("list") -- assert "simple 1.0" in result.stdout, str(result) -- assert "simple2 3.0" in result.stdout, str(result) -+ assert re.search(r"simple\s+1\.0", result.stdout), str(result) -+ assert re.search(r"simple2\s+3\.0", result.stdout), str(result) - - - def test_verbose_flag(simple_script: PipTestEnvironment) -> None: -@@ -54,8 +55,8 @@ def test_verbose_flag(simple_script: PipTestEnvironment) -> None: - assert "Version" in result.stdout, str(result) - assert "Location" in result.stdout, str(result) - assert "Installer" in result.stdout, str(result) -- assert "simple 1.0" in result.stdout, str(result) -- assert "simple2 3.0" in result.stdout, str(result) -+ assert re.search(r"simple\s+1\.0", result.stdout), str(result) -+ assert re.search(r"simple2\s+3\.0", result.stdout), str(result) - - - def test_columns_flag(simple_script: PipTestEnvironment) -> None: -@@ -66,8 +67,8 @@ def test_columns_flag(simple_script: PipTestEnvironment) -> None: - assert "Package" in result.stdout, str(result) - assert "Version" in result.stdout, str(result) - assert "simple (1.0)" not in result.stdout, str(result) -- assert "simple 1.0" in result.stdout, str(result) -- assert "simple2 3.0" in result.stdout, str(result) -+ assert re.search(r"simple\s+1\.0", result.stdout), str(result) -+ assert re.search(r"simple2\s+3\.0", result.stdout), str(result) - - - def test_format_priority(simple_script: PipTestEnvironment) -> None: -@@ -79,16 +80,16 @@ def test_format_priority(simple_script: PipTestEnvironment) -> None: - ) - assert "simple==1.0" in result.stdout, str(result) - assert "simple2==3.0" in result.stdout, str(result) -- assert "simple 1.0" not in result.stdout, str(result) -- assert "simple2 3.0" not in result.stdout, str(result) -+ assert not re.search(r"simple\s+1\.0", result.stdout), str(result) -+ assert not re.search(r"simple2\s+3\.0", result.stdout), str(result) - - result = simple_script.pip("list", "--format=freeze", "--format=columns") - assert "Package" in result.stdout, str(result) - assert "Version" in result.stdout, str(result) - assert "simple==1.0" not in result.stdout, str(result) - assert "simple2==3.0" not in result.stdout, str(result) -- assert "simple 1.0" in result.stdout, str(result) -- assert "simple2 3.0" in result.stdout, str(result) -+ assert re.search(r"simple\s+1\.0", result.stdout), str(result) -+ assert re.search(r"simple2\s+3\.0", result.stdout), str(result) - - - def test_local_flag(simple_script: PipTestEnvironment) -> None: -@@ -124,8 +125,8 @@ def test_multiple_exclude_and_normalization( - assert "Normalizable_Name" in result.stdout - assert "pip" in result.stdout - result = script.pip("list", "--exclude", "normalizablE-namE", "--exclude", "pIp") -- assert "Normalizable_Name" not in result.stdout -- assert "pip" not in result.stdout -+ assert "Normalizable_Name " not in result.stdout -+ assert "pip " not in result.stdout - - - @pytest.mark.network -diff --git a/tests/lib/venv.py b/tests/lib/venv.py -index fac54d3bd..6bfe3cfdc 100644 ---- a/tests/lib/venv.py -+++ b/tests/lib/venv.py -@@ -9,6 +9,7 @@ import venv as _venv - from pathlib import Path - from typing import Dict, Literal, Optional, Union - -+import pytest - import virtualenv as _virtualenv - - VirtualEnvironmentType = Literal["virtualenv", "venv"] -@@ -35,7 +36,7 @@ class VirtualEnvironment: - self._venv_type = venv_type - else: - self._venv_type = "virtualenv" -- self._user_site_packages = False -+ self._user_site_packages = True - self._template = template - self._sitecustomize: Optional[str] = None - self._update_paths() -@@ -234,6 +235,8 @@ class VirtualEnvironment: - - @user_site_packages.setter - def user_site_packages(self, value: bool) -> None: -+ if not value: -+ pytest.skip("Gentoo: skipping due to lack of system site-packages") - self._user_site_packages = value - if self._legacy_virtualenv: - marker = self.lib / "no-global-site-packages.txt" diff --git a/dev-python/pip/files/pip-24.3.1-rich-13.8.patch b/dev-python/pip/files/pip-24.3.1-rich-13.8.patch deleted file mode 100644 index d17ccf5b2fe3..000000000000 --- a/dev-python/pip/files/pip-24.3.1-rich-13.8.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 8cfd050f615a4bad699ec55d4cb19b1f1dc4137e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= -Date: Sat, 9 Nov 2024 16:41:40 +0100 -Subject: [PATCH] Override rich.console pipe handler for rich 13.8.0+ - -Explicitly override `rich.console.Console.on_broken_pipe()` to reraise -the original exception, to bring the behavior of rich 13.8.0+ in line -with older versions. The new versions instead close output fds and exit -with error instead, which prevents pip's pipe handler from firing. -This is the minimal change needed to make pip's test suite pass after -upgrading vendored rich. - -Bug #13006 -Bug #13072 ---- - src/pip/_internal/utils/logging.py | 9 ++++++++- - 2 files changed, 8 insertions(+), 1 deletion(-) - create mode 100644 news/13072.trivial.rst - -diff --git a/src/pip/_internal/utils/logging.py b/src/pip/_internal/utils/logging.py -index 41f6eb51a..be17add5d 100644 ---- a/src/pip/_internal/utils/logging.py -+++ b/src/pip/_internal/utils/logging.py -@@ -137,12 +137,19 @@ class IndentedRenderable: - yield Segment("\n") - - -+class PipConsole(Console): -+ def on_broken_pipe(self) -> None: -+ # Reraise the original exception, rich 13.8.0+ exits by default -+ # instead, preventing our handler from firing. -+ raise BrokenPipeError() from None -+ -+ - class RichPipStreamHandler(RichHandler): - KEYWORDS: ClassVar[Optional[List[str]]] = [] - - def __init__(self, stream: Optional[TextIO], no_color: bool) -> None: - super().__init__( -- console=Console(file=stream, no_color=no_color, soft_wrap=True), -+ console=PipConsole(file=stream, no_color=no_color, soft_wrap=True), - show_time=False, - show_level=False, - show_path=False, --- -2.47.0 - diff --git a/dev-python/pip/pip-24.3.1-r2.ebuild b/dev-python/pip/pip-24.3.1-r2.ebuild deleted file mode 100644 index 89532d77b384..000000000000 --- a/dev-python/pip/pip-24.3.1-r2.ebuild +++ /dev/null @@ -1,173 +0,0 @@ -# Copyright 1999-2025 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..13} ) -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" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="test-rust" - -# see src/pip/_vendor/vendor.txt -RDEPEND=" - >=dev-python/cachecontrol-0.14.0[${PYTHON_USEDEP}] - >=dev-python/distlib-0.3.9[${PYTHON_USEDEP}] - >=dev-python/distro-1.9.0[${PYTHON_USEDEP}] - >=dev-python/msgpack-1.0.8[${PYTHON_USEDEP}] - >=dev-python/packaging-24.2[${PYTHON_USEDEP}] - >=dev-python/platformdirs-4.2.1[${PYTHON_USEDEP}] - >=dev-python/pyproject-hooks-1.0.0[${PYTHON_USEDEP}] - >=dev-python/requests-2.32.0[${PYTHON_USEDEP}] - >=dev-python/rich-13.7.1[${PYTHON_USEDEP}] - >=dev-python/resolvelib-1.0.1[${PYTHON_USEDEP}] - >=dev-python/setuptools-69.5.1[${PYTHON_USEDEP}] - $(python_gen_cond_dep ' - >=dev-python/tomli-2.0.1[${PYTHON_USEDEP}] - ' 3.10) - >=dev-python/truststore-0.10.0[${PYTHON_USEDEP}] - >=dev-python/typing-extensions-4.12.2[${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-rerunfailures[${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}] - ) - dev-vcs/git - ' "${PYTHON_TESTED[@]}") - ) -" - -distutils_enable_tests pytest - -python_prepare_all() { - local PATCHES=( - "${FILESDIR}/pip-23.1-no-coverage.patch" - # prepare to unbundle dependencies - "${FILESDIR}/pip-24.1-unbundle.patch" - # https://github.com/pypa/pip/pull/13073 - "${FILESDIR}/pip-24.3.1-rich-13.8.patch" - ) - - distutils-r1_python_prepare_all - - # unbundle dependencies - rm -r src/pip/_vendor || die - find -name '*.py' -exec sed -i \ - -e 's:from pip\._vendor import:import:g' \ - -e 's:from pip\._vendor\.:from :g' \ - {} + || die - - 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_install.py::test_double_install_fail - tests/functional/test_install.py::test_install_sdist_links - tests/functional/test_install_config.py::test_prompt_for_keyring_if_needed - # broken by system site-packages use - tests/functional/test_check.py::test_basic_check_clean - tests/functional/test_check.py::test_check_skip_work_dir_pkg - tests/functional/test_check.py::test_check_complicated_name_clean - tests/functional/test_check.py::test_check_development_versions_are_also_considered - tests/functional/test_freeze.py::test_freeze_with_setuptools - tests/functional/test_pip_runner_script.py::test_runner_work_in_environments_with_no_pip - tests/functional/test_uninstall.py::test_basic_uninstall_distutils - 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 - # broken by unbundling - "tests/functional/test_debug.py::test_debug[vendored library versions:]" - tests/functional/test_debug.py::test_debug__library_versions - tests/functional/test_python_option.py::test_python_interpreter - tests/functional/test_uninstall.py::test_uninstall_non_local_distutils - ) - local EPYTEST_IGNORE=( - # requires proxy.py - tests/functional/test_proxy.py - ) - - 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 - - local -x PIP_DISABLE_PIP_VERSION_CHECK=1 - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - local EPYTEST_XDIST=1 - # rerunfailures because test suite breaks if packages are installed - # in parallel - epytest -m "not network" -o tmp_path_retention_policy=all \ - -p rerunfailures --reruns=5 -} - -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 -} diff --git a/dev-python/pip/pip-25.0.ebuild b/dev-python/pip/pip-25.0.ebuild deleted file mode 100644 index 8ab316566c04..000000000000 --- a/dev-python/pip/pip-25.0.ebuild +++ /dev/null @@ -1,170 +0,0 @@ -# Copyright 1999-2025 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=( pypy3 python3_{10..13} ) -PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" ) -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" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="test-rust" - -# see src/pip/_vendor/vendor.txt -RDEPEND=" - >=dev-python/cachecontrol-0.14.1[${PYTHON_USEDEP}] - >=dev-python/distlib-0.3.9[${PYTHON_USEDEP}] - >=dev-python/distro-1.9.0[${PYTHON_USEDEP}] - >=dev-python/msgpack-1.1.0[${PYTHON_USEDEP}] - >=dev-python/packaging-24.2[${PYTHON_USEDEP}] - >=dev-python/platformdirs-4.3.6[${PYTHON_USEDEP}] - >=dev-python/pyproject-hooks-1.2.0[${PYTHON_USEDEP}] - >=dev-python/requests-2.32.0[${PYTHON_USEDEP}] - >=dev-python/rich-13.9.4[${PYTHON_USEDEP}] - >=dev-python/resolvelib-1.0.1[${PYTHON_USEDEP}] - >=dev-python/setuptools-69.5.1[${PYTHON_USEDEP}] - $(python_gen_cond_dep ' - >=dev-python/tomli-2.2.1[${PYTHON_USEDEP}] - ' 3.10) - >=dev-python/truststore-0.10.0[${PYTHON_USEDEP}] - >=dev-python/typing-extensions-4.12.2[${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-rerunfailures[${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}] - ) - dev-vcs/git - ' "${PYTHON_TESTED[@]}") - ) -" - -distutils_enable_tests pytest - -python_prepare_all() { - local PATCHES=( - "${FILESDIR}/pip-23.1-no-coverage.patch" - # prepare to unbundle dependencies - "${FILESDIR}/pip-24.1-unbundle.patch" - ) - - distutils-r1_python_prepare_all - - # unbundle dependencies - rm -r src/pip/_vendor || die - find -name '*.py' -exec sed -i \ - -e 's:from pip\._vendor import:import:g' \ - -e 's:from pip\._vendor\.:from :g' \ - {} + || die - - 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() { - 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_install.py::test_double_install_fail - tests/functional/test_install.py::test_install_sdist_links - tests/functional/test_install_config.py::test_prompt_for_keyring_if_needed - # broken by system site-packages use - tests/functional/test_freeze.py::test_freeze_with_setuptools - tests/functional/test_pip_runner_script.py::test_runner_work_in_environments_with_no_pip - tests/functional/test_uninstall.py::test_basic_uninstall_distutils - 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 - # broken by unbundling - "tests/functional/test_debug.py::test_debug[vendored library versions:]" - tests/functional/test_debug.py::test_debug__library_versions - tests/functional/test_python_option.py::test_python_interpreter - tests/functional/test_uninstall.py::test_uninstall_non_local_distutils - ) - local EPYTEST_IGNORE=( - # requires proxy.py - tests/functional/test_proxy.py - ) - - case ${EPYTHON} in - pypy3) - EPYTEST_DESELECT+=( - # unexpected tempfiles? - tests/functional/test_install_config.py::test_do_not_prompt_for_authentication - tests/functional/test_install_config.py::test_prompt_for_authentication - ) - ;; - esac - - 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 - - local -x PIP_DISABLE_PIP_VERSION_CHECK=1 - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - local EPYTEST_XDIST=1 - # rerunfailures because test suite breaks if packages are installed - # in parallel - epytest -m "not network" -o tmp_path_retention_policy=all \ - -p rerunfailures --reruns=5 --use-venv -} - -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 -}