mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-02-06 08:48:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

python3-pip: upgrade 22.1.2 -> 22.2.1

Browse Source 
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 <wangmy@fujitsu.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
wangmy
2022-08-04 07:56:14 +08:00
committed by Richard Purdie
parent 7f4555e35f
commit 5181c5acdc
3 changed files with 43 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
meta/recipes-devtools/python/python3-pip/reproducible.patch
View File

@@ -14,34 +14,17 @@ Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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 <wangmy@fujitsu.com>
---
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