mirror of
https://github.com/openwrt/packages.git
synced 2025-12-20 01:21:21 +00:00
python3: Split pip into separate source package
Packaging pip from a separate source package allows it to stay updated with upstream. Host pip will remain installed as part of python3. Host pip is used in a much more controlled way and so is less critical for it to track upstream. This also removes the python-pip-conf package and installs the pip.conf file as part of python3-pip. The patch 003-disable-pip-version-check.patch is originally from Debian:bb079efb8c/debian/patches/disable-pip-version-check.patchpip was in a separate source package that was removed in a53d0c5a403d1669e2cf6c59c2be6a9d3ed633a0; this work is not based on that earlier package. Signed-off-by: Jeffery To <jeffery.to@gmail.com> (cherry picked from commiteee273507b)
This commit is contained in:
56
lang/python/python-pip/Makefile
Normal file
56
lang/python/python-pip/Makefile
Normal file
@@ -0,0 +1,56 @@
|
||||
#
|
||||
# Copyright (C) 2023 Jeffery To
|
||||
#
|
||||
# This is free software, licensed under the GNU General Public License v2.
|
||||
# See /LICENSE for more information.
|
||||
#
|
||||
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=python-pip
|
||||
PKG_VERSION:=23.1.2
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PYPI_NAME:=pip
|
||||
PKG_HASH:=0e7c86f486935893c708287b30bd050a36ac827ec7fe5e43fe7cb198dd835fba
|
||||
|
||||
PKG_LICENSE:=MIT
|
||||
PKG_LICENSE_FILES:=LICENSE.txt
|
||||
PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com>
|
||||
CPE_ID:=cpe:/a:python:pip
|
||||
|
||||
include ../pypi.mk
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
include ../python3-package.mk
|
||||
|
||||
define Package/python3-pip
|
||||
SECTION:=lang
|
||||
CATEGORY:=Languages
|
||||
SUBMENU:=Python
|
||||
TITLE:=PyPA recommended tool for installing Python packages
|
||||
URL:=https://pip.pypa.io/
|
||||
DEPENDS:=+python3
|
||||
endef
|
||||
|
||||
define Package/python3-pip/description
|
||||
pip is the package installer for Python. You can use pip to install
|
||||
packages from the Python Package Index and other indexes.
|
||||
endef
|
||||
|
||||
define Package/python3-pip/conffiles
|
||||
/etc/pip.conf
|
||||
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_DIR) $(1)/etc
|
||||
$(INSTALL_DATA) ./files/pip.conf $(1)/etc/
|
||||
endef
|
||||
|
||||
$(eval $(call Py3Package,python3-pip))
|
||||
$(eval $(call BuildPackage,python3-pip))
|
||||
$(eval $(call BuildPackage,python3-pip-src))
|
||||
2
lang/python/python-pip/files/pip.conf
Normal file
2
lang/python/python-pip/files/pip.conf
Normal file
@@ -0,0 +1,2 @@
|
||||
[global]
|
||||
cache-dir = /var/cache/pip
|
||||
@@ -0,0 +1,13 @@
|
||||
--- a/src/pip/_vendor/pyproject_hooks/_in_process/__init__.py
|
||||
+++ b/src/pip/_vendor/pyproject_hooks/_in_process/__init__.py
|
||||
@@ -11,8 +11,8 @@ try:
|
||||
except AttributeError:
|
||||
# Python 3.8 compatibility
|
||||
def _in_proc_script_path():
|
||||
- return resources.path(__package__, '_in_process.py')
|
||||
+ return resources.path(__package__, '_in_process.pyc')
|
||||
else:
|
||||
def _in_proc_script_path():
|
||||
return resources.as_file(
|
||||
- resources.files(__package__).joinpath('_in_process.py'))
|
||||
+ resources.files(__package__).joinpath('_in_process.pyc'))
|
||||
11
lang/python/python-pip/patches/002-pip-runner-pyc-fix.patch
Normal file
11
lang/python/python-pip/patches/002-pip-runner-pyc-fix.patch
Normal file
@@ -0,0 +1,11 @@
|
||||
--- a/src/pip/_internal/build_env.py
|
||||
+++ b/src/pip/_internal/build_env.py
|
||||
@@ -54,7 +54,7 @@ def get_runnable_pip() -> str:
|
||||
# case, we can use that directly.
|
||||
return str(source)
|
||||
|
||||
- return os.fsdecode(source / "__pip-runner__.py")
|
||||
+ return os.fsdecode(source / "__pip-runner__.pyc")
|
||||
|
||||
|
||||
def _get_system_sitepackages() -> Set[str]:
|
||||
@@ -0,0 +1,20 @@
|
||||
From: Barry Warsaw <barry@python.org>
|
||||
Date: Fri, 18 Nov 2016 17:07:47 -0500
|
||||
Subject: Set --disable-pip-version-check=True by default.
|
||||
|
||||
Patch-Name: disable-pip-version-check.patch
|
||||
---
|
||||
src/pip/_internal/cli/cmdoptions.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
--- a/src/pip/_internal/cli/cmdoptions.py
|
||||
+++ b/src/pip/_internal/cli/cmdoptions.py
|
||||
@@ -892,7 +892,7 @@ disable_pip_version_check: Callable[...,
|
||||
"--disable-pip-version-check",
|
||||
dest="disable_pip_version_check",
|
||||
action="store_true",
|
||||
- default=False,
|
||||
+ default=True,
|
||||
help="Don't periodically check PyPI to determine whether a new version "
|
||||
"of pip is available for download. Implied with --no-index.",
|
||||
)
|
||||
Reference in New Issue
Block a user