mirror of
https://github.com/openwrt/packages.git
synced 2026-04-15 19:02:09 +00:00
python-pip: update to 26.0.1
Refresh all patches for pip 26.0.1: - 001 (pyproject-hooks-pyc-fix): vendored pyproject_hooks switched from single to double quotes and multiline block format; restructure to minimal diff (keep unchanged context lines as context) - 002 (pip-runner-pyc-fix): get_runnable_pip() shifted ~20 lines; Set[str] -> set[str] in trailing context; refresh offsets - 003 (disable-pip-version-check): option definition moved ~174 lines; refresh line number pip 26 also dropped the version-specific binary (e.g. pip3.14). Update the install rule to use pip3 as the primary binary and symlink pip/pip$(VERSION) to it. Signed-off-by: Alexandru Ardelean <alex@shruggie.ro>
This commit is contained in:
committed by
Alexandru Ardelean
parent
cf5b39f8c3
commit
c2ebcc7e9b
@@ -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 <ardeleanalex@gmail.com>
|
||||
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/
|
||||
|
||||
@@ -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)
|
||||
)
|
||||
|
||||
@@ -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]:
|
||||
|
||||
@@ -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",
|
||||
|
||||
Reference in New Issue
Block a user