diff --git a/lang/python/python-pip/Makefile b/lang/python/python-pip/Makefile index d1f0fb81dd..789e134050 100644 --- a/lang/python/python-pip/Makefile +++ b/lang/python/python-pip/Makefile @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-pip -PKG_VERSION:=26.1.2 +PKG_VERSION:=26.2.1 PKG_RELEASE:=1 PYPI_NAME:=pip -PKG_HASH:=f49cd134c61cf2fd75e0ce2676db03e4054504a5a4986d00f8299ae632dc4605 +PKG_HASH:=f6ad667e89a1fe78046c8f13232b247200f5258d7828f3f7883d660878e0813f PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE.txt diff --git a/lang/python/python-pip/patches/002-pip-runner-pyc-fix.patch b/lang/python/python-pip/patches/002-pip-runner-pyc-fix.patch index c7d8068889..3ed3d31da2 100644 --- a/lang/python/python-pip/patches/002-pip-runner-pyc-fix.patch +++ b/lang/python/python-pip/patches/002-pip-runner-pyc-fix.patch @@ -1,6 +1,28 @@ ---- a/src/pip/_internal/build_env.py -+++ b/src/pip/_internal/build_env.py -@@ -74,7 +74,11 @@ def get_runnable_pip() -> str: +From 85f271cdf5fa0853d221c704dbb4e7490ab117ec Mon Sep 17 00:00:00 2001 +From: Alexandru Ardelean +Date: Tue, 11 Aug 2026 11:00:00 +0300 +Subject: [PATCH] build isolation: fall back to __pip-runner__.pyc + +get_runnable_pip() returns the path of __pip-runner__.py so pip can run +itself in a subprocess to populate the PEP 517 build environment. We ship +the pip package byte-compiled only (the .py sources live in the separate +-src package), so the .py file is absent on target and build isolation +fails. Fall back to the .pyc when the source is not present. + +Not an upstream bug: upstream always ships the .py, so it has no reason to +handle this. In pip 26.2.x get_runnable_pip() moved from build_env.py to +_internal/utils/misc.py (build_env.py became a package), which is why the +old patch stopped applying; the function itself is unchanged and still +hardcodes __pip-runner__.py, so this workaround is still required. + +Signed-off-by: Alexandru Ardelean +--- + src/pip/_internal/utils/misc.py | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +--- a/src/pip/_internal/utils/misc.py ++++ b/src/pip/_internal/utils/misc.py +@@ -105,7 +105,11 @@ def get_runnable_pip() -> str: # case, we can use that directly. return str(source) @@ -12,4 +34,4 @@ + return os.fsdecode(source / filename) - def _get_system_sitepackages() -> set[str]: + def normalize_version_info(py_version_info: tuple[int, ...]) -> tuple[int, int, int]: diff --git a/lang/python/python-pip/patches/003-disable-pip-version-check.patch b/lang/python/python-pip/patches/003-disable-pip-version-check.patch index 1dbd6cb402..376aa9bfda 100644 --- a/lang/python/python-pip/patches/003-disable-pip-version-check.patch +++ b/lang/python/python-pip/patches/003-disable-pip-version-check.patch @@ -1,3 +1,4 @@ +From d810d559de43b36f1f8c470350f8ad88118269bb Mon Sep 17 00:00:00 2001 From: Barry Warsaw Date: Fri, 18 Nov 2016 17:07:47 -0500 Subject: Set --disable-pip-version-check=True by default. @@ -9,7 +10,7 @@ Patch-Name: disable-pip-version-check.patch --- a/src/pip/_internal/cli/cmdoptions.py +++ b/src/pip/_internal/cli/cmdoptions.py -@@ -1100,7 +1100,7 @@ disable_pip_version_check: Callable[..., +@@ -1197,7 +1197,7 @@ disable_pip_version_check: Callable[..., "--disable-pip-version-check", dest="disable_pip_version_check", action="store_true",