diff --git a/f01d60c3e301cf031d1b31fbe00d768c26430a29.patch b/f01d60c3e301cf031d1b31fbe00d768c26430a29.patch new file mode 100644 index 0000000000000000000000000000000000000000..b09f72d49d65f7575c5dadfc5bb7bbb3593aa401 --- /dev/null +++ b/f01d60c3e301cf031d1b31fbe00d768c26430a29.patch @@ -0,0 +1,39 @@ +diff --git a/tests/functional/test_build_env.py b/tests/functional/test_build_env.py +index 1f3b88b4d8..7a392f4264 100644 +--- a/tests/functional/test_build_env.py ++++ b/tests/functional/test_build_env.py +@@ -17,7 +17,6 @@ def run_with_build_env(script, setup_script_contents, + build_env_script.write_text( + dedent( + ''' +- from __future__ import print_function + import subprocess + import sys + +@@ -161,8 +160,6 @@ def test_build_env_overlay_prefix_has_priority(script): + 'installing pkg==4.3 in normal') + ''', + ''' +- from __future__ import print_function +- + print(__import__('pkg').__version__) + ''') + assert result.stdout.strip() == '2.0', str(result) +@@ -195,7 +192,6 @@ def test_build_env_isolation(script): + run_with_build_env( + script, '', + r''' +- from __future__ import print_function + from distutils.sysconfig import get_python_lib + import sys + +diff --git a/tests/functional/test_uninstall.py b/tests/functional/test_uninstall.py +index 6c687ada5b..d3c6a392ec 100644 +--- a/tests/functional/test_uninstall.py ++++ b/tests/functional/test_uninstall.py +@@ -1,5 +1,3 @@ +-from __future__ import with_statement +- + import json + import logging + import os diff --git a/python-pip.spec b/python-pip.spec index 3d035b59a33f24b5c58f6925acf4d9cb6a79f840..a5fbc4e45c14aaa94e2db2875727e8742fa66cb2 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: f01d60c3e301cf031d1b31fbe00d768c26430a29.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 +* 20210102215849754068 patch-tracking 20.2.2-4 +- append patch file of upstream repository from to + * 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