From 05eedb8e57889862207c4639c949d0e1e5f98879 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Fri, 20 Nov 2020 20:30:11 +0800 Subject: [PATCH 1/2] [patch tracking] 20201120203007637843 - https://github.com/pypa/pip/commit/72f3d7b068b38fe66506371e50db0011c2f94224 --- ...d7b068b38fe66506371e50db0011c2f94224.patch | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 72f3d7b068b38fe66506371e50db0011c2f94224.patch diff --git a/72f3d7b068b38fe66506371e50db0011c2f94224.patch b/72f3d7b068b38fe66506371e50db0011c2f94224.patch new file mode 100644 index 0000000..cc120e5 --- /dev/null +++ b/72f3d7b068b38fe66506371e50db0011c2f94224.patch @@ -0,0 +1,28 @@ +diff --git a/src/pip/_internal/resolution/resolvelib/reporter.py b/src/pip/_internal/resolution/resolvelib/reporter.py +index 376265c2d0..d0ef3fadc6 100644 +--- a/src/pip/_internal/resolution/resolvelib/reporter.py ++++ b/src/pip/_internal/resolution/resolvelib/reporter.py +@@ -22,12 +22,12 @@ def __init__(self): + + self._messages_at_backtrack = { + 1: ( +- "pip is looking at multiple versions of this package to " ++ "pip is looking at multiple versions of {package_name} to " + "determine which version is compatible with other " + "requirements. This could take a while." + ), + 8: ( +- "pip is looking at multiple versions of this package to " ++ "pip is looking at multiple versions of {package_name} to " + "determine which version is compatible with other " + "requirements. This could take a while." + ), +@@ -49,7 +49,7 @@ def backtracking(self, candidate): + return + + message = self._messages_at_backtrack[count] +- logger.info("INFO: %s", message) ++ logger.info("INFO: %s", message.format(package_name=candidate.name)) + + + class PipDebuggingReporter(BaseReporter): -- Gitee From 981bb956ffea86d4da819ddc167ce1cf4489633e Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Fri, 20 Nov 2020 20:30:12 +0800 Subject: [PATCH 2/2] [patch tracking] 20201120203007637843 - 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..89481da 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: 72f3d7b068b38fe66506371e50db0011c2f94224.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 +* 20201120203007637843 patch-tracking 20.2.2-4 +- append patch file of upstream repository from <72f3d7b068b38fe66506371e50db0011c2f94224> to <72f3d7b068b38fe66506371e50db0011c2f94224> + * 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