From 06cf8e9fee82ea17610186941e8b235752bfba4c Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Tue, 15 Dec 2020 04:58:52 +0800 Subject: [PATCH 1/2] [patch tracking] 20201215045849754838 - https://github.com/pypa/pip/commit/cfa013b91726dfcbadbff86b29c13df7eeef4d43 --- ...13b91726dfcbadbff86b29c13df7eeef4d43.patch | 151 ++++++++++++++++++ 1 file changed, 151 insertions(+) create mode 100644 cfa013b91726dfcbadbff86b29c13df7eeef4d43.patch diff --git a/cfa013b91726dfcbadbff86b29c13df7eeef4d43.patch b/cfa013b91726dfcbadbff86b29c13df7eeef4d43.patch new file mode 100644 index 0000000..4d2c255 --- /dev/null +++ b/cfa013b91726dfcbadbff86b29c13df7eeef4d43.patch @@ -0,0 +1,151 @@ +diff --git a/news/packaging.vendor.rst b/news/packaging.vendor.rst +new file mode 100644 +index 0000000000..24d7440e05 +--- /dev/null ++++ b/news/packaging.vendor.rst +@@ -0,0 +1 @@ ++Update vendoring to 20.8 +diff --git a/src/pip/_vendor/packaging/__about__.py b/src/pip/_vendor/packaging/__about__.py +new file mode 100644 +index 0000000000..2d39193b05 +--- /dev/null ++++ b/src/pip/_vendor/packaging/__about__.py +@@ -0,0 +1,27 @@ ++# This file is dual licensed under the terms of the Apache License, Version ++# 2.0, and the BSD License. See the LICENSE file in the root of this repository ++# for complete details. ++from __future__ import absolute_import, division, print_function ++ ++__all__ = [ ++ "__title__", ++ "__summary__", ++ "__uri__", ++ "__version__", ++ "__author__", ++ "__email__", ++ "__license__", ++ "__copyright__", ++] ++ ++__title__ = "packaging" ++__summary__ = "Core utilities for Python packages" ++__uri__ = "https://github.com/pypa/packaging" ++ ++__version__ = "20.8" ++ ++__author__ = "Donald Stufft and individual contributors" ++__email__ = "donald@stufft.io" ++ ++__license__ = "BSD-2-Clause or Apache-2.0" ++__copyright__ = "2014-2019 %s" % __author__ +diff --git a/src/pip/_vendor/packaging/__init__.py b/src/pip/_vendor/packaging/__init__.py +index 18fecb867a..a0cf67df52 100644 +--- a/src/pip/_vendor/packaging/__init__.py ++++ b/src/pip/_vendor/packaging/__init__.py +@@ -1,5 +1,26 @@ + # This file is dual licensed under the terms of the Apache License, Version + # 2.0, and the BSD License. See the LICENSE file in the root of this repository + # for complete details. +-"""Core utilities for Python packages""" +-__version__ = "20.7" ++from __future__ import absolute_import, division, print_function ++ ++from .__about__ import ( ++ __author__, ++ __copyright__, ++ __email__, ++ __license__, ++ __summary__, ++ __title__, ++ __uri__, ++ __version__, ++) ++ ++__all__ = [ ++ "__title__", ++ "__summary__", ++ "__uri__", ++ "__version__", ++ "__author__", ++ "__email__", ++ "__license__", ++ "__copyright__", ++] +diff --git a/src/pip/_vendor/packaging/requirements.py b/src/pip/_vendor/packaging/requirements.py +index f9d1c65991..df7f41d2c0 100644 +--- a/src/pip/_vendor/packaging/requirements.py ++++ b/src/pip/_vendor/packaging/requirements.py +@@ -22,7 +22,7 @@ + + + if TYPE_CHECKING: # pragma: no cover +- from typing import List ++ from typing import List, Optional as TOptional, Set + + + class InvalidRequirement(ValueError): +@@ -109,7 +109,7 @@ def __init__(self, requirement_string): + ) + ) + +- self.name = req.name ++ self.name = req.name # type: str + if req.url: + parsed_url = urlparse.urlparse(req.url) + if parsed_url.scheme == "file": +@@ -119,12 +119,12 @@ def __init__(self, requirement_string): + not parsed_url.scheme and not parsed_url.netloc + ): + raise InvalidRequirement("Invalid URL: {0}".format(req.url)) +- self.url = req.url ++ self.url = req.url # type: TOptional[str] + else: + self.url = None +- self.extras = set(req.extras.asList() if req.extras else []) +- self.specifier = SpecifierSet(req.specifier) +- self.marker = req.marker if req.marker else None ++ self.extras = set(req.extras.asList() if req.extras else []) # type: Set[str] ++ self.specifier = SpecifierSet(req.specifier) # type: SpecifierSet ++ self.marker = req.marker if req.marker else None # type: TOptional[Marker] + + def __str__(self): + # type: () -> str +diff --git a/src/pip/_vendor/packaging/tags.py b/src/pip/_vendor/packaging/tags.py +index 842447d863..13798e38bc 100644 +--- a/src/pip/_vendor/packaging/tags.py ++++ b/src/pip/_vendor/packaging/tags.py +@@ -410,7 +410,7 @@ def _mac_binary_formats(version, cpu_arch): + if cpu_arch in {"arm64", "x86_64"}: + formats.append("universal2") + +- if cpu_arch in {"x86_64", "i386", "ppc64", "ppc"}: ++ if cpu_arch in {"x86_64", "i386", "ppc64", "ppc", "intel"}: + formats.append("universal") + + return formats +@@ -827,11 +827,7 @@ def interpreter_version(**kwargs): + + def _version_nodot(version): + # type: (PythonVersion) -> str +- if any(v >= 10 for v in version): +- sep = "_" +- else: +- sep = "" +- return sep.join(map(str, version)) ++ return "".join(map(str, version)) + + + def sys_tags(**kwargs): +diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt +index c7bc37c16c..15c000339a 100644 +--- a/src/pip/_vendor/vendor.txt ++++ b/src/pip/_vendor/vendor.txt +@@ -7,7 +7,7 @@ distro==1.5.0 + html5lib==1.1 + ipaddress==1.0.23 # Only needed on 2.6 and 2.7 + msgpack==1.0.0 +-packaging==20.7 ++packaging==20.8 + pep517==0.9.1 + progress==1.5 + pyparsing==2.4.7 -- Gitee From 7f72c8a5df46d53d50f26a26c3da265b9a94e9dd Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Tue, 15 Dec 2020 04:58:53 +0800 Subject: [PATCH 2/2] [patch tracking] 20201215045849754838 - update spec file --- python-pip.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/python-pip.spec b/python-pip.spec index 3d035b5..045ffc4 100644 --- a/python-pip.spec +++ b/python-pip.spec @@ -6,7 +6,7 @@ pip is the package installer for Python. You can use pip to install packages fro %global bashcompdir %(b=$(pkg-config --variable=completionsdir bash-completion 2>/dev/null); echo ${b:-%{_sysconfdir}/bash_completion.d}) Name: python-%{srcname} Version: 20.2.2 -Release: 3 +Release: 4 Summary: A tool for installing and managing Python packages License: MIT and Python and ASL 2.0 and BSD and ISC and LGPLv2 and MPLv2.0 and (ASL 2.0 or BSD) URL: http://www.pip-installer.org @@ -16,6 +16,7 @@ Patch1: allow-stripping-given-prefix-from-wheel-RECORD-files.patch Patch2: emit-a-warning-when-running-with-root-privileges.patch Patch3: remove-existing-dist-only-if-path-conflicts.patch Patch6000: dummy-certifi.patch +Patch6001: cfa013b91726dfcbadbff86b29c13df7eeef4d43.patch Source10: pip-allow-older-versions.patch %description %{_description} @@ -112,6 +113,9 @@ install -p dist/%{python_wheelname} -t %{buildroot}%{python_wheeldir} %{python_wheeldir}/%{python_wheelname} %changelog +* 20201215045849754838 patch-tracking 20.2.2-4 +- append patch file of upstream repository from to + * Wed Nov 4 2020 wangjie -20.2.2-3 - Type:NA - ID:NA @@ -161,4 +165,4 @@ install -p dist/%{python_wheelname} -t %{buildroot}%{python_wheeldir} - DESC: Synchronize a patch * Mon Sep 23 2019 openEuler Buildteam - 18.0-6 -- Package init +- Package init \ No newline at end of file -- Gitee