summaryrefslogtreecommitdiff
path: root/dev-python/pip
diff options
context:
space:
mode:
Diffstat (limited to 'dev-python/pip')
-rw-r--r--dev-python/pip/Manifest3
-rw-r--r--dev-python/pip/files/pip-25.2-test-wheels.patch74
-rw-r--r--dev-python/pip/pip-25.3.ebuild200
-rw-r--r--dev-python/pip/pip-26.1.ebuild (renamed from dev-python/pip/pip-26.0.ebuild)8
4 files changed, 6 insertions, 279 deletions
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index ae87a2282350..9a0bb11ace1d 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -1,4 +1,3 @@
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
+DIST pip-26.1.gh.tar.gz 9268351 BLAKE2B 55773ba9ead364dcb8b900fb2f196dd768f688f54ae2ef190ae1739fec3fcc22f260c25df6ffb097e3b14ad321c51535cb71a921eafe4430a3eb30b94e38cc1e SHA512 cb3dde18f1b16ffeb36a0eeec02b64a0a363e1ef50070126fdbb152ba03749830095f85a98267e552169b7953b5839558be2c3ee8f78802cb56dd4f139b72762
diff --git a/dev-python/pip/files/pip-25.2-test-wheels.patch b/dev-python/pip/files/pip-25.2-test-wheels.patch
deleted file mode 100644
index c99af85681d3..000000000000
--- a/dev-python/pip/files/pip-25.2-test-wheels.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From f172db76c62cf8e00fb547828c43cd8bf78a31ef Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-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...
diff --git a/dev-python/pip/pip-25.3.ebuild b/dev-python/pip/pip-25.3.ebuild
deleted file mode 100644
index a306901ec2e7..000000000000
--- a/dev-python/pip/pip-25.3.ebuild
+++ /dev/null
@@ -1,200 +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=flit
-PYTHON_TESTED=( pypy3_11 python3_{11..14} )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-PYTHON_REQ_USE="ssl(+),threads(+)"
-
-inherit distutils-r1 pypi shell-completion
-FLIT_CORE_PV=3.12.0
-
-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
- test? (
- $(pypi_wheel_url flit-core "${FLIT_CORE_PV}")
- )
-"
-
-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.3[${PYTHON_USEDEP}]
- >=dev-python/dependency-groups-1.3.0[${PYTHON_USEDEP}]
- >=dev-python/distlib-0.4.0[${PYTHON_USEDEP}]
- >=dev-python/distro-1.9.0[${PYTHON_USEDEP}]
- >=dev-python/msgpack-1.1.1[${PYTHON_USEDEP}]
- >=dev-python/packaging-25.0[${PYTHON_USEDEP}]
- >=dev-python/platformdirs-4.3.8[${PYTHON_USEDEP}]
- >=dev-python/pyproject-hooks-1.2.0[${PYTHON_USEDEP}]
- >=dev-python/requests-2.32.4[${PYTHON_USEDEP}]
- >=dev-python/rich-14.1.0[${PYTHON_USEDEP}]
- >=dev-python/resolvelib-1.2.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=(
- # remove coverage & pytest-subket wheel expectation from test suite
- "${FILESDIR}/pip-25.2-test-wheels.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
- sed -i -e '/_vendor.*\(COPYING\|LICENSE\)/d' pyproject.toml || die
-
- if use test; then
- local wheels=(
- "${BROOT}"/usr/lib/python/ensurepip/{setuptools,wheel}-*.whl
- "${DISTDIR}/$(pypi_wheel_name flit-core "${FLIT_CORE_PV}")"
- )
- 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_install.py::test_install_subprocess_output_handling
- 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=(
- # from upstream options
- tests/tests_cache
- # 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
- # wrong path
- tests/functional/test_install.py::test_install_editable_with_prefix_setup_py
- )
- ;;
- 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=()
- # rerunfailures because test suite breaks if packages are installed
- # to system site-packages while it's running
- local EPYTEST_RERUNS=5
- local EPYTEST_XDIST=1
- epytest -m "not network" -o addopts= -o tmp_path_retention_policy=all \
- --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
-}
diff --git a/dev-python/pip/pip-26.0.ebuild b/dev-python/pip/pip-26.1.ebuild
index ef036e237ade..3faabd1fa3ed 100644
--- a/dev-python/pip/pip-26.0.ebuild
+++ b/dev-python/pip/pip-26.1.ebuild
@@ -39,10 +39,10 @@ RDEPEND="
>=dev-python/distlib-0.4.0[${PYTHON_USEDEP}]
>=dev-python/distro-1.9.0[${PYTHON_USEDEP}]
>=dev-python/msgpack-1.1.1[${PYTHON_USEDEP}]
- >=dev-python/packaging-25.0[${PYTHON_USEDEP}]
+ >=dev-python/packaging-26.2[${PYTHON_USEDEP}]
>=dev-python/platformdirs-4.3.8[${PYTHON_USEDEP}]
>=dev-python/pyproject-hooks-1.2.0[${PYTHON_USEDEP}]
- >=dev-python/requests-2.32.4[${PYTHON_USEDEP}]
+ >=dev-python/requests-2.33.1[${PYTHON_USEDEP}]
>=dev-python/rich-14.1.0[${PYTHON_USEDEP}]
>=dev-python/resolvelib-1.2.0[${PYTHON_USEDEP}]
>=dev-python/setuptools-70.3.0[${PYTHON_USEDEP}]
@@ -61,7 +61,7 @@ BDEPEND="
dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
dev-python/pytest-xdist[${PYTHON_USEDEP}]
dev-python/scripttest[${PYTHON_USEDEP}]
- >=dev-python/setuptools-70.1.0[${PYTHON_USEDEP}]
+ <dev-python/setuptools-80[${PYTHON_USEDEP}]
dev-python/virtualenv[${PYTHON_USEDEP}]
dev-python/werkzeug[${PYTHON_USEDEP}]
test-rust? (
@@ -172,6 +172,8 @@ python_test() {
tests/functional/test_install.py::test_install_editable_with_prefix_setup_py
# wrong exception assumptions
tests/unit/test_utils_datetime.py::test_parse_iso_datetime_invalid
+ # TODO
+ tests/functional/test_install.py::test_install_warns_on_unexpected_post_install_import
)
;;
esac
generated by cgit v1.3.1 (git 2.54.0) at 2026-06-15 07:33:16 +0000