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 index 86f564765d..3d2fa10525 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/pip/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-python/pip/Manifest @@ -1,2 +1,3 @@ -DIST pip-25.1.1.gh.tar.gz 9219969 BLAKE2B eb443451deeb71888c2fc56ac5c8cb2d0515ec0efff975fab98cfa65d1fc5e66948243b3acebf1f4b0446e46082abb9fd350816579a4f5af1292c160490ce930 SHA512 ce61c9861265139b3c5ea9be9dc246097cd75c21687cf8301f80a377d02420c4524f0d6307d2ca0232ff8715b1105343bcfdb9cac6b69503780ab2c4645558dc +DIST flit_core-3.12.0-py3-none-any.whl 45594 BLAKE2B 7c6cb6eb03d45bbba27f27b3728881b57fe82dd38e03f884d3b7c46116eb2b9dd76f92bdaf7f594ef8ccbe12ec8f9a56424ff9e9fc7a839c4818a113fdf0c3d3 SHA512 790c12b1f43201e365fb3f8f2f0a54e1a578876799dfdf8bfeea679a25ea096bf62946d006618c1458ae6e37ce6d00998f37e9aba426d5ab80d32ef2d75da4e0 DIST pip-25.2.gh.tar.gz 9121715 BLAKE2B 3bfe61d6d0d6f3a79c3fd801f5cb40b203fd12085d925ae7cde53adca3c5ee523fdfd9449546e1bc8ca719b3e8766cfef3162919e13a77f7adc0d20a951d11c7 SHA512 5cc65c9091fdda7905e26ce32ddaa3a1c2fd287d69fd3da67c814ba7e8e5be59301d8327c06cdca78c1b95f4a5b5f75c87f36a549022408cc0e8f9411c0db11e +DIST pip-25.3.gh.tar.gz 9115712 BLAKE2B 87d848c497163a45ee3de8f6f75c80b5051b07062c5a15450ae98b59a6cebc6bf03ca8525d57929493f2cfeb28d5623401eba69f0bdfc734389efbb84eafdf53 SHA512 f50db092213ec3bb819d3da5669f73d119b5ec7f7ac5e8a587a17c27eafa32bc17a057df09389c526a3769ef3577f5553187d54ceffa89aed63f4b4498ff044e 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 deleted file mode 100644 index 963bd4e7d4..0000000000 --- a/sdk_container/src/third_party/portage-stable/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 -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: -@@ -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/sdk_container/src/third_party/portage-stable/dev-python/pip/pip-25.1.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/pip/pip-25.3.ebuild similarity index 75% rename from sdk_container/src/third_party/portage-stable/dev-python/pip/pip-25.1.1.ebuild rename to sdk_container/src/third_party/portage-stable/dev-python/pip/pip-25.3.ebuild index 21d48cae39..1439ec798f 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/pip/pip-25.1.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/pip/pip-25.3.ebuild @@ -5,12 +5,13 @@ EAPI=8 # please bump dev-python/ensurepip-pip along with this package! -DISTUTILS_USE_PEP517=setuptools +DISTUTILS_USE_PEP517=flit PYTHON_TESTED=( pypy3_11 python3_{11..14} ) PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" ) PYTHON_REQ_USE="ssl(+),threads(+)" -inherit distutils-r1 shell-completion +inherit distutils-r1 pypi shell-completion +FLIT_CORE_PV=3.12.0 DESCRIPTION="The PyPA recommended tool for installing Python packages" HOMEPAGE=" @@ -20,27 +21,30 @@ HOMEPAGE=" " 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" +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/cachecontrol-0.14.3[${PYTHON_USEDEP}] >=dev-python/dependency-groups-1.3.0[${PYTHON_USEDEP}] - >=dev-python/distlib-0.3.9[${PYTHON_USEDEP}] + >=dev-python/distlib-0.4.0[${PYTHON_USEDEP}] >=dev-python/distro-1.9.0[${PYTHON_USEDEP}] - >=dev-python/msgpack-1.1.0[${PYTHON_USEDEP}] + >=dev-python/msgpack-1.1.1[${PYTHON_USEDEP}] >=dev-python/packaging-25.0[${PYTHON_USEDEP}] - >=dev-python/platformdirs-4.3.7[${PYTHON_USEDEP}] + >=dev-python/platformdirs-4.3.8[${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/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}] @@ -72,7 +76,8 @@ BDEPEND=" python_prepare_all() { local PATCHES=( - "${FILESDIR}/pip-23.1-no-coverage.patch" + # 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" ) @@ -85,10 +90,12 @@ python_prepare_all() { -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 @@ -134,6 +141,7 @@ python_test() { 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 @@ -146,6 +154,8 @@ python_test() { 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 ) @@ -156,26 +166,8 @@ python_test() { # 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 + # wrong path + tests/functional/test_install.py::test_install_editable_with_prefix_setup_py ) ;; esac @@ -190,12 +182,13 @@ python_test() { fi local -x PIP_DISABLE_PIP_VERSION_CHECK=1 - local EPYTEST_PLUGINS=( pytest-rerunfailures ) - local EPYTEST_XDIST=1 + local EPYTEST_PLUGINS=() # 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 + # 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() {