diff --git a/lang/python/python-pip/Makefile b/lang/python/python-pip/Makefile index fff0f7018e..658f6ea83f 100644 --- a/lang/python/python-pip/Makefile +++ b/lang/python/python-pip/Makefile @@ -8,17 +8,19 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-pip -PKG_VERSION:=23.3.1 +PKG_VERSION:=26.0.1 PKG_RELEASE:=1 PYPI_NAME:=pip -PKG_HASH:=1fcaa041308d01f14575f6d0d2ea4b75a3e2871fe4f9c694976f908768e14174 +PKG_HASH:=c4037d8a277c89b320abe636d59f91e6d0922d08a05b60e85e53b296613346d8 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE.txt PKG_MAINTAINER:=Alexandru Ardelean PKG_CPE_ID:=cpe:/a:pypa:pip +PKG_BUILD_DEPENDS:=python-setuptools/host + include ../pypi.mk include $(INCLUDE_DIR)/package.mk include ../python3-package.mk @@ -43,9 +45,8 @@ endef define Py3Package/python3-pip/install $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/pip$(PYTHON3_VERSION) $(1)/usr/bin/ - $(LN) pip$(PYTHON3_VERSION) $(1)/usr/bin/pip3 - $(LN) pip$(PYTHON3_VERSION) $(1)/usr/bin/pip + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/pip3 $(1)/usr/bin/ + $(LN) pip3 $(1)/usr/bin/pip $(INSTALL_DIR) $(1)/etc $(INSTALL_DATA) ./files/pip.conf $(1)/etc/ diff --git a/lang/python/python-pip/patches/001-pyproject-hooks-pyc-fix.patch b/lang/python/python-pip/patches/001-pyproject-hooks-pyc-fix.patch index e9eafab969..b32733134c 100644 --- a/lang/python/python-pip/patches/001-pyproject-hooks-pyc-fix.patch +++ b/lang/python/python-pip/patches/001-pyproject-hooks-pyc-fix.patch @@ -1,19 +1,22 @@ --- a/src/pip/_vendor/pyproject_hooks/_in_process/__init__.py +++ b/src/pip/_vendor/pyproject_hooks/_in_process/__init__.py -@@ -11,8 +11,14 @@ try: +@@ -11,11 +11,17 @@ try: except AttributeError: # Python 3.8 compatibility def _in_proc_script_path(): -- return resources.path(__package__, '_in_process.py') -+ filename = '_in_process.pyc' -+ if resources.is_resource(__package__, '_in_process.py'): -+ filename = '_in_process.py' +- return resources.path(__package__, "_in_process.py") ++ filename = "_in_process.pyc" ++ if resources.is_resource(__package__, "_in_process.py"): ++ filename = "_in_process.py" + return resources.path(__package__, filename) + else: + def _in_proc_script_path(): -+ filename = '_in_process.pyc' -+ if resources.files(__package__).joinpath('_in_process.py').is_file(): -+ filename = '_in_process.py' ++ filename = "_in_process.pyc" ++ if resources.files(__package__).joinpath("_in_process.py").is_file(): ++ filename = "_in_process.py" return resources.as_file( -- resources.files(__package__).joinpath('_in_process.py')) -+ resources.files(__package__).joinpath(filename)) +- resources.files(__package__).joinpath("_in_process.py") ++ resources.files(__package__).joinpath(filename) + ) 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 8f68049a8b..c7d8068889 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,6 @@ --- a/src/pip/_internal/build_env.py +++ b/src/pip/_internal/build_env.py -@@ -54,7 +54,11 @@ def get_runnable_pip() -> str: +@@ -74,7 +74,11 @@ def get_runnable_pip() -> str: # case, we can use that directly. return str(source) @@ -12,4 +12,4 @@ + return os.fsdecode(source / filename) - def _get_system_sitepackages() -> Set[str]: + def _get_system_sitepackages() -> set[str]: 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 99a0258aa6..f08530edad 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 @@ -9,7 +9,7 @@ Patch-Name: disable-pip-version-check.patch --- a/src/pip/_internal/cli/cmdoptions.py +++ b/src/pip/_internal/cli/cmdoptions.py -@@ -895,7 +895,7 @@ disable_pip_version_check: Callable[..., +@@ -1069,7 +1069,7 @@ disable_pip_version_check: Callable[..., "--disable-pip-version-check", dest="disable_pip_version_check", action="store_true",