python3-pip: upgrade 22.1.2 -> 22.2.1
PATCH v2 1/1 python3-pip: upgrade 22.1.2 -> 22.2.1
reproducible.patch
refreshed for new version.
0001-change-shebang-to-python3.patch
removed since it's not available in new version.
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
---
.../0001-change-shebang-to-python3.patch | 115 ------------------
.../python/python3-pip/reproducible.patch | 71 ++++++-----
...n3-pip_22.1.2.bb => python3-pip_22.2.1.bb} | 8 +-
3 files changed, 43 insertions(+), 151 deletions(-)
delete mode 100644 meta/recipes-devtools/python/python3-pip/0001-change-shebang-to-python3.patch
rename meta/recipes-devtools/python/{python3-pip_22.1.2.bb => python3-pip_22.2.1.bb} (88%)meta/recipes-devtools/python/python3-pip/0001-change-shebang-to-python3.patch deleted +0 -115
@@ -1,115 +0,0 @@ -From dca973830d4eee3e0f79e61237c44a9dd8201641 Mon Sep 17 00:00:00 2001 -From: Trevor Gamblin <[email protected]> -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 <[email protected]> - ---- - 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 -*- - - """
meta/recipes-devtools/python/python3-pip/reproducible.patch +40 -31
97 lines not on this page · raw message
meta/recipes-devtools/python/python3-pip_22.2.1.bb renamed from meta/recipes-devtools/python/python3-pip_22.1.2.bb +3 -5
@@ -6,11 +6,10 @@ 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/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/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 \
@@ -18,7 +17,7 @@ LIC_FILES_CHKSUM = "\ 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/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 \
@@ -33,11 +32,10 @@ LIC_FILES_CHKSUM = "\ 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" +SRC_URI[sha256sum] = "50516e47a2b79e77446f0d05649f0d53772c192571486236b1905492bfc24bac" do_install:append() { rm -f ${D}/${bindir}/pip
Signature · 1 line
2.25.1
Quoted 5 lines · On Thu, 4 Aug 2022 07:56:14 +0800 "wangmy" <[email protected]> wrote:
reproducible.patch
refreshed for new version.0001-change-shebang-to-python3.patch
removed since it's not available in new version.
I must say this comment was not clear to me. What is "not available in new version"?
By looking at the source history, I found upstream has removed the shebang lines entirely and thus this patch is not needed anymore.
I'm taking this patch for testing with this comment modified to:
removed as not needed since upstream has removed the shebang lines.
Can you confirm whether it is correctly describing what you mean?
Thanks,
Signature · 3 lines
Luca Ceresoli, Bootlin Embedded Linux and Kernel engineering https://bootlin.com