From 9ca49ee1fb2ea788ec3f23595a12db0ba7a2fd42 Mon Sep 17 00:00:00 2001 From: termux-pacman-bot Date: Sun, 23 Jun 2024 15:37:09 +0000 Subject: [PATCH] bump(main/python-pip): 24.1 (#20640) --- packages/python-pip/build.sh | 7 +++---- packages/python-pip/fix-hardcoded-paths.patch | 14 +++++++------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/packages/python-pip/build.sh b/packages/python-pip/build.sh index e40affea61..b00d04faca 100644 --- a/packages/python-pip/build.sh +++ b/packages/python-pip/build.sh @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://pip.pypa.io/ TERMUX_PKG_DESCRIPTION="The PyPA recommended tool for installing Python packages" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="24.0" -TERMUX_PKG_REVISION=2 +TERMUX_PKG_VERSION="24.1" TERMUX_PKG_SRCURL=https://github.com/pypa/pip/archive/$TERMUX_PKG_VERSION.tar.gz -TERMUX_PKG_SHA256=ad0dfe75fb28092a8cbe18523391695ceb0c0d65a5c9a969349fcb13b12b84c7 +TERMUX_PKG_SHA256=92c1b2d311065576598bef5f27d0b9b64bb832c15d5f5cbf2214b309eacded89 TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_UPDATE_TAG_TYPE="newest-tag" TERMUX_PKG_UPDATE_VERSION_REGEXP='^\d+\.\d+(\.\d+)?$' @@ -14,7 +13,7 @@ TERMUX_PKG_ANTI_BUILD_DEPENDS="clang" TERMUX_PKG_BREAKS="python (<< 3.11.1-1)" TERMUX_PKG_PLATFORM_INDEPENDENT=true TERMUX_PKG_BUILD_IN_SRC=true -TERMUX_PKG_PYTHON_COMMON_DEPS="wheel, setuptools==67.8, docutils, myst_parser, sphinx_copybutton, sphinx_inline_tabs, sphinxcontrib.towncrier, completion" +TERMUX_PKG_PYTHON_COMMON_DEPS="wheel, setuptools==69.5.1, docutils, myst_parser, sphinx_copybutton, sphinx_inline_tabs, sphinxcontrib.towncrier, completion" termux_pkg_auto_update() { local tag diff --git a/packages/python-pip/fix-hardcoded-paths.patch b/packages/python-pip/fix-hardcoded-paths.patch index 9cfafd5a9a..b278d0555c 100644 --- a/packages/python-pip/fix-hardcoded-paths.patch +++ b/packages/python-pip/fix-hardcoded-paths.patch @@ -1,19 +1,19 @@ ---- pip-22.3.1/src/pip/_internal/utils/appdirs.py -+++ pip-22.3.1/src/pip/_internal/utils/appdirs.py +--- a/src/pip/_internal/utils/appdirs.py ++++ b/src/pip/_internal/utils/appdirs.py @@ -49,4 +49,4 @@ def site_config_dirs(appname: str) -> List[str]: return [dirval] # Unix-y system. Look in /etc as well. - return dirval.split(os.pathsep) + ["/etc"] + return dirval.split(os.pathsep) + ["@TERMUX_PREFIX@/etc"] ---- pip-22.3.1/src/pip/_vendor/platformdirs/unix.py -+++ pip-22.3.1/src/pip/_vendor/platformdirs/unix.py -@@ -79,7 +79,7 @@ def site_config_dir(self) -> str: - # XDG default for $XDG_CONFIG_DIRS only first, if multipath is False +--- a/src/pip/_vendor/platformdirs/unix.py ++++ b/src/pip/_vendor/platformdirs/unix.py +@@ -79,7 +79,7 @@ class Unix(PlatformDirsABC): # noqa: PLR0904 + def _site_config_dirs(self) -> list[str]: path = os.environ.get("XDG_CONFIG_DIRS", "") if not path.strip(): - path = "/etc/xdg" + path = "@TERMUX_PREFIX@/etc/xdg" - return self._with_multi_path(path) + return [self._append_app_name_and_version(p) for p in path.split(os.pathsep)] @property