From 73581d19e4997e34faca72029d3274ead0d79338 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Fri, 30 Oct 2020 18:30:11 +0800 Subject: [PATCH 1/2] [patch tracking] 20201030183007637746 - https://github.com/pypa/pip/commit/58d8c2dcc7e5aa8c4becdd6f568c5b4fe11b3a31 --- 58d8c2dcc7e5aa8c4becdd6f568c5b4fe11b3a31.patch | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 58d8c2dcc7e5aa8c4becdd6f568c5b4fe11b3a31.patch diff --git a/58d8c2dcc7e5aa8c4becdd6f568c5b4fe11b3a31.patch b/58d8c2dcc7e5aa8c4becdd6f568c5b4fe11b3a31.patch new file mode 100644 index 0000000..72131c8 --- /dev/null +++ b/58d8c2dcc7e5aa8c4becdd6f568c5b4fe11b3a31.patch @@ -0,0 +1,16 @@ +diff --git a/.travis.yml b/.travis.yml +index 7c41f5fbcc..c0c7e70393 100644 +--- a/.travis.yml ++++ b/.travis.yml +@@ -1,7 +1,7 @@ + language: python + cache: pip + dist: xenial +-python: 3.8 ++python: 3.9 + addons: + apt: + packages: +diff --git a/news/5661d979-1abd-4c9a-a7bf-45701b33dd6c.trivial.rst b/news/5661d979-1abd-4c9a-a7bf-45701b33dd6c.trivial.rst +new file mode 100644 +index 0000000000..e69de29bb2 -- Gitee From 8b2d5ba43170c86b5bb069e34ffd8e85978ac953 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Fri, 30 Oct 2020 18:30:12 +0800 Subject: [PATCH 2/2] [patch tracking] 20201030183007637746 - 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 05f810a..dd77466 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,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: 58d8c2dcc7e5aa8c4becdd6f568c5b4fe11b3a31.patch Source10: pip-allow-older-versions.patch %description %{_description} @@ -140,6 +141,9 @@ install -p dist/%{python_wheelname} -t %{buildroot}%{python_wheeldir} %{python_wheeldir}/%{python_wheelname} %changelog +* 20201030183007637746 patch-tracking 20.2.2-3 +- append patch file of upstream repository from <58d8c2dcc7e5aa8c4becdd6f568c5b4fe11b3a31> to <58d8c2dcc7e5aa8c4becdd6f568c5b4fe11b3a31> + * Tue Sep 1 2020 wenzhanli - 20.2.2-2 - add pip-allow-older-versions.patch @@ -183,4 +187,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