From f5eafb4ed1cc3b83f5947486052e5b8eaa9480ea Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Tue, 12 Nov 2024 17:24:31 +0800 Subject: python3-pip: upgrade 24.2 -> 24.3.1 no_shebang_mangling.patch refreshed for 24.3.1 Changelog: ========= - Deprecate wheel filenames that are not compliant with PEP 440. - Detect recursively referencing requirements files and help users identify the source. - Support for PEP 730 iOS wheels. - Display a better error message when an already installed package has an invalid requirement - Ignore PIP_TARGET and pip.conf global.target when preparing a build environment. - Restore support for macOS 10.12 and older (via truststore). - Allow installing pip in editable mode in a virtual environment on Windows. - Upgrade certifi to 2024.8.30 - Upgrade distlib to 0.3.9 - Upgrade truststore to 0.10.0 - Upgrade urllib3 to 1.26.20 - Allow multiple nested inclusions of the same requirements file again. (From OE-Core rev: 0ee321a8080226347116e9beeb66e1f00436cb22) Signed-off-by: Wang Mingyu Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- .../python/python3-pip/no_shebang_mangling.patch | 10 ++--- meta/recipes-devtools/python/python3-pip_24.2.bb | 51 ---------------------- meta/recipes-devtools/python/python3-pip_24.3.1.bb | 51 ++++++++++++++++++++++ 3 files changed, 56 insertions(+), 56 deletions(-) delete mode 100644 meta/recipes-devtools/python/python3-pip_24.2.bb create mode 100644 meta/recipes-devtools/python/python3-pip_24.3.1.bb (limited to 'meta/recipes-devtools/python') diff --git a/meta/recipes-devtools/python/python3-pip/no_shebang_mangling.patch b/meta/recipes-devtools/python/python3-pip/no_shebang_mangling.patch index 0481a78a88..f95071bfb2 100644 --- a/meta/recipes-devtools/python/python3-pip/no_shebang_mangling.patch +++ b/meta/recipes-devtools/python/python3-pip/no_shebang_mangling.patch @@ -1,4 +1,4 @@ -From 41542c2bf85c1c79bb55e6549e8f844b3a1db208 Mon Sep 17 00:00:00 2001 +From 5d0b54ea2aae600a2c3a2b6ec71acf99290640e7 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 23 Feb 2022 12:27:06 +0000 Subject: [PATCH] python3-pip: Don't change shebang @@ -13,10 +13,10 @@ Upstream-Status: Inappropriate [OE specific config] 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/pip/_vendor/distlib/scripts.py b/src/pip/_vendor/distlib/scripts.py -index e16292b..a3a161d 100644 +index b1fc705..c030e98 100644 --- a/src/pip/_vendor/distlib/scripts.py +++ b/src/pip/_vendor/distlib/scripts.py -@@ -162,6 +162,8 @@ class ScriptMaker(object): +@@ -155,6 +155,8 @@ class ScriptMaker(object): See also: http://www.in-ulm.de/~mascheck/various/shebang/#length https://hg.mozilla.org/mozilla-central/file/tip/mach """ @@ -24,8 +24,8 @@ index e16292b..a3a161d 100644 + return b'#!/usr/bin/env python3' if os.name != 'posix': simple_shebang = True - else: -@@ -380,7 +382,7 @@ class ScriptMaker(object): + elif getattr(sys, "cross_compiling", False): +@@ -363,7 +365,7 @@ class ScriptMaker(object): return match = FIRST_LINE_RE.match(first_line.replace(b'\r\n', b'\n')) diff --git a/meta/recipes-devtools/python/python3-pip_24.2.bb b/meta/recipes-devtools/python/python3-pip_24.2.bb deleted file mode 100644 index bc164415fe..0000000000 --- a/meta/recipes-devtools/python/python3-pip_24.2.bb +++ /dev/null @@ -1,51 +0,0 @@ -SUMMARY = "The PyPA recommended tool for installing Python packages" -HOMEPAGE = "https://pypi.org/project/pip" -SECTION = "devel/python" -LICENSE = "MIT & Apache-2.0 & MPL-2.0 & LGPL-2.1-only & BSD-3-Clause & PSF-2.0 & BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=63ec52baf95163b597008bb46db68030 \ - file://src/pip/_vendor/cachecontrol/LICENSE.txt;md5=6572692148079ebbbd800be4b9f36c6d \ - file://src/pip/_vendor/certifi/LICENSE;md5=11618cb6a975948679286b1211bd573c \ - file://src/pip/_vendor/distlib/LICENSE.txt;md5=f6a11430d5cd6e2cd3832ee94f22ddfc \ - file://src/pip/_vendor/distro/LICENSE;md5=d2794c0df5b907fdace235a619d80314 \ - file://src/pip/_vendor/idna/LICENSE.md;md5=204c0612e40a4dd46012a78d02c80fb1 \ - file://src/pip/_vendor/msgpack/COPYING;md5=cd9523181d9d4fbf7ffca52eaa2a5751 \ - file://src/pip/_vendor/packaging/LICENSE;md5=faadaedca9251a90b205c9167578ce91 \ - file://src/pip/_vendor/pkg_resources/LICENSE;md5=141643e11c48898150daa83802dbc65f \ - file://src/pip/_vendor/platformdirs/LICENSE;md5=ea4f5a41454746a9ed111e3d8723d17a \ - file://src/pip/_vendor/pygments/LICENSE;md5=36a13c90514e2899f1eba7f41c3ee592 \ - file://src/pip/_vendor/pyproject_hooks/LICENSE;md5=aad69c93f605003e3342b174d9b0708c \ - file://src/pip/_vendor/requests/LICENSE;md5=34400b68072d710fecd0a2940a0d1658 \ - file://src/pip/_vendor/resolvelib/LICENSE;md5=78e1c0248051c32a38a7f820c30bd7a5 \ - file://src/pip/_vendor/rich/LICENSE;md5=b5f0b94fbc94f5ad9ae4efcf8a778303 \ - file://src/pip/_vendor/tomli/LICENSE;md5=aaaaf0879d17df0110d1aa8c8c9f46f5 \ - file://src/pip/_vendor/truststore/LICENSE;md5=74420fc3965c4558a4a1529e63c2867f \ - file://src/pip/_vendor/typing_extensions.LICENSE;md5=fcf6b249c2641540219a727f35d8d2c2 \ - file://src/pip/_vendor/urllib3/LICENSE.txt;md5=c2823cb995439c984fd62a973d79815c \ - " - -inherit pypi python_setuptools_build_meta - -SRC_URI += "file://no_shebang_mangling.patch" - -SRC_URI[sha256sum] = "5b5e490b5e9cb275c879595064adce9ebd31b854e3e803740b72f9ccf34a45b8" - -RDEPENDS:${PN} = "\ - python3-compile \ - python3-html \ - python3-image \ - python3-io \ - python3-json \ - python3-multiprocessing \ - python3-netserver \ - python3-pickle \ - python3-setuptools \ - python3-tomllib \ - python3-unixadmin \ - python3-xmlrpc \ -" - -BBCLASSEXTEND = "native nativesdk" - -# This used to use the bootstrap install which didn't compile. Until we bump the -# tmpdir version we can't compile the native otherwise the sysroot unpack fails -INSTALL_WHEEL_COMPILE_BYTECODE:class-native = "--no-compile-bytecode" diff --git a/meta/recipes-devtools/python/python3-pip_24.3.1.bb b/meta/recipes-devtools/python/python3-pip_24.3.1.bb new file mode 100644 index 0000000000..1fa246e4f1 --- /dev/null +++ b/meta/recipes-devtools/python/python3-pip_24.3.1.bb @@ -0,0 +1,51 @@ +SUMMARY = "The PyPA recommended tool for installing Python packages" +HOMEPAGE = "https://pypi.org/project/pip" +SECTION = "devel/python" +LICENSE = "MIT & Apache-2.0 & MPL-2.0 & LGPL-2.1-only & BSD-3-Clause & PSF-2.0 & BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=63ec52baf95163b597008bb46db68030 \ + file://src/pip/_vendor/cachecontrol/LICENSE.txt;md5=6572692148079ebbbd800be4b9f36c6d \ + file://src/pip/_vendor/certifi/LICENSE;md5=11618cb6a975948679286b1211bd573c \ + file://src/pip/_vendor/distlib/LICENSE.txt;md5=f6a11430d5cd6e2cd3832ee94f22ddfc \ + file://src/pip/_vendor/distro/LICENSE;md5=d2794c0df5b907fdace235a619d80314 \ + file://src/pip/_vendor/idna/LICENSE.md;md5=204c0612e40a4dd46012a78d02c80fb1 \ + file://src/pip/_vendor/msgpack/COPYING;md5=cd9523181d9d4fbf7ffca52eaa2a5751 \ + file://src/pip/_vendor/packaging/LICENSE;md5=faadaedca9251a90b205c9167578ce91 \ + file://src/pip/_vendor/pkg_resources/LICENSE;md5=141643e11c48898150daa83802dbc65f \ + file://src/pip/_vendor/platformdirs/LICENSE;md5=ea4f5a41454746a9ed111e3d8723d17a \ + file://src/pip/_vendor/pygments/LICENSE;md5=36a13c90514e2899f1eba7f41c3ee592 \ + file://src/pip/_vendor/pyproject_hooks/LICENSE;md5=aad69c93f605003e3342b174d9b0708c \ + file://src/pip/_vendor/requests/LICENSE;md5=34400b68072d710fecd0a2940a0d1658 \ + file://src/pip/_vendor/resolvelib/LICENSE;md5=78e1c0248051c32a38a7f820c30bd7a5 \ + file://src/pip/_vendor/rich/LICENSE;md5=b5f0b94fbc94f5ad9ae4efcf8a778303 \ + file://src/pip/_vendor/tomli/LICENSE;md5=aaaaf0879d17df0110d1aa8c8c9f46f5 \ + file://src/pip/_vendor/truststore/LICENSE;md5=74420fc3965c4558a4a1529e63c2867f \ + file://src/pip/_vendor/typing_extensions.LICENSE;md5=fcf6b249c2641540219a727f35d8d2c2 \ + file://src/pip/_vendor/urllib3/LICENSE.txt;md5=c2823cb995439c984fd62a973d79815c \ + " + +inherit pypi python_setuptools_build_meta + +SRC_URI += "file://no_shebang_mangling.patch" + +SRC_URI[sha256sum] = "ebcb60557f2aefabc2e0f918751cd24ea0d56d8ec5445fe1807f1d2109660b99" + +RDEPENDS:${PN} = "\ + python3-compile \ + python3-html \ + python3-image \ + python3-io \ + python3-json \ + python3-multiprocessing \ + python3-netserver \ + python3-pickle \ + python3-setuptools \ + python3-tomllib \ + python3-unixadmin \ + python3-xmlrpc \ +" + +BBCLASSEXTEND = "native nativesdk" + +# This used to use the bootstrap install which didn't compile. Until we bump the +# tmpdir version we can't compile the native otherwise the sysroot unpack fails +INSTALL_WHEEL_COMPILE_BYTECODE:class-native = "--no-compile-bytecode" -- cgit v1.2.3-54-g00ecf