From c89511ef0f136034f0a3f296020cf4964b17b5c9 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Tue, 15 Dec 2020 23:58:52 +0800 Subject: [PATCH 1/2] [patch tracking] 20201215235849753546 - https://github.com/pypa/pip/commit/7abd8bd69ef0ceac1ae796c67ef0c5467a19a5f9 --- ...8bd69ef0ceac1ae796c67ef0c5467a19a5f9.patch | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 7abd8bd69ef0ceac1ae796c67ef0c5467a19a5f9.patch diff --git a/7abd8bd69ef0ceac1ae796c67ef0c5467a19a5f9.patch b/7abd8bd69ef0ceac1ae796c67ef0c5467a19a5f9.patch new file mode 100644 index 0000000..aaab6d3 --- /dev/null +++ b/7abd8bd69ef0ceac1ae796c67ef0c5467a19a5f9.patch @@ -0,0 +1,27 @@ +diff --git a/NEWS.rst b/NEWS.rst +index 80ad25ada4..a082cddf31 100644 +--- a/NEWS.rst ++++ b/NEWS.rst +@@ -9,6 +9,15 @@ + + .. towncrier release notes start + ++20.3.3 (2020-12-15) ++=================== ++ ++Bug Fixes ++--------- ++ ++- Revert "Skip candidate not providing valid metadata", as that caused pip to be overeager about downloading from the package index. (`#9264 `_) ++ ++ + 20.3.2 (2020-12-15) + =================== + +diff --git a/news/9264.bugfix.rst b/news/9264.bugfix.rst +deleted file mode 100644 +index 0178ab197f..0000000000 +--- a/news/9264.bugfix.rst ++++ /dev/null +@@ -1 +0,0 @@ +-Revert "Skip candidate not providing valid metadata", as that caused pip to be overeager about downloading from the package index. -- Gitee From 2787b3dfe00a3cd587d845e124c16f9d51b3b185 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Tue, 15 Dec 2020 23:58:53 +0800 Subject: [PATCH 2/2] [patch tracking] 20201215235849753546 - 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..ffa349f 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: 7abd8bd69ef0ceac1ae796c67ef0c5467a19a5f9.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 +* 20201215235849753546 patch-tracking 20.2.2-4 +- append patch file of upstream repository from <7abd8bd69ef0ceac1ae796c67ef0c5467a19a5f9> to <7abd8bd69ef0ceac1ae796c67ef0c5467a19a5f9> + * 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