From 5b73ebde6bdb1b658a98302537d2f13df88d513e Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Mon, 30 Nov 2020 05:58:57 +0800 Subject: [PATCH 1/3] [patch tracking] 20201130055849755450 - https://github.com/pypa/pip/commit/502b4b1b84550822bc7259a8ab00bd5c71517c1e --- 502b4b1b84550822bc7259a8ab00bd5c71517c1e.patch | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 502b4b1b84550822bc7259a8ab00bd5c71517c1e.patch diff --git a/502b4b1b84550822bc7259a8ab00bd5c71517c1e.patch b/502b4b1b84550822bc7259a8ab00bd5c71517c1e.patch new file mode 100644 index 0000000..5cc4d29 --- /dev/null +++ b/502b4b1b84550822bc7259a8ab00bd5c71517c1e.patch @@ -0,0 +1,14 @@ +diff --git a/docs/html/news.rst b/docs/html/news.rst +index c2b835a0ff..137cddf36a 100644 +--- a/docs/html/news.rst ++++ b/docs/html/news.rst +@@ -2,4 +2,9 @@ + Changelog + ========= + ++.. attention:: ++ ++ Major and minor releases of pip also include changes listed within ++ prior beta releases. ++ + .. include:: ../../NEWS.rst -- Gitee From f01193d397922a252d1527e90642bfb270332d3f Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Mon, 30 Nov 2020 05:58:57 +0800 Subject: [PATCH 2/3] [patch tracking] 20201130055849755450 - https://github.com/pypa/pip/commit/a498c131585ad3ee4febbeecd5f50bb1dd47ffc2 --- ...c131585ad3ee4febbeecd5f50bb1dd47ffc2.patch | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 a498c131585ad3ee4febbeecd5f50bb1dd47ffc2.patch diff --git a/a498c131585ad3ee4febbeecd5f50bb1dd47ffc2.patch b/a498c131585ad3ee4febbeecd5f50bb1dd47ffc2.patch new file mode 100644 index 0000000..f907811 --- /dev/null +++ b/a498c131585ad3ee4febbeecd5f50bb1dd47ffc2.patch @@ -0,0 +1,30 @@ +diff --git a/docs/html/user_guide.rst b/docs/html/user_guide.rst +index 9c30dca5ae..e3aa5dc33d 100644 +--- a/docs/html/user_guide.rst ++++ b/docs/html/user_guide.rst +@@ -1747,10 +1747,21 @@ How to upgrade and migrate + deliver part of your functionality, please test your integration + with pip 20.3. + +-4. **Temporarily use the old resolver when necessary.** If you run +- into resolution errors and need a workaround while you're fixing +- their root causes, you can choose the old resolver behavior +- using the flag ``--use-deprecated=legacy-resolver``. ++4. **Troubleshoot and try these workarounds if necessary.** ++ ++ - If pip is taking longer to install packages, read ++ :ref:`Dependency resolution backtracking` for ways to reduce the ++ time pip spends backtracking due to dependency conflicts. ++ - If you don't want pip to actually resolve dependencies, use the ++ ``--no-deps`` option. This is useful when you have a set of package ++ versions that work together in reality, even though their metadata says ++ that they conflict. For guidance on a long-term fix, read ++ :ref:`Fixing conflicting dependencies`. ++ - If you run into resolution errors and need a workaround while you're ++ fixing their root causes, you can choose the old resolver behavior using ++ the flag ``--use-deprecated=legacy-resolver``. This will work until we ++ release pip 21.0 (see ++ :ref:`Deprecation timeline for 2020 resolver changes`). + + 5. **Please report bugs** through the `resolver testing survey`_. + -- Gitee From f9b07e9426af86fed43fb8cfb4f11d0ac2f356f7 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Mon, 30 Nov 2020 05:58:58 +0800 Subject: [PATCH 3/3] [patch tracking] 20201130055849755450 - update spec file --- python-pip.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/python-pip.spec b/python-pip.spec index 3d035b5..ab7dd86 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,8 @@ 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: 502b4b1b84550822bc7259a8ab00bd5c71517c1e.patch +Patch6002: a498c131585ad3ee4febbeecd5f50bb1dd47ffc2.patch Source10: pip-allow-older-versions.patch %description %{_description} @@ -112,6 +114,9 @@ install -p dist/%{python_wheelname} -t %{buildroot}%{python_wheeldir} %{python_wheeldir}/%{python_wheelname} %changelog +* 20201130055849755450 patch-tracking 20.2.2-4 +- append patch file of upstream repository from <502b4b1b84550822bc7259a8ab00bd5c71517c1e> to + * Wed Nov 4 2020 wangjie -20.2.2-3 - Type:NA - ID:NA @@ -161,4 +166,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