From 982f27a957730f212fddd9bb869dfbf0f8cf23be Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Fri, 20 Nov 2020 02:30:14 +0800 Subject: [PATCH 1/3] [patch tracking] 20201120023007638765 - https://github.com/pypa/pip/commit/0006f129260e76365ee13c48eb342d5e511bbf82 --- ...f129260e76365ee13c48eb342d5e511bbf82.patch | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 0006f129260e76365ee13c48eb342d5e511bbf82.patch diff --git a/0006f129260e76365ee13c48eb342d5e511bbf82.patch b/0006f129260e76365ee13c48eb342d5e511bbf82.patch new file mode 100644 index 0000000..670aa28 --- /dev/null +++ b/0006f129260e76365ee13c48eb342d5e511bbf82.patch @@ -0,0 +1,26 @@ +diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml +index ebe98fec7d..71459d660e 100644 +--- a/.github/workflows/linting.yml ++++ b/.github/workflows/linting.yml +@@ -38,7 +38,7 @@ jobs: + ${{ runner.os }}- + + - name: Set PY (for pre-commit cache) +- run: echo "::set-env name=PY::$(python -c 'import hashlib, sys;print(hashlib.sha256(sys.version.encode()+sys.executable.encode()).hexdigest())')" ++ run: echo "PY=$(python -c 'import hashlib, sys;print(hashlib.sha256(sys.version.encode()+sys.executable.encode()).hexdigest())')" >> $GITHUB_ENV + - name: pre-commit cache + uses: actions/cache@v1 + with: +diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml +index bdf3f671bd..5d7b9acab8 100644 +--- a/.github/workflows/macos.yml ++++ b/.github/workflows/macos.yml +@@ -25,7 +25,7 @@ jobs: + ${{ runner.os }}-pip- + ${{ runner.os }}- + - name: Set PY (for pre-commit cache) +- run: echo "::set-env name=PY::$(python -c 'import hashlib, sys;print(hashlib.sha256(sys.version.encode()+sys.executable.encode()).hexdigest())')" ++ run: echo "PY=$(python -c 'import hashlib, sys;print(hashlib.sha256(sys.version.encode()+sys.executable.encode()).hexdigest())')" >> $GITHUB_ENV + - name: pre-commit cache + uses: actions/cache@v1 + with: -- Gitee From 29d2927158c2ab4977ad185b2b80e25fd7f5672b Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Fri, 20 Nov 2020 02:30:15 +0800 Subject: [PATCH 2/3] [patch tracking] 20201120023007638765 - https://github.com/pypa/pip/commit/c41bbe52484168d0ba2d3f5032087aebea7c3e51 --- ...be52484168d0ba2d3f5032087aebea7c3e51.patch | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 c41bbe52484168d0ba2d3f5032087aebea7c3e51.patch diff --git a/c41bbe52484168d0ba2d3f5032087aebea7c3e51.patch b/c41bbe52484168d0ba2d3f5032087aebea7c3e51.patch new file mode 100644 index 0000000..1c1311e --- /dev/null +++ b/c41bbe52484168d0ba2d3f5032087aebea7c3e51.patch @@ -0,0 +1,19 @@ +diff --git a/.travis.yml b/.travis.yml +index 9e7e5d68c2..165d2ef154 100644 +--- a/.travis.yml ++++ b/.travis.yml +@@ -34,14 +34,3 @@ jobs: + before_install: tools/travis/setup.sh + install: travis_retry tools/travis/install.sh + script: tools/travis/run.sh +- +-notifications: +- irc: +- channels: +- # This is set to a secure variable to prevent forks from notifying the +- # IRC channel whenever they fail a build. This can be removed when travis +- # implements https://github.com/travis-ci/travis-ci/issues/1094. +- # The actual value here is: irc.freenode.org#pypa-dev +- - secure: zAlwcmrDThlRsZz7CPDGpj4ABTzf7bc/zQXYtvIuqmSj0yJMAwsO5Vx/+qdTGYBvmW/oHw2s/uUgtkZzntSQiVQToKMag2fs0d3wV5bLJQUE2Si2jnH2JOQo3JZWSo9HOqL6WYmlKGI8lH9FVTdVLgpeJmIpLy1bN4zx4/TiJjc= +- skip_join: true +- use_notice: true -- Gitee From 1b13cba42540a4bd9f1fb7950874c35a1de1b052 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Fri, 20 Nov 2020 02:30:16 +0800 Subject: [PATCH 3/3] [patch tracking] 20201120023007638765 - update spec file --- python-pip.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/python-pip.spec b/python-pip.spec index 3d035b5..f3a70b1 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,8 @@ 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: 0006f129260e76365ee13c48eb342d5e511bbf82.patch +Patch6002: c41bbe52484168d0ba2d3f5032087aebea7c3e51.patch Source10: pip-allow-older-versions.patch %description %{_description} @@ -112,6 +114,9 @@ install -p dist/%{python_wheelname} -t %{buildroot}%{python_wheeldir} %{python_wheeldir}/%{python_wheelname} %changelog +* 20201120023007638765 patch-tracking 20.2.2-4 +- append patch file of upstream repository from <0006f129260e76365ee13c48eb342d5e511bbf82> to + * Wed Nov 4 2020 wangjie -20.2.2-3 - Type:NA - ID:NA @@ -161,4 +166,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