commit: 914d8c69205d3242a557234246d03a01e8dd5ba0 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sat Oct 25 04:54:33 2025 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sat Oct 25 07:40:17 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=914d8c69
dev-python/pip: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-python/pip/Manifest | 1 - dev-python/pip/files/pip-23.1-no-coverage.patch | 48 ------ dev-python/pip/pip-25.1.1.ebuild | 207 ------------------------ 3 files changed, 256 deletions(-) diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest index 86f564765d0f..f426b445a2e2 100644 --- a/dev-python/pip/Manifest +++ b/dev-python/pip/Manifest @@ -1,2 +1 @@ -DIST pip-25.1.1.gh.tar.gz 9219969 BLAKE2B eb443451deeb71888c2fc56ac5c8cb2d0515ec0efff975fab98cfa65d1fc5e66948243b3acebf1f4b0446e46082abb9fd350816579a4f5af1292c160490ce930 SHA512 ce61c9861265139b3c5ea9be9dc246097cd75c21687cf8301f80a377d02420c4524f0d6307d2ca0232ff8715b1105343bcfdb9cac6b69503780ab2c4645558dc DIST pip-25.2.gh.tar.gz 9121715 BLAKE2B 3bfe61d6d0d6f3a79c3fd801f5cb40b203fd12085d925ae7cde53adca3c5ee523fdfd9449546e1bc8ca719b3e8766cfef3162919e13a77f7adc0d20a951d11c7 SHA512 5cc65c9091fdda7905e26ce32ddaa3a1c2fd287d69fd3da67c814ba7e8e5be59301d8327c06cdca78c1b95f4a5b5f75c87f36a549022408cc0e8f9411c0db11e diff --git a/dev-python/pip/files/pip-23.1-no-coverage.patch b/dev-python/pip/files/pip-23.1-no-coverage.patch deleted file mode 100644 index 963bd4e7d43b..000000000000 --- a/dev-python/pip/files/pip-23.1-no-coverage.patch +++ /dev/null @@ -1,48 +0,0 @@ -From d915b0eec7b5844c06b5d8853544c8c5b538b0b9 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 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") - - [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: -@@ -431,3 +424,2 @@ def virtualenv_template( - setuptools_install: Path, - wheel_install: Path, -- coverage_install: Path, -@@ -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/dev-python/pip/pip-25.1.1.ebuild b/dev-python/pip/pip-25.1.1.ebuild deleted file mode 100644 index 21d48cae3968..000000000000 --- a/dev-python/pip/pip-25.1.1.ebuild +++ /dev/null @@ -1,207 +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_11 python3_{11..14} ) -PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" ) -PYTHON_REQ_USE="ssl(+),threads(+)" - -inherit distutils-r1 shell-completion - -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 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" -IUSE="test test-rust" -RESTRICT="!test? ( test )" - -# see src/pip/_vendor/vendor.txt -RDEPEND=" - >=dev-python/cachecontrol-0.14.2[${PYTHON_USEDEP}] - >=dev-python/dependency-groups-1.3.0[${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-25.0[${PYTHON_USEDEP}] - >=dev-python/platformdirs-4.3.7[${PYTHON_USEDEP}] - >=dev-python/pyproject-hooks-1.2.0[${PYTHON_USEDEP}] - >=dev-python/requests-2.32.3[${PYTHON_USEDEP}] - >=dev-python/rich-14.0.0[${PYTHON_USEDEP}] - >=dev-python/resolvelib-1.1.0[${PYTHON_USEDEP}] - >=dev-python/setuptools-70.3.0[${PYTHON_USEDEP}] - >=dev-python/tomli-w-1.2.0[${PYTHON_USEDEP}] - >=dev-python/truststore-0.10.1[${PYTHON_USEDEP}] - >=dev-python/typing-extensions-4.13.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[${PYTHON_USEDEP}] - dev-python/pytest-rerunfailures[${PYTHON_USEDEP}] - dev-python/pytest-xdist[${PYTHON_USEDEP}] - dev-python/scripttest[${PYTHON_USEDEP}] - <dev-python/setuptools-80[${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[@]}") - ) -" - -python_prepare_all() { - local PATCHES=( - "${FILESDIR}/pip-23.1-no-coverage.patch" - # prepare to unbundle dependencies - "${FILESDIR}/pip-25.0.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_configure() { - if use test && has_version "dev-python/pip[${PYTHON_USEDEP}]"; then - "${EPYTHON}" -m pip check || - die "${EPYTHON} -m pip check failed, tests will fail" - 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='if True: - 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 - tests/functional/test_lock.py::test_lock_archive - tests/functional/test_lock.py::test_lock_vcs - # 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 - ) - ;; - python3.14*) - EPYTEST_DESELECT+=( - # TODO: segfaults - tests/unit/test_collector.py::test_get_index_content_directory_append_index - # https://github.com/python/cpython/issues/125974 - tests/unit/test_collector.py::test_ensure_quoted_url - tests/unit/test_finder.py::test_finder_priority_file_over_page - tests/unit/test_urls.py::test_path_to_url_unix - tests/unit/test_collector.py::test_clean_url_path - tests/unit/test_collector.py::test_clean_url_path_with_local_path - tests/unit/test_req.py::TestRequirementSet::test_download_info_local_editable_dir - tests/unit/test_req.py::test_parse_editable_local - tests/unit/test_req.py::test_parse_editable_local_extras - tests/unit/test_req.py::test_get_url_from_path__archive_file - tests/unit/test_req.py::test_get_url_from_path__installable_dir - tests/functional/test_lock.py::test_lock_wheel_from_findlinks - tests/functional/test_lock.py::test_lock_sdist_from_findlinks - tests/functional/test_lock.py::test_lock_local_editable_with_dep - ) - ;; - 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 EPYTEST_PLUGINS=( pytest-rerunfailures ) - 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 \ - --reruns=5 --use-venv -} - -python_install_all() { - local DOCS=( AUTHORS.txt docs/html/**/*.rst ) - distutils-r1_python_install_all - - newbashcomp completion.bash pip - newzshcomp completion.zsh _pip -}
