From 97c215e104392019f9b14c50ae2e47ce7286d64f Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Sun, 20 Dec 2020 10:58:53 +0800 Subject: [PATCH 1/2] [patch tracking] 20201220105849756063 - https://github.com/pypa/pip/commit/726b66f67f182538613b50527f06de50c75bbf1d --- 726b66f67f182538613b50527f06de50c75bbf1d.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 726b66f67f182538613b50527f06de50c75bbf1d.patch diff --git a/726b66f67f182538613b50527f06de50c75bbf1d.patch b/726b66f67f182538613b50527f06de50c75bbf1d.patch new file mode 100644 index 0000000..b54a613 --- /dev/null +++ b/726b66f67f182538613b50527f06de50c75bbf1d.patch @@ -0,0 +1,13 @@ +diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml +index 838b1f24eb..7cf771c3bc 100644 +--- a/.pre-commit-config.yaml ++++ b/.pre-commit-config.yaml +@@ -62,7 +62,7 @@ repos: + ] + exclude: tests/data + +-- repo: https://github.com/timothycrosley/isort ++- repo: https://github.com/PyCQA/isort + rev: 5.5.3 + hooks: + - id: isort -- Gitee From 2c624ef8e325910b87cd03ab0b9e8050e8fd797b Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Sun, 20 Dec 2020 10:58:55 +0800 Subject: [PATCH 2/2] [patch tracking] 20201220105849756063 - 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..5d9a099 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: 726b66f67f182538613b50527f06de50c75bbf1d.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 +* 20201220105849756063 patch-tracking 20.2.2-4 +- append patch file of upstream repository from <726b66f67f182538613b50527f06de50c75bbf1d> to <726b66f67f182538613b50527f06de50c75bbf1d> + * 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