From 75b5655a366bf2f2482780f78b878bb9b7ffe6c6 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Mon, 26 Oct 2020 21:30:11 +0800 Subject: [PATCH 1/2] [patch tracking] 20201026213007637562 - https://github.com/pypa/pip/commit/ea74bd3d9085234601a0a6199b2ad65c6b6a002f --- ...bd3d9085234601a0a6199b2ad65c6b6a002f.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 ea74bd3d9085234601a0a6199b2ad65c6b6a002f.patch diff --git a/ea74bd3d9085234601a0a6199b2ad65c6b6a002f.patch b/ea74bd3d9085234601a0a6199b2ad65c6b6a002f.patch new file mode 100644 index 0000000..5550e89 --- /dev/null +++ b/ea74bd3d9085234601a0a6199b2ad65c6b6a002f.patch @@ -0,0 +1,38 @@ +diff --git a/docs/html/development/contributing.rst b/docs/html/development/contributing.rst +index 3d2d5ead02..3cdbb309d4 100644 +--- a/docs/html/development/contributing.rst ++++ b/docs/html/development/contributing.rst +@@ -109,22 +109,22 @@ A trivial change is anything that does not warrant an entry in the news file. + Some examples are: Code refactors that don't change anything as far as the + public is concerned, typo fixes, white space modification, etc. To mark a PR + as trivial a contributor simply needs to add a randomly named, empty file to +-the ``news/`` directory with the extension of ``.trivial``. If you are on a ++the ``news/`` directory with the extension of ``.trivial.rst``. If you are on a + POSIX like operating system, one can be added by running +-``touch news/$(uuidgen).trivial``. On Windows, the same result can be achieved +-in Powershell using ``New-Item "news/$([guid]::NewGuid()).trivial"``. Core +-committers may also add a "trivial" label to the PR which will accomplish the +-same thing. ++``touch news/$(uuidgen).trivial.rst``. On Windows, the same result can be ++achieved in Powershell using ``New-Item "news/$([guid]::NewGuid()).trivial"``. ++Core committers may also add a "trivial" label to the PR which will accomplish ++the same thing. + + Upgrading, removing, or adding a new vendored library gets a special mention +-using a ``news/.vendor`` file. This is in addition to any features, ++using a ``news/.vendor.rst`` file. This is in addition to any features, + bugfixes, or other kinds of news that pulling in this library may have. This + uses the library name as the key so that updating the same library twice doesn't + produce two news file entries. + + Changes to the processes, policies, or other non code related changed that are +-otherwise notable can be done using a ``news/.process`` file. This is not +-typically used, but can be used for things like changing version schemes, ++otherwise notable can be done using a ``news/.process.rst`` file. This is ++not typically used, but can be used for things like changing version schemes, + updating deprecation policy, etc. + + +diff --git a/news/e1831861-84a4-4f9b-9987-762e127cb42b.trivial.rst b/news/e1831861-84a4-4f9b-9987-762e127cb42b.trivial.rst +new file mode 100644 +index 0000000000..e69de29bb2 -- Gitee From d03ec37495fc92b9b9329385f249c46c8010f481 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Mon, 26 Oct 2020 21:30:13 +0800 Subject: [PATCH 2/2] [patch tracking] 20201026213007637562 - 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..7a97cbb 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: ea74bd3d9085234601a0a6199b2ad65c6b6a002f.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 +* 20201026213007637562 patch-tracking 20.2.2-3 +- append patch file of upstream repository from to + * 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