From d6eb17528e5dec3375172799c7bcfc275bb93c0a Mon Sep 17 00:00:00 2001
From: openeuler-ci-bot <80474298@qq.com>
Date: Sat, 12 Dec 2020 05:58:53 +0800
Subject: [PATCH 1/2] [patch tracking] 20201212055849756634 -
 https://github.com/pypa/pip/commit/0aee48ff1fbc0d60cd973c6929d9afb2bc32b839

---
 ...48ff1fbc0d60cd973c6929d9afb2bc32b839.patch | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 0aee48ff1fbc0d60cd973c6929d9afb2bc32b839.patch

diff --git a/0aee48ff1fbc0d60cd973c6929d9afb2bc32b839.patch b/0aee48ff1fbc0d60cd973c6929d9afb2bc32b839.patch
new file mode 100644
index 0000000..75332a5
--- /dev/null
+++ b/0aee48ff1fbc0d60cd973c6929d9afb2bc32b839.patch
@@ -0,0 +1,34 @@
+diff --git a/news/9117.bugfix.rst b/news/9117.bugfix.rst
+new file mode 100644
+index 0000000000..7991dac7d0
+--- /dev/null
++++ b/news/9117.bugfix.rst
+@@ -0,0 +1,2 @@
++New resolver: The "Requirement already satisfied" log is not printed only once
++for each package during resolution.
+diff --git a/src/pip/_internal/resolution/resolvelib/factory.py b/src/pip/_internal/resolution/resolvelib/factory.py
+index c723d343bf..b4c7bf1135 100644
+--- a/src/pip/_internal/resolution/resolvelib/factory.py
++++ b/src/pip/_internal/resolution/resolvelib/factory.py
+@@ -96,6 +96,8 @@ def __init__(
+ 
+         self._link_candidate_cache = {}  # type: Cache[LinkCandidate]
+         self._editable_candidate_cache = {}  # type: Cache[EditableCandidate]
++        self._installed_candidate_cache = {
++        }  # type: Dict[str, AlreadyInstalledCandidate]
+ 
+         if not ignore_installed:
+             self._installed_dists = {
+@@ -117,7 +119,11 @@ def _make_candidate_from_dist(
+         template,  # type: InstallRequirement
+     ):
+         # type: (...) -> Candidate
+-        base = AlreadyInstalledCandidate(dist, template, factory=self)
++        try:
++            base = self._installed_candidate_cache[dist.key]
++        except KeyError:
++            base = AlreadyInstalledCandidate(dist, template, factory=self)
++            self._installed_candidate_cache[dist.key] = base
+         if extras:
+             return ExtrasCandidate(base, extras)
+         return base
-- 
Gitee


From f7d60daf9ffc97a7770e2b5dd1cb4e25f6a44b60 Mon Sep 17 00:00:00 2001
From: openeuler-ci-bot <80474298@qq.com>
Date: Sat, 12 Dec 2020 05:58:54 +0800
Subject: [PATCH 2/2] [patch tracking] 20201212055849756634 - 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..fbedc81 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: 0aee48ff1fbc0d60cd973c6929d9afb2bc32b839.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
+* 20201212055849756634 patch-tracking 20.2.2-4
+- append patch file of upstream repository from <0aee48ff1fbc0d60cd973c6929d9afb2bc32b839> to <0aee48ff1fbc0d60cd973c6929d9afb2bc32b839>
+
 * Wed Nov 4 2020 wangjie<wangjie294@huawei.com> -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 <buildteam@openeuler.org> - 18.0-6
-- Package init
+- Package init
\ No newline at end of file
-- 
Gitee