From dadc7536656c194108740ce9e2a08d188bb2080d Mon Sep 17 00:00:00 2001
From: openeuler-ci-bot <80474298@qq.com>
Date: Wed, 28 Oct 2020 00:30:10 +0800
Subject: [PATCH 1/2] [patch tracking] 20201028003007637706 -
 https://github.com/pypa/pip/commit/f2852cd77555ddde1caca68fd8cbb0ff3e3177e7

---
 ...2cd77555ddde1caca68fd8cbb0ff3e3177e7.patch | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 f2852cd77555ddde1caca68fd8cbb0ff3e3177e7.patch

diff --git a/f2852cd77555ddde1caca68fd8cbb0ff3e3177e7.patch b/f2852cd77555ddde1caca68fd8cbb0ff3e3177e7.patch
new file mode 100644
index 0000000..a54dd61
--- /dev/null
+++ b/f2852cd77555ddde1caca68fd8cbb0ff3e3177e7.patch
@@ -0,0 +1,35 @@
+diff --git a/tests/functional/test_search.py b/tests/functional/test_search.py
+index 1892e26b5b..875e2e5d6d 100644
+--- a/tests/functional/test_search.py
++++ b/tests/functional/test_search.py
+@@ -6,12 +6,6 @@
+ from pip._internal.cli.status_codes import NO_MATCHES_FOUND, SUCCESS
+ from pip._internal.commands import create_command
+ from pip._internal.commands.search import highest_version, print_results, transform_hits
+-from tests.lib import pyversion
+-
+-if pyversion >= '3':
+-    VERBOSE_FALSE = False
+-else:
+-    VERBOSE_FALSE = 0
+ 
+ 
+ def test_version_compare():
+diff --git a/tests/unit/test_vcs.py b/tests/unit/test_vcs.py
+index b6ed86b629..d36f9f01de 100644
+--- a/tests/unit/test_vcs.py
++++ b/tests/unit/test_vcs.py
+@@ -13,12 +13,7 @@
+ from pip._internal.vcs.mercurial import Mercurial
+ from pip._internal.vcs.subversion import Subversion
+ from pip._internal.vcs.versioncontrol import RevOptions, VersionControl
+-from tests.lib import is_svn_installed, need_svn, pyversion
+-
+-if pyversion >= '3':
+-    VERBOSE_FALSE = False
+-else:
+-    VERBOSE_FALSE = 0
++from tests.lib import is_svn_installed, need_svn
+ 
+ 
+ @pytest.mark.skipif(
-- 
Gitee


From 842b23e25d7d31fcf3ba3fa6a89d0742fea6dc05 Mon Sep 17 00:00:00 2001
From: openeuler-ci-bot <80474298@qq.com>
Date: Wed, 28 Oct 2020 00:30:10 +0800
Subject: [PATCH 2/2] [patch tracking] 20201028003007637706 - 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 05f810a..781739c 100644
--- a/python-pip.spec
+++ b/python-pip.spec
@@ -7,7 +7,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:        2
+Release:        3
 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
@@ -17,6 +17,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: f2852cd77555ddde1caca68fd8cbb0ff3e3177e7.patch
 Source10: 	pip-allow-older-versions.patch
 
 %description %{_description}
@@ -140,6 +141,9 @@ install -p dist/%{python_wheelname} -t %{buildroot}%{python_wheeldir}
 %{python_wheeldir}/%{python_wheelname}
 
 %changelog
+* 20201028003007637706 patch-tracking 20.2.2-3
+- append patch file of upstream repository from <f2852cd77555ddde1caca68fd8cbb0ff3e3177e7> to <f2852cd77555ddde1caca68fd8cbb0ff3e3177e7>
+
 * Tue Sep 1 2020 wenzhanli<wenzhanli2@huawei.com> - 20.2.2-2
 - add pip-allow-older-versions.patch
 
@@ -183,4 +187,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