From 1d0908a2c6b867f94104b45419b6f556b4687cbf Mon Sep 17 00:00:00 2001
From: openeuler-ci-bot <80474298@qq.com>
Date: Sat, 14 Nov 2020 20:30:11 +0800
Subject: [PATCH 1/2] [patch tracking] 20201114203007638671 -
 https://github.com/pypa/pip/commit/7aef258b28e0d4f44fb8c50ad07c7ddfec2fcf05

---
 ...258b28e0d4f44fb8c50ad07c7ddfec2fcf05.patch | 55 +++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 7aef258b28e0d4f44fb8c50ad07c7ddfec2fcf05.patch

diff --git a/7aef258b28e0d4f44fb8c50ad07c7ddfec2fcf05.patch b/7aef258b28e0d4f44fb8c50ad07c7ddfec2fcf05.patch
new file mode 100644
index 0000000..adc89df
--- /dev/null
+++ b/7aef258b28e0d4f44fb8c50ad07c7ddfec2fcf05.patch
@@ -0,0 +1,55 @@
+diff --git a/news/9133.removal.rst b/news/9133.removal.rst
+new file mode 100644
+index 0000000000..876e89b13e
+--- /dev/null
++++ b/news/9133.removal.rst
+@@ -0,0 +1 @@
++Remove --unstable-feature flag as it has been deprecated.
+diff --git a/src/pip/_internal/cli/base_command.py b/src/pip/_internal/cli/base_command.py
+index 86f1733a57..c1522d6391 100644
+--- a/src/pip/_internal/cli/base_command.py
++++ b/src/pip/_internal/cli/base_command.py
+@@ -199,13 +199,6 @@ def _main(self, args):
+                 )
+                 options.cache_dir = None
+ 
+-        if 'resolver' in options.unstable_features:
+-            logger.critical(
+-                "--unstable-feature=resolver is no longer supported, and "
+-                "has been replaced with --use-feature=2020-resolver instead."
+-            )
+-            sys.exit(ERROR)
+-
+         if '2020-resolver' in options.features_enabled and not PY2:
+             logger.warning(
+                 "--use-feature=2020-resolver no longer has any effect, "
+diff --git a/src/pip/_internal/cli/cmdoptions.py b/src/pip/_internal/cli/cmdoptions.py
+index 6a6634fb8b..07d612a6f5 100644
+--- a/src/pip/_internal/cli/cmdoptions.py
++++ b/src/pip/_internal/cli/cmdoptions.py
+@@ -895,17 +895,6 @@ def check_list_path_option(options):
+ )  # type: Callable[..., Option]
+ 
+ 
+-unstable_feature = partial(
+-    Option,
+-    '--unstable-feature',
+-    dest='unstable_features',
+-    metavar='feature',
+-    action='append',
+-    default=[],
+-    choices=['resolver'],
+-    help=SUPPRESS_HELP,  # TODO: drop this in pip 20.3
+-)  # type: Callable[..., Option]
+-
+ use_new_feature = partial(
+     Option,
+     '--use-feature',
+@@ -958,7 +947,6 @@ def check_list_path_option(options):
+         disable_pip_version_check,
+         no_color,
+         no_python_version_warning,
+-        unstable_feature,
+         use_new_feature,
+         use_deprecated_feature,
+     ]
-- 
Gitee


From 73748f632b0ba19f2fc76f5ca80cd0251d266e92 Mon Sep 17 00:00:00 2001
From: openeuler-ci-bot <80474298@qq.com>
Date: Sat, 14 Nov 2020 20:30:12 +0800
Subject: [PATCH 2/2] [patch tracking] 20201114203007638671 - 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..99eacce 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: 7aef258b28e0d4f44fb8c50ad07c7ddfec2fcf05.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
+* 20201114203007638671 patch-tracking 20.2.2-4
+- append patch file of upstream repository from <7aef258b28e0d4f44fb8c50ad07c7ddfec2fcf05> to <7aef258b28e0d4f44fb8c50ad07c7ddfec2fcf05>
+
 * 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