From 819837a108899aa6575c81da954c2ec5e4cdbe78 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Wed, 23 Dec 2020 19:58:53 +0800 Subject: [PATCH 1/2] [patch tracking] 20201223195849756468 - https://github.com/pypa/pip/commit/41e454754233ed576820afda4b0bb322d0d4719d --- ...54754233ed576820afda4b0bb322d0d4719d.patch | 64 +++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 41e454754233ed576820afda4b0bb322d0d4719d.patch diff --git a/41e454754233ed576820afda4b0bb322d0d4719d.patch b/41e454754233ed576820afda4b0bb322d0d4719d.patch new file mode 100644 index 0000000..46ae442 --- /dev/null +++ b/41e454754233ed576820afda4b0bb322d0d4719d.patch @@ -0,0 +1,64 @@ +diff --git a/.pre-commit-config-slow.yaml b/.pre-commit-config-slow.yaml +new file mode 100644 +index 0000000000..2179c66576 +--- /dev/null ++++ b/.pre-commit-config-slow.yaml +@@ -0,0 +1,7 @@ ++# Slow pre-commit checks we don't want to run locally with each commit. ++ ++repos: ++- repo: https://github.com/mgedmin/check-manifest ++ rev: '0.43' ++ hooks: ++ - id: check-manifest +diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml +index 7cf771c3bc..58a95bbfba 100644 +--- a/.pre-commit-config.yaml ++++ b/.pre-commit-config.yaml +@@ -97,8 +97,3 @@ repos: + entry: NEWS fragment files must be named *.(process|removal|feature|bugfix|vendor|doc|trivial).rst + exclude: ^news/(.gitignore|.*\.(process|removal|feature|bugfix|vendor|doc|trivial).rst) + files: ^news/ +- +-- repo: https://github.com/mgedmin/check-manifest +- rev: '0.43' +- hooks: +- - id: check-manifest +diff --git a/MANIFEST.in b/MANIFEST.in +index 24d4553785..2cf636ce3f 100644 +--- a/MANIFEST.in ++++ b/MANIFEST.in +@@ -17,6 +17,7 @@ exclude .appveyor.yml + exclude .travis.yml + exclude .readthedocs.yml + exclude .pre-commit-config.yaml ++exclude .pre-commit-config-slow.yaml + exclude tox.ini + exclude noxfile.py + +diff --git a/noxfile.py b/noxfile.py +index b94cfe86fe..2c0a48ecbe 100644 +--- a/noxfile.py ++++ b/noxfile.py +@@ -149,6 +149,9 @@ def lint(session): + args = ["--all-files", "--show-diff-on-failure"] + + session.run("pre-commit", "run", *args) ++ session.run( ++ "pre-commit", "run", "-c", ".pre-commit-config-slow.yaml", *args ++ ) + + + @nox.session +diff --git a/tox.ini b/tox.ini +index 9c20759af3..e458e374b5 100644 +--- a/tox.ini ++++ b/tox.ini +@@ -64,6 +64,7 @@ commands_pre = + deps = pre-commit + commands = + pre-commit run [] --all-files --show-diff-on-failure ++ pre-commit run [] -c .pre-commit-config-slow.yaml --all-files --show-diff-on-failure + + [testenv:vendoring] + basepython = python3 -- Gitee From a1ba45aae85e0f74a41217e7b6d67cc17ad50f1f Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Wed, 23 Dec 2020 19:58:54 +0800 Subject: [PATCH 2/2] [patch tracking] 20201223195849756468 - 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..1e3a1e0 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: 41e454754233ed576820afda4b0bb322d0d4719d.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 +* 20201223195849756468 patch-tracking 20.2.2-4 +- append patch file of upstream repository from <41e454754233ed576820afda4b0bb322d0d4719d> to <41e454754233ed576820afda4b0bb322d0d4719d> + * 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