From 5181c5acdcfd1f33ef9787732eea3e8ef36dcf0c Mon Sep 17 00:00:00 2001 From: wangmy Date: Thu, 4 Aug 2022 07:56:14 +0800 Subject: python3-pip: upgrade 22.1.2 -> 22.2.1 reproducible.patch refreshed for new version. 0001-change-shebang-to-python3.patch removed as not needed since upstream has removed the shebang lines. License-Update: src/pip/_vendor/html5lib/LICENSE: removed since it's not it new version src/pip/_vendor/chardet/LICENSE: file format modified, change St to Street src/pip/_vendor/pygments/LICENSE: Copyright year updated to 2022 (From OE-Core rev: d69f360bb48001a4ec9220c8f935bb5fe43b4f7a) Signed-off-by: Wang Mingyu Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie --- .../0001-change-shebang-to-python3.patch | 115 --------------------- .../python/python3-pip/reproducible.patch | 71 +++++++------ meta/recipes-devtools/python/python3-pip_22.1.2.bb | 65 ------------ meta/recipes-devtools/python/python3-pip_22.2.1.bb | 63 +++++++++++ 4 files changed, 103 insertions(+), 211 deletions(-) delete mode 100644 meta/recipes-devtools/python/python3-pip/0001-change-shebang-to-python3.patch delete mode 100644 meta/recipes-devtools/python/python3-pip_22.1.2.bb create mode 100644 meta/recipes-devtools/python/python3-pip_22.2.1.bb diff --git a/meta/recipes-devtools/python/python3-pip/0001-change-shebang-to-python3.patch b/meta/recipes-devtools/python/python3-pip/0001-change-shebang-to-python3.patch deleted file mode 100644 index d6c27b8461..0000000000 --- a/meta/recipes-devtools/python/python3-pip/0001-change-shebang-to-python3.patch +++ /dev/null @@ -1,115 +0,0 @@ -From dca973830d4eee3e0f79e61237c44a9dd8201641 Mon Sep 17 00:00:00 2001 -From: Trevor Gamblin -Date: Tue, 22 Jun 2021 12:31:46 -0400 -Subject: [PATCH] change shebang to python3 - -Upstream-Status: Inappropriate (OE-specific) - -Despite no longer supporting python2, some files in the pip source refer -to "python" instead of "python3", so patch them as needed to ensure that -they correctly reference the python3 binary. - -Signed-off-by: Trevor Gamblin - ---- - src/pip/_vendor/chardet/langbulgarianmodel.py | 2 +- - src/pip/_vendor/chardet/langgreekmodel.py | 2 +- - src/pip/_vendor/chardet/langhebrewmodel.py | 2 +- - src/pip/_vendor/chardet/langhungarianmodel.py | 2 +- - src/pip/_vendor/chardet/langrussianmodel.py | 2 +- - src/pip/_vendor/chardet/langthaimodel.py | 2 +- - src/pip/_vendor/chardet/langturkishmodel.py | 2 +- - src/pip/_vendor/chardet/metadata/languages.py | 2 +- - src/pip/_vendor/requests/certs.py | 2 +- - 9 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/src/pip/_vendor/chardet/langbulgarianmodel.py b/src/pip/_vendor/chardet/langbulgarianmodel.py -index e963a50..97ea6ce 100644 ---- a/src/pip/_vendor/chardet/langbulgarianmodel.py -+++ b/src/pip/_vendor/chardet/langbulgarianmodel.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # -*- coding: utf-8 -*- - - from pip._vendor.chardet.sbcharsetprober import SingleByteCharSetModel -diff --git a/src/pip/_vendor/chardet/langgreekmodel.py b/src/pip/_vendor/chardet/langgreekmodel.py -index d99528e..4a127ea 100644 ---- a/src/pip/_vendor/chardet/langgreekmodel.py -+++ b/src/pip/_vendor/chardet/langgreekmodel.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # -*- coding: utf-8 -*- - - from pip._vendor.chardet.sbcharsetprober import SingleByteCharSetModel -diff --git a/src/pip/_vendor/chardet/langhebrewmodel.py b/src/pip/_vendor/chardet/langhebrewmodel.py -index 484c652..676c1a7 100644 ---- a/src/pip/_vendor/chardet/langhebrewmodel.py -+++ b/src/pip/_vendor/chardet/langhebrewmodel.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # -*- coding: utf-8 -*- - - from pip._vendor.chardet.sbcharsetprober import SingleByteCharSetModel -diff --git a/src/pip/_vendor/chardet/langhungarianmodel.py b/src/pip/_vendor/chardet/langhungarianmodel.py -index bbc5cda..042eae7 100644 ---- a/src/pip/_vendor/chardet/langhungarianmodel.py -+++ b/src/pip/_vendor/chardet/langhungarianmodel.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # -*- coding: utf-8 -*- - - from pip._vendor.chardet.sbcharsetprober import SingleByteCharSetModel -diff --git a/src/pip/_vendor/chardet/langrussianmodel.py b/src/pip/_vendor/chardet/langrussianmodel.py -index 5594452..564b02e 100644 ---- a/src/pip/_vendor/chardet/langrussianmodel.py -+++ b/src/pip/_vendor/chardet/langrussianmodel.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # -*- coding: utf-8 -*- - - from pip._vendor.chardet.sbcharsetprober import SingleByteCharSetModel -diff --git a/src/pip/_vendor/chardet/langthaimodel.py b/src/pip/_vendor/chardet/langthaimodel.py -index 9a37db5..c974879 100644 ---- a/src/pip/_vendor/chardet/langthaimodel.py -+++ b/src/pip/_vendor/chardet/langthaimodel.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # -*- coding: utf-8 -*- - - from pip._vendor.chardet.sbcharsetprober import SingleByteCharSetModel -diff --git a/src/pip/_vendor/chardet/langturkishmodel.py b/src/pip/_vendor/chardet/langturkishmodel.py -index 43f4230..7e710c3 100644 ---- a/src/pip/_vendor/chardet/langturkishmodel.py -+++ b/src/pip/_vendor/chardet/langturkishmodel.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # -*- coding: utf-8 -*- - - from pip._vendor.chardet.sbcharsetprober import SingleByteCharSetModel -diff --git a/src/pip/_vendor/chardet/metadata/languages.py b/src/pip/_vendor/chardet/metadata/languages.py -index 3237d5a..aa2ec7c 100644 ---- a/src/pip/_vendor/chardet/metadata/languages.py -+++ b/src/pip/_vendor/chardet/metadata/languages.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # -*- coding: utf-8 -*- - """ - Metadata about languages used by our model training code for our -diff --git a/src/pip/_vendor/requests/certs.py b/src/pip/_vendor/requests/certs.py -index 06a594e..bfa7839 100644 ---- a/src/pip/_vendor/requests/certs.py -+++ b/src/pip/_vendor/requests/certs.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # -*- coding: utf-8 -*- - - """ diff --git a/meta/recipes-devtools/python/python3-pip/reproducible.patch b/meta/recipes-devtools/python/python3-pip/reproducible.patch index 538bb94f7a..0ed0c9177f 100644 --- a/meta/recipes-devtools/python/python3-pip/reproducible.patch +++ b/meta/recipes-devtools/python/python3-pip/reproducible.patch @@ -14,34 +14,17 @@ Signed-off-by: Richard Purdie Upstream-Status: Pending -Index: pip-22.0.3/src/pip/_internal/req/req_install.py -=================================================================== ---- pip-22.0.3.orig/src/pip/_internal/req/req_install.py -+++ pip-22.0.3/src/pip/_internal/req/req_install.py -@@ -758,7 +758,9 @@ class InstallRequirement: - if self.is_wheel: - assert self.local_file_path - direct_url = None -- if self.editable: -+ if '_PYTHON_SYSCONFIGDATA_NAME' in os.environ: -+ direct_url = None -+ elif self.editable: - direct_url = direct_url_for_editable(self.unpacked_source_directory) - elif self.original_link: - direct_url = direct_url_from_link( -@@ -775,6 +777,7 @@ class InstallRequirement: - warn_script_location=warn_script_location, - direct_url=direct_url, - requested=self.user_supplied, -+ root=root, - ) - self.install_succeeded = True - return -Index: pip-22.0.3/src/pip/_internal/operations/install/wheel.py -=================================================================== ---- pip-22.0.3.orig/src/pip/_internal/operations/install/wheel.py -+++ pip-22.0.3/src/pip/_internal/operations/install/wheel.py -@@ -436,6 +436,7 @@ def _install_wheel( +Signed-off-by: Wang Mingyu +--- + src/pip/_internal/operations/install/wheel.py | 5 ++++- + src/pip/_internal/req/req_install.py | 5 ++++- + 2 files changed, 8 insertions(+), 2 deletions(-) + +diff --git a/src/pip/_internal/operations/install/wheel.py b/src/pip/_internal/operations/install/wheel.py +index 1af8978..3e48f9b 100644 +--- a/src/pip/_internal/operations/install/wheel.py ++++ b/src/pip/_internal/operations/install/wheel.py +@@ -434,6 +434,7 @@ def _install_wheel( warn_script_location: bool = True, direct_url: Optional[DirectUrl] = None, requested: bool = False, @@ -49,7 +32,7 @@ Index: pip-22.0.3/src/pip/_internal/operations/install/wheel.py ) -> None: """Install a wheel. -@@ -612,7 +613,7 @@ def _install_wheel( +@@ -610,7 +611,7 @@ def _install_wheel( with warnings.catch_warnings(): warnings.filterwarnings("ignore") for path in pyc_source_file_paths(): @@ -58,7 +41,7 @@ Index: pip-22.0.3/src/pip/_internal/operations/install/wheel.py if success: pyc_path = pyc_output_path(path) assert os.path.exists(pyc_path) -@@ -723,6 +724,7 @@ def install_wheel( +@@ -721,6 +722,7 @@ def install_wheel( warn_script_location: bool = True, direct_url: Optional[DirectUrl] = None, requested: bool = False, @@ -66,9 +49,35 @@ Index: pip-22.0.3/src/pip/_internal/operations/install/wheel.py ) -> None: with ZipFile(wheel_path, allowZip64=True) as z: with req_error_context(req_description): -@@ -735,4 +737,5 @@ def install_wheel( +@@ -733,4 +735,5 @@ def install_wheel( warn_script_location=warn_script_location, direct_url=direct_url, requested=requested, + root=root, ) +diff --git a/src/pip/_internal/req/req_install.py b/src/pip/_internal/req/req_install.py +index a1e376c..4c3f1bb 100644 +--- a/src/pip/_internal/req/req_install.py ++++ b/src/pip/_internal/req/req_install.py +@@ -779,7 +779,9 @@ class InstallRequirement: + assert self.local_file_path + direct_url = None + # TODO this can be refactored to direct_url = self.download_info +- if self.editable: ++ if '_PYTHON_SYSCONFIGDATA_NAME' in os.environ: ++ direct_url = None ++ elif self.editable: + direct_url = direct_url_for_editable(self.unpacked_source_directory) + elif self.original_link: + direct_url = direct_url_from_link( +@@ -796,6 +798,7 @@ class InstallRequirement: + warn_script_location=warn_script_location, + direct_url=direct_url, + requested=self.user_supplied, ++ root=root, + ) + self.install_succeeded = True + return +-- +2.25.1 + diff --git a/meta/recipes-devtools/python/python3-pip_22.1.2.bb b/meta/recipes-devtools/python/python3-pip_22.1.2.bb deleted file mode 100644 index 5fe59a4762..0000000000 --- a/meta/recipes-devtools/python/python3-pip_22.1.2.bb +++ /dev/null @@ -1,65 +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=67da0714c3f9471067b729eca6c9fbe8 \ - file://src/pip/_vendor/chardet/LICENSE;md5=a6f89e2100d9b6cdffcea4f398e37343 \ - file://src/pip/_vendor/colorama/LICENSE.txt;md5=b4936429a56a652b84c5c01280dcaa26 \ - file://src/pip/_vendor/distlib/LICENSE.txt;md5=f6a11430d5cd6e2cd3832ee94f22ddfc \ - file://src/pip/_vendor/distro/LICENSE;md5=d2794c0df5b907fdace235a619d80314 \ - file://src/pip/_vendor/html5lib/LICENSE;md5=1ba5ada9e6fead1fdc32f43c9f10ba7c \ - file://src/pip/_vendor/idna/LICENSE.md;md5=239668a7c6066d9e0c5382e9c8c6c0e1 \ - file://src/pip/_vendor/msgpack/COPYING;md5=cd9523181d9d4fbf7ffca52eaa2a5751 \ - file://src/pip/_vendor/packaging/LICENSE;md5=faadaedca9251a90b205c9167578ce91 \ - file://src/pip/_vendor/packaging/LICENSE.APACHE;md5=2ee41112a44fe7014dce33e26468ba93 \ - file://src/pip/_vendor/pep517/LICENSE;md5=aad69c93f605003e3342b174d9b0708c \ - file://src/pip/_vendor/pkg_resources/LICENSE;md5=9a33897f1bca1160d7aad3835152e158 \ - file://src/pip/_vendor/platformdirs/LICENSE.txt;md5=282c970bb844954c8535dd6e9733db7f \ - file://src/pip/_vendor/pygments/LICENSE;md5=98419e351433ac106a24e3ad435930bc \ - file://src/pip/_vendor/pyparsing/LICENSE;md5=657a566233888513e1f07ba13e2f47f1 \ - 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/six.LICENSE;md5=43cfc9e4ac0e377acfb9b76f56b8415d \ - file://src/pip/_vendor/tenacity/LICENSE;md5=175792518e4ac015ab6696d16c4f607e \ - file://src/pip/_vendor/tomli/LICENSE;md5=aaaaf0879d17df0110d1aa8c8c9f46f5 \ - file://src/pip/_vendor/typing_extensions.LICENSE;md5=64fc2b30b67d0a8423c250e0386ed72f \ - file://src/pip/_vendor/urllib3/LICENSE.txt;md5=c2823cb995439c984fd62a973d79815c \ - file://src/pip/_vendor/webencodings/LICENSE;md5=81fb24cd7823cce23b69f721993dce4d \ -" - -inherit pypi python_setuptools_build_meta - -SRC_URI += "file://0001-change-shebang-to-python3.patch" -SRC_URI += "file://no_shebang_mangling.patch" -SRC_URI += "file://reproducible.patch" - -SRC_URI[sha256sum] = "6d55b27e10f506312894a87ccc59f280136bad9061719fac9101bdad5a6bce69" - -do_install:append() { - rm -f ${D}/${bindir}/pip -} - -RDEPENDS:${PN} = "\ - python3-compile \ - python3-io \ - python3-html \ - python3-json \ - python3-multiprocessing \ - python3-netserver \ - python3-setuptools \ - python3-unixadmin \ - python3-xmlrpc \ - python3-pickle \ - python3-distutils \ - python3-image \ -" - -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_22.2.1.bb b/meta/recipes-devtools/python/python3-pip_22.2.1.bb new file mode 100644 index 0000000000..39349b6026 --- /dev/null +++ b/meta/recipes-devtools/python/python3-pip_22.2.1.bb @@ -0,0 +1,63 @@ +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=67da0714c3f9471067b729eca6c9fbe8 \ + file://src/pip/_vendor/chardet/LICENSE;md5=4fbd65380cdd255951079008b364516c \ + file://src/pip/_vendor/colorama/LICENSE.txt;md5=b4936429a56a652b84c5c01280dcaa26 \ + 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=239668a7c6066d9e0c5382e9c8c6c0e1 \ + file://src/pip/_vendor/msgpack/COPYING;md5=cd9523181d9d4fbf7ffca52eaa2a5751 \ + file://src/pip/_vendor/packaging/LICENSE;md5=faadaedca9251a90b205c9167578ce91 \ + file://src/pip/_vendor/packaging/LICENSE.APACHE;md5=2ee41112a44fe7014dce33e26468ba93 \ + file://src/pip/_vendor/pep517/LICENSE;md5=aad69c93f605003e3342b174d9b0708c \ + file://src/pip/_vendor/pkg_resources/LICENSE;md5=9a33897f1bca1160d7aad3835152e158 \ + file://src/pip/_vendor/platformdirs/LICENSE.txt;md5=282c970bb844954c8535dd6e9733db7f \ + file://src/pip/_vendor/pygments/LICENSE;md5=36a13c90514e2899f1eba7f41c3ee592 \ + file://src/pip/_vendor/pyparsing/LICENSE;md5=657a566233888513e1f07ba13e2f47f1 \ + 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/six.LICENSE;md5=43cfc9e4ac0e377acfb9b76f56b8415d \ + file://src/pip/_vendor/tenacity/LICENSE;md5=175792518e4ac015ab6696d16c4f607e \ + file://src/pip/_vendor/tomli/LICENSE;md5=aaaaf0879d17df0110d1aa8c8c9f46f5 \ + file://src/pip/_vendor/typing_extensions.LICENSE;md5=64fc2b30b67d0a8423c250e0386ed72f \ + file://src/pip/_vendor/urllib3/LICENSE.txt;md5=c2823cb995439c984fd62a973d79815c \ + file://src/pip/_vendor/webencodings/LICENSE;md5=81fb24cd7823cce23b69f721993dce4d \ +" + +inherit pypi python_setuptools_build_meta + +SRC_URI += "file://no_shebang_mangling.patch" +SRC_URI += "file://reproducible.patch" + +SRC_URI[sha256sum] = "50516e47a2b79e77446f0d05649f0d53772c192571486236b1905492bfc24bac" + +do_install:append() { + rm -f ${D}/${bindir}/pip +} + +RDEPENDS:${PN} = "\ + python3-compile \ + python3-io \ + python3-html \ + python3-json \ + python3-multiprocessing \ + python3-netserver \ + python3-setuptools \ + python3-unixadmin \ + python3-xmlrpc \ + python3-pickle \ + python3-distutils \ + python3-image \ +" + +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