From b4bcba866f5665362f1c9321943690b9e27fb86c Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Tue, 10 Nov 2020 21:30:13 +0800 Subject: [PATCH 1/2] [patch tracking] 20201110213007639671 - https://github.com/pypa/pip/commit/a88c84dfae9781921cec936ec0f20b89aa030729 --- ...84dfae9781921cec936ec0f20b89aa030729.patch | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 a88c84dfae9781921cec936ec0f20b89aa030729.patch diff --git a/a88c84dfae9781921cec936ec0f20b89aa030729.patch b/a88c84dfae9781921cec936ec0f20b89aa030729.patch new file mode 100644 index 0000000..255dcca --- /dev/null +++ b/a88c84dfae9781921cec936ec0f20b89aa030729.patch @@ -0,0 +1,37 @@ +diff --git a/src/pip/_internal/resolution/resolvelib/reporter.py b/src/pip/_internal/resolution/resolvelib/reporter.py +index 07ce399acc..376265c2d0 100644 +--- a/src/pip/_internal/resolution/resolvelib/reporter.py ++++ b/src/pip/_internal/resolution/resolvelib/reporter.py +@@ -22,21 +22,21 @@ def __init__(self): + + self._messages_at_backtrack = { + 1: ( +- "pip is looking at multiple versions of this package to determine " +- "which version is compatible with other requirements. " +- "This could take a while." ++ "pip is looking at multiple versions of this package to " ++ "determine which version is compatible with other " ++ "requirements. This could take a while." + ), + 8: ( +- "pip is looking at multiple versions of this package to determine " +- "which version is compatible with other requirements. " +- "This could take a while." ++ "pip is looking at multiple versions of this package to " ++ "determine which version is compatible with other " ++ "requirements. This could take a while." + ), + 13: ( +- "This is taking longer than usual. You might need to provide the " +- "dependency resolver with stricter constraints to reduce runtime." +- "If you want to abort this run, you can press Ctrl + C to do so." +- "To improve how pip performs, tell us what happened here: " +- "https://pip.pypa.io/surveys/backtracking" ++ "This is taking longer than usual. You might need to provide " ++ "the dependency resolver with stricter constraints to reduce " ++ "runtime. If you want to abort this run, you can press " ++ "Ctrl + C to do so. To improve how pip performs, tell us what " ++ "happened here: https://pip.pypa.io/surveys/backtracking" + ) + } + -- Gitee From d39c127084d5ad988a4e68bf285ebb1b62436a9e Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Tue, 10 Nov 2020 21:30:13 +0800 Subject: [PATCH 2/2] [patch tracking] 20201110213007639671 - 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..f6fe2a9 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: a88c84dfae9781921cec936ec0f20b89aa030729.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 +* 20201110213007639671 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