From 6f4120ce66629d3342400659e421e49a26031101 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Sat, 31 Oct 2020 17:30:16 +0800 Subject: [PATCH 1/4] [patch tracking] 20201031173007637825 - https://github.com/pypa/pip/commit/24621f7336d89c8fb7b3d3b86c8b4f40843df8c6 --- 24621f7336d89c8fb7b3d3b86c8b4f40843df8c6.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 24621f7336d89c8fb7b3d3b86c8b4f40843df8c6.patch diff --git a/24621f7336d89c8fb7b3d3b86c8b4f40843df8c6.patch b/24621f7336d89c8fb7b3d3b86c8b4f40843df8c6.patch new file mode 100644 index 0000000..3ef12af --- /dev/null +++ b/24621f7336d89c8fb7b3d3b86c8b4f40843df8c6.patch @@ -0,0 +1,13 @@ +diff --git a/src/pip/_internal/resolution/resolvelib/factory.py b/src/pip/_internal/resolution/resolvelib/factory.py +index 0ac8d1af9d..8e1a68d168 100644 +--- a/src/pip/_internal/resolution/resolvelib/factory.py ++++ b/src/pip/_internal/resolution/resolvelib/factory.py +@@ -421,7 +421,7 @@ def describe_trigger(parent): + triggers.append(trigger) + + if triggers: +- info = text_join(triggers) ++ info = text_join(sorted(triggers)) + else: + info = "the requested packages" + -- Gitee From 3b4d659cfbc691ff906a76f6a2924ecb0c2e709f Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Sat, 31 Oct 2020 17:30:16 +0800 Subject: [PATCH 2/4] [patch tracking] 20201031173007637825 - https://github.com/pypa/pip/commit/90dac0d829f0b2b4211e0f4af152c2bb34a1fead --- ...c0d829f0b2b4211e0f4af152c2bb34a1fead.patch | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 90dac0d829f0b2b4211e0f4af152c2bb34a1fead.patch diff --git a/90dac0d829f0b2b4211e0f4af152c2bb34a1fead.patch b/90dac0d829f0b2b4211e0f4af152c2bb34a1fead.patch new file mode 100644 index 0000000..b849d30 --- /dev/null +++ b/90dac0d829f0b2b4211e0f4af152c2bb34a1fead.patch @@ -0,0 +1,46 @@ +diff --git a/src/pip/_internal/cli/base_command.py b/src/pip/_internal/cli/base_command.py +index f4f86e0e0d..86f1733a57 100644 +--- a/src/pip/_internal/cli/base_command.py ++++ b/src/pip/_internal/cli/base_command.py +@@ -10,6 +10,8 @@ + import sys + import traceback + ++from pip._vendor.six import PY2 ++ + from pip._internal.cli import cmdoptions + from pip._internal.cli.command_context import CommandContextMixIn + from pip._internal.cli.parser import ConfigOptionParser, UpdatingDefaultsHelpFormatter +@@ -204,6 +206,13 @@ def _main(self, args): + ) + sys.exit(ERROR) + ++ if '2020-resolver' in options.features_enabled and not PY2: ++ logger.warning( ++ "--use-feature=2020-resolver no longer has any effect, " ++ "since it is now the default dependency resolver in pip. " ++ "This will become an error in pip 21.0." ++ ) ++ + try: + status = self.run(options, args) + assert isinstance(status, int) +diff --git a/src/pip/_internal/cli/req_command.py b/src/pip/_internal/cli/req_command.py +index f2d1c605b5..008066ab1c 100644 +--- a/src/pip/_internal/cli/req_command.py ++++ b/src/pip/_internal/cli/req_command.py +@@ -208,14 +208,6 @@ def determine_resolver_variant(options): + else: + return "legacy" + +- # Warn about the options that are gonna be removed. +- if '2020-resolver' in options.features_enabled: +- logger.warning( +- "--use-feature=2020-resolver no longer has any effect, " +- "since it is now the default dependency resolver in pip. " +- "This will become an error in pip 21.0." +- ) +- + if "legacy-resolver" in options.deprecated_features_enabled: + return "legacy" + -- Gitee From 0e58df455de369ece99d889d6e2d16a7c9318520 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Sat, 31 Oct 2020 17:30:17 +0800 Subject: [PATCH 3/4] [patch tracking] 20201031173007637825 - https://github.com/pypa/pip/commit/333c9e524819df6b5bf2eec25a86bef1c2b6d96a --- ...9e524819df6b5bf2eec25a86bef1c2b6d96a.patch | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 333c9e524819df6b5bf2eec25a86bef1c2b6d96a.patch diff --git a/333c9e524819df6b5bf2eec25a86bef1c2b6d96a.patch b/333c9e524819df6b5bf2eec25a86bef1c2b6d96a.patch new file mode 100644 index 0000000..1d8c622 --- /dev/null +++ b/333c9e524819df6b5bf2eec25a86bef1c2b6d96a.patch @@ -0,0 +1,21 @@ +diff --git a/news/8327.vendor.rst b/news/8327.vendor.rst +new file mode 100644 +index 0000000000..7b4536ae2f +--- /dev/null ++++ b/news/8327.vendor.rst +@@ -0,0 +1,2 @@ ++Fix devendoring instructions to explicitly state that ``vendor.txt`` should not be removed. ++It is mandatory for ``pip debug`` command. +diff --git a/src/pip/_vendor/README.rst b/src/pip/_vendor/README.rst +index 1fd0d43944..6699d72c2f 100644 +--- a/src/pip/_vendor/README.rst ++++ b/src/pip/_vendor/README.rst +@@ -132,7 +132,7 @@ semi-supported method (that we don't test in our CI) and requires a bit of + extra work on your end in order to solve the problems described above. + + 1. Delete everything in ``pip/_vendor/`` **except** for +- ``pip/_vendor/__init__.py``. ++ ``pip/_vendor/__init__.py`` and ``pip/_vendor/vendor.txt``. + 2. Generate wheels for each of pip's dependencies (and any of their + dependencies) using your patched copies of these libraries. These must be + placed somewhere on the filesystem that pip can access (``pip/_vendor`` is -- Gitee From 9099c2e0addbcdadf07d8860d8a7ddb2384f9488 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Sat, 31 Oct 2020 17:30:18 +0800 Subject: [PATCH 4/4] [patch tracking] 20201031173007637825 - update spec file --- python-pip.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/python-pip.spec b/python-pip.spec index 05f810a..06fd594 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,9 @@ 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: 24621f7336d89c8fb7b3d3b86c8b4f40843df8c6.patch +Patch6002: 90dac0d829f0b2b4211e0f4af152c2bb34a1fead.patch +Patch6003: 333c9e524819df6b5bf2eec25a86bef1c2b6d96a.patch Source10: pip-allow-older-versions.patch %description %{_description} @@ -140,6 +143,9 @@ install -p dist/%{python_wheelname} -t %{buildroot}%{python_wheeldir} %{python_wheeldir}/%{python_wheelname} %changelog +* 20201031173007637825 patch-tracking 20.2.2-3 +- append patch file of upstream repository from <24621f7336d89c8fb7b3d3b86c8b4f40843df8c6> to <333c9e524819df6b5bf2eec25a86bef1c2b6d96a> + * Tue Sep 1 2020 wenzhanli - 20.2.2-2 - add pip-allow-older-versions.patch @@ -183,4 +189,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