From 1c8db420506150bfa7d003041a5e7e07e08a6b63 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Mon, 28 Dec 2020 01:58:52 +0800 Subject: [PATCH 1/2] [patch tracking] 20201228015849753395 - https://github.com/pypa/pip/commit/36602b7977adff2a7d123bb273307d1cd099257e --- ...2b7977adff2a7d123bb273307d1cd099257e.patch | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 36602b7977adff2a7d123bb273307d1cd099257e.patch diff --git a/36602b7977adff2a7d123bb273307d1cd099257e.patch b/36602b7977adff2a7d123bb273307d1cd099257e.patch new file mode 100644 index 0000000..c817d70 --- /dev/null +++ b/36602b7977adff2a7d123bb273307d1cd099257e.patch @@ -0,0 +1,43 @@ +diff --git a/news/43602ba6-8a59-425c-9a97-9c8e87e28ddb.trivial.rst b/news/43602ba6-8a59-425c-9a97-9c8e87e28ddb.trivial.rst +new file mode 100644 +index 0000000000..e69de29bb2 +diff --git a/tests/lib/wheel.py b/tests/lib/wheel.py +index f96f5d06eb..a7403bd7f5 100644 +--- a/tests/lib/wheel.py ++++ b/tests/lib/wheel.py +@@ -1,5 +1,6 @@ + """Helper for building wheels as would be in test cases. + """ ++import csv + import itertools + from base64 import urlsafe_b64encode + from collections import namedtuple +@@ -11,7 +12,6 @@ + from io import BytesIO, StringIO + from zipfile import ZipFile + +-import csv23 + from pip._vendor.requests.structures import CaseInsensitiveDict + from pip._vendor.six import ensure_binary, ensure_text + +@@ -241,7 +241,7 @@ def record_file_maker_wrapper( + records = record_callback(records) + + with StringIO(newline="") as buf: +- writer = csv23.writer(buf) ++ writer = csv.writer(buf) + for record in records: + writer.writerow(map(ensure_text, record)) + contents = buf.getvalue().encode("utf-8") +diff --git a/tools/requirements/tests.txt b/tools/requirements/tests.txt +index ef87225d6c..9b4e984905 100644 +--- a/tools/requirements/tests.txt ++++ b/tools/requirements/tests.txt +@@ -1,7 +1,5 @@ + --use-feature=2020-resolver + cryptography==2.8 +-csv23 +-enum34; python_version < '3.4' + freezegun + mock + pretend -- Gitee From 9d72d10995b92e112e11a5b05394d54382dffe73 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Mon, 28 Dec 2020 01:58:53 +0800 Subject: [PATCH 2/2] [patch tracking] 20201228015849753395 - 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..b38c7e7 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: 36602b7977adff2a7d123bb273307d1cd099257e.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 +* 20201228015849753395 patch-tracking 20.2.2-4 +- append patch file of upstream repository from <36602b7977adff2a7d123bb273307d1cd099257e> to <36602b7977adff2a7d123bb273307d1cd099257e> + * 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