summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/python
diff options
context:
space:
mode:
authorWang Mingyu <wangmy@fujitsu.com>2024-02-28 15:32:41 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-03-01 09:28:51 +0000
commitf398ed7a3fcab8b09c18cf573174892238efd474 (patch)
tree5a2321e29629e045b99ece5ae1ffd809bdde84db /meta/recipes-devtools/python
parent87283099cddfa6942dbda16625d9d0c76eef1cf4 (diff)
downloadpoky-f398ed7a3fcab8b09c18cf573174892238efd474.tar.gz
python3-pip: upgrade 23.3.2 -> 24.0
no_shebang_mangling.patch refreshed for 24.0 Changelog: =========== -Retry on HTTP status code 502 -Automatically use the setuptools PEP 517 build backend when --config-settings is used for projects without pyproject.toml. -Make pip freeze and pip uninstall of legacy editable installs of packages whose name contains _ compatible with setuptools>=69.0.3. -Support per requirement --config-settings for editable installs. (From OE-Core rev: 73040d2ed2a440d7497b448b8e81ee19bef5858b) Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python')
-rw-r--r--meta/recipes-devtools/python/python3-pip/no_shebang_mangling.patch9
-rw-r--r--meta/recipes-devtools/python/python3-pip_24.0.bb (renamed from meta/recipes-devtools/python/python3-pip_23.3.2.bb)2
2 files changed, 5 insertions, 6 deletions
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 b59f4888da..99fa14ee03 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 @@
1From 915bf32cd117cd86cc0d4b96bc9490b1c7119ffd Mon Sep 17 00:00:00 2001 1From 2aa82aeb0783c5fa7777b32bfe1dd3da9ae8fc6e Mon Sep 17 00:00:00 2001
2From: Richard Purdie <richard.purdie@linuxfoundation.org> 2From: Richard Purdie <richard.purdie@linuxfoundation.org>
3Date: Wed, 23 Feb 2022 12:27:06 +0000 3Date: Wed, 23 Feb 2022 12:27:06 +0000
4Subject: [PATCH] python3-pip: Don't change shebang 4Subject: [PATCH] python3-pip: Don't change shebang
@@ -8,16 +8,15 @@ to be python3 from the environment when building anything for the target
8(or nativesdk). This avoids incorrect interpreter paths in the target scripts. 8(or nativesdk). This avoids incorrect interpreter paths in the target scripts.
9 9
10Upstream-Status: Inappropriate [OE specific config] 10Upstream-Status: Inappropriate [OE specific config]
11
12--- 11---
13 src/pip/_vendor/distlib/scripts.py | 4 +++- 12 src/pip/_vendor/distlib/scripts.py | 4 +++-
14 1 file changed, 3 insertions(+), 1 deletion(-) 13 1 file changed, 3 insertions(+), 1 deletion(-)
15 14
16diff --git a/src/pip/_vendor/distlib/scripts.py b/src/pip/_vendor/distlib/scripts.py 15diff --git a/src/pip/_vendor/distlib/scripts.py b/src/pip/_vendor/distlib/scripts.py
17index d270624..42c0d10 100644 16index cfa45d2..313f499 100644
18--- a/src/pip/_vendor/distlib/scripts.py 17--- a/src/pip/_vendor/distlib/scripts.py
19+++ b/src/pip/_vendor/distlib/scripts.py 18+++ b/src/pip/_vendor/distlib/scripts.py
20@@ -137,6 +137,8 @@ class ScriptMaker(object): 19@@ -144,6 +144,8 @@ class ScriptMaker(object):
21 See also: http://www.in-ulm.de/~mascheck/various/shebang/#length 20 See also: http://www.in-ulm.de/~mascheck/various/shebang/#length
22 https://hg.mozilla.org/mozilla-central/file/tip/mach 21 https://hg.mozilla.org/mozilla-central/file/tip/mach
23 """ 22 """
@@ -26,7 +25,7 @@ index d270624..42c0d10 100644
26 if os.name != 'posix': 25 if os.name != 'posix':
27 simple_shebang = True 26 simple_shebang = True
28 else: 27 else:
29@@ -348,7 +350,7 @@ class ScriptMaker(object): 28@@ -362,7 +364,7 @@ class ScriptMaker(object):
30 return 29 return
31 30
32 match = FIRST_LINE_RE.match(first_line.replace(b'\r\n', b'\n')) 31 match = FIRST_LINE_RE.match(first_line.replace(b'\r\n', b'\n'))
diff --git a/meta/recipes-devtools/python/python3-pip_23.3.2.bb b/meta/recipes-devtools/python/python3-pip_24.0.bb
index 0f2ab9288b..be4a29500a 100644
--- a/meta/recipes-devtools/python/python3-pip_23.3.2.bb
+++ b/meta/recipes-devtools/python/python3-pip_24.0.bb
@@ -33,7 +33,7 @@ inherit pypi python_setuptools_build_meta
33 33
34SRC_URI += "file://no_shebang_mangling.patch" 34SRC_URI += "file://no_shebang_mangling.patch"
35 35
36SRC_URI[sha256sum] = "7fd9972f96db22c8077a1ee2691b172c8089b17a5652a44494a9ecb0d78f9149" 36SRC_URI[sha256sum] = "ea9bd1a847e8c5774a5777bb398c19e80bcd4e2aa16a4b301b718fe6f593aba2"
37 37
38do_install:append() { 38do_install:append() {
39 rm -f ${D}/${bindir}/pip 39 rm -f ${D}/${bindir}/pip