From 72637ea2ac2188425f2b6abbcfcaf6f1ebab556b Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Sun, 15 Nov 2020 02:30:13 +0800 Subject: [PATCH 1/2] [patch tracking] 20201115023007641064 - https://github.com/pypa/pip/commit/c09549caff5b8ddace8769c41c3b6a86e453867e --- ...49caff5b8ddace8769c41c3b6a86e453867e.patch | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 c09549caff5b8ddace8769c41c3b6a86e453867e.patch diff --git a/c09549caff5b8ddace8769c41c3b6a86e453867e.patch b/c09549caff5b8ddace8769c41c3b6a86e453867e.patch new file mode 100644 index 0000000..26a1ffc --- /dev/null +++ b/c09549caff5b8ddace8769c41c3b6a86e453867e.patch @@ -0,0 +1,34 @@ +diff --git a/news/9101.bugfix.rst b/news/9101.bugfix.rst +new file mode 100644 +index 0000000000..441f2a9313 +--- /dev/null ++++ b/news/9101.bugfix.rst +@@ -0,0 +1 @@ ++New resolver: Show each requirement in the conflict error message only once to reduce cluttering. +diff --git a/src/pip/_internal/resolution/resolvelib/factory.py b/src/pip/_internal/resolution/resolvelib/factory.py +index 8e1a68d168..c65cb7f76f 100644 +--- a/src/pip/_internal/resolution/resolvelib/factory.py ++++ b/src/pip/_internal/resolution/resolvelib/factory.py +@@ -406,19 +406,19 @@ def describe_trigger(parent): + # type: (Candidate) -> str + ireq = parent.get_install_requirement() + if not ireq or not ireq.comes_from: +- return "{} {}".format(parent.name, parent.version) ++ return "{}=={}".format(parent.name, parent.version) + if isinstance(ireq.comes_from, InstallRequirement): + return str(ireq.comes_from.name) + return str(ireq.comes_from) + +- triggers = [] ++ triggers = set() + for req, parent in e.causes: + if parent is None: + # This is a root requirement, so we can report it directly + trigger = req.format_for_error() + else: + trigger = describe_trigger(parent) +- triggers.append(trigger) ++ triggers.add(trigger) + + if triggers: + info = text_join(sorted(triggers)) -- Gitee From ff02ada0d986e896c5bb5103748558aa9072412c Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Sun, 15 Nov 2020 02:30:14 +0800 Subject: [PATCH 2/2] [patch tracking] 20201115023007641064 - 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..f3a8e3a 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: c09549caff5b8ddace8769c41c3b6a86e453867e.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 +* 20201115023007641064 patch-tracking 20.2.2-4 +- append patch file of upstream repository from to + * 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