diff --git a/f81cfff06120a0c63945d36ad75229f137b3a245.patch b/f81cfff06120a0c63945d36ad75229f137b3a245.patch new file mode 100644 index 0000000000000000000000000000000000000000..ec10de5d5409159c1f1fd3388a0b3eb807a008b1 --- /dev/null +++ b/f81cfff06120a0c63945d36ad75229f137b3a245.patch @@ -0,0 +1,66 @@ +diff --git a/NEWS.rst b/NEWS.rst +index 6f7c2cd232..6c6db47998 100644 +--- a/NEWS.rst ++++ b/NEWS.rst +@@ -9,6 +9,45 @@ + + .. towncrier release notes start + ++20.2.4 (2020-10-16) ++=================== ++ ++Deprecations and Removals ++------------------------- ++ ++- Document that certain removals can be fast tracked. (`#8417 `_) ++- Document that Python versions are generally supported until PyPI usage falls below 5%. (`#8927 `_) ++ ++Features ++-------- ++ ++- New resolver: Avoid accessing indexes when the installed candidate is preferred ++ and considered good enough. (`#8023 `_) ++- Improve error message friendliness when an environment has packages with ++ corrupted metadata. (`#8676 `_) ++- Cache package listings on index packages so they are guarenteed to stay stable ++ during a pip command session. This also improves performance when a index page ++ is accessed multiple times during the command session. (`#8905 `_) ++- New resolver: Tweak resolution logic to improve user experience when ++ user-supplied requirements conflict. (`#8924 `_) ++ ++Bug Fixes ++--------- ++ ++- New resolver: Correctly respect ``Requires-Python`` metadata to reject ++ incompatible packages in ``--no-deps`` mode. (`#8758 `_) ++- New resolver: Pick up hash declarations in constraints files and use them to ++ filter available distributions. (`#8792 `_) ++- New resolver: If a package appears multiple times in user specification with ++ different ``--hash`` options, only hashes that present in all specifications ++ should be allowed. (`#8839 `_) ++ ++Improved Documentation ++---------------------- ++ ++- Add ux documentation (`#8807 `_) ++ ++ + 20.2.3 (2020-09-08) + =================== + +diff --git a/news/8023.feature.rst b/news/8023.feature.rst +deleted file mode 100644 +index c886e9a66c..0000000000 +--- a/news/8023.feature.rst ++++ /dev/null +@@ -1,2 +0,0 @@ +-New resolver: Avoid accessing indexes when the installed candidate is preferred +-and considered good enough. +diff --git a/news/8758.bugfix.rst b/news/8758.bugfix.rst +deleted file mode 100644 +index 9f44b7e47a..0000000000 +--- a/news/8758.bugfix.rst ++++ /dev/null +@@ -1,2 +0,0 @@ +-New resolver: Correctly respect ``Requires-Python`` metadata to reject +-incompatible packages in ``--no-deps`` mode. diff --git a/python-pip.spec b/python-pip.spec index 05f810a986da3034c3f240b38e74be80b2c67322..68728450de98a4aab2526b70e82e8f3bcb553b33 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,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: f81cfff06120a0c63945d36ad75229f137b3a245.patch Source10: pip-allow-older-versions.patch %description %{_description} @@ -140,6 +141,9 @@ install -p dist/%{python_wheelname} -t %{buildroot}%{python_wheeldir} %{python_wheeldir}/%{python_wheelname} %changelog +* 20201018063007637934 patch-tracking 20.2.2-3 +- append patch file of upstream repository from to + * Tue Sep 1 2020 wenzhanli - 20.2.2-2 - add pip-allow-older-versions.patch @@ -183,4 +187,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