diff --git a/75efc997cd6c33401a8a78e0aec44cc18f3feea5.patch b/75efc997cd6c33401a8a78e0aec44cc18f3feea5.patch new file mode 100644 index 0000000000000000000000000000000000000000..03b50e9efb4c84b05f57db97284574a518f18a5c --- /dev/null +++ b/75efc997cd6c33401a8a78e0aec44cc18f3feea5.patch @@ -0,0 +1,15 @@ +diff --git a/.gitignore b/.gitignore +index 946385eef5..dc6244855f 100644 +--- a/.gitignore ++++ b/.gitignore +@@ -39,6 +39,10 @@ tests/data/common_wheels/ + # For Visual Studio Code + .vscode/ + ++# For Sublime Text ++*.sublime-workspace ++*.sublime-project ++ + # Scratch Pad for experiments + .scratch/ + diff --git a/9a62dd87d86e37aa133716b74c0dccabb6f9f9e4.patch b/9a62dd87d86e37aa133716b74c0dccabb6f9f9e4.patch new file mode 100644 index 0000000000000000000000000000000000000000..040c607e2378ef06ede57c8e594fd95306bd0e8a --- /dev/null +++ b/9a62dd87d86e37aa133716b74c0dccabb6f9f9e4.patch @@ -0,0 +1,48 @@ +diff --git a/news/9069.removal.rst b/news/9069.removal.rst +new file mode 100644 +index 0000000000..a7fae08da4 +--- /dev/null ++++ b/news/9069.removal.rst +@@ -0,0 +1 @@ ++Deprecate ``--find-links`` option in ``pip freeze`` +diff --git a/src/pip/_internal/commands/freeze.py b/src/pip/_internal/commands/freeze.py +index 2071fbabd6..20084a4981 100644 +--- a/src/pip/_internal/commands/freeze.py ++++ b/src/pip/_internal/commands/freeze.py +@@ -9,6 +9,7 @@ + from pip._internal.models.format_control import FormatControl + from pip._internal.operations.freeze import freeze + from pip._internal.utils.compat import stdlib_pkgs ++from pip._internal.utils.deprecation import deprecated + from pip._internal.utils.typing import MYPY_CHECK_RUNNING + + DEV_PKGS = {'pip', 'setuptools', 'distribute', 'wheel'} +@@ -86,6 +87,14 @@ def run(self, options, args): + + cmdoptions.check_list_path_option(options) + ++ if options.find_links: ++ deprecated( ++ "--find-links option in pip freeze is deprecated.", ++ replacement=None, ++ gone_in="21.2", ++ issue=9069, ++ ) ++ + freeze_kwargs = dict( + requirement=options.requirements, + find_links=options.find_links, +diff --git a/tests/functional/test_freeze.py b/tests/functional/test_freeze.py +index ef22169869..74d676aeda 100644 +--- a/tests/functional/test_freeze.py ++++ b/tests/functional/test_freeze.py +@@ -358,7 +358,8 @@ def test_freeze_mercurial_clone_srcdir(script, tmpdir): + _check_output(result.stdout, expected) + + result = script.pip( +- 'freeze', '-f', '{repo_dir}#egg=pip_test_package'.format(**locals()) ++ 'freeze', '-f', '{repo_dir}#egg=pip_test_package'.format(**locals()), ++ expect_stderr=True, + ) + expected = textwrap.dedent( + """ diff --git a/python-pip.spec b/python-pip.spec index 05f810a986da3034c3f240b38e74be80b2c67322..3f174a54c2ff98ee8e579e3d729b66fd0d8e8316 100644 --- a/python-pip.spec +++ b/python-pip.spec @@ -7,7 +7,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: 2 +Release: 3 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 @@ -17,6 +17,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: 75efc997cd6c33401a8a78e0aec44cc18f3feea5.patch +Patch6002: 9a62dd87d86e37aa133716b74c0dccabb6f9f9e4.patch Source10: pip-allow-older-versions.patch %description %{_description} @@ -140,6 +142,9 @@ install -p dist/%{python_wheelname} -t %{buildroot}%{python_wheeldir} %{python_wheeldir}/%{python_wheelname} %changelog +* 20201031023007637049 patch-tracking 20.2.2-3 +- append patch file of upstream repository from <75efc997cd6c33401a8a78e0aec44cc18f3feea5> to <9a62dd87d86e37aa133716b74c0dccabb6f9f9e4> + * Tue Sep 1 2020 wenzhanli - 20.2.2-2 - add pip-allow-older-versions.patch @@ -183,4 +188,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