diff --git a/2b0b426b77275a7c1321606ddc9b717ea592d924.patch b/2b0b426b77275a7c1321606ddc9b717ea592d924.patch new file mode 100644 index 0000000000000000000000000000000000000000..d9420319a3c1bd4d4602ecb74ebfec9ded3496e2 --- /dev/null +++ b/2b0b426b77275a7c1321606ddc9b717ea592d924.patch @@ -0,0 +1,127 @@ +diff --git a/AUTHORS.txt b/AUTHORS.txt +index 5b53db6c2b..0360f988f2 100644 +--- a/AUTHORS.txt ++++ b/AUTHORS.txt +@@ -504,6 +504,7 @@ Simon Cross + Simon Pichugin + sinoroc + sinscary ++socketubs + Sorin Sbarnea + Srinivas Nyayapati + Stavros Korokithakis +diff --git a/NEWS.rst b/NEWS.rst +index 71071a4c08..80ad25ada4 100644 +--- a/NEWS.rst ++++ b/NEWS.rst +@@ -9,6 +9,41 @@ + + .. towncrier release notes start + ++20.3.2 (2020-12-15) ++=================== ++ ++Features ++-------- ++ ++- New resolver: Resolve direct and pinned (``==`` or ``===``) requirements first ++ to improve resolver performance. (`#9185 `_) ++- Add a mechanism to delay resolving certain packages, and use it for setuptools. (`#9249 `_) ++ ++Bug Fixes ++--------- ++ ++- New resolver: The "Requirement already satisfied" log is not printed only once ++ for each package during resolution. (`#9117 `_) ++- Fix crash when logic for redacting authentication information from URLs ++ in ``--help`` is given a list of strings, instead of a single string. (`#9191 `_) ++- New resolver: Correctly implement PEP 592. Do not return yanked versions from ++ an index, unless the version range can only be satisfied by yanked candidates. (`#9203 `_) ++- New resolver: Make constraints also apply to package variants with extras, so ++ the resolver correctly avoids backtracking on them. (`#9232 `_) ++- New resolver: Discard a candidate if it fails to provide metadata from source, ++ or if the provided metadata is inconsistent, instead of quitting outright. (`#9246 `_) ++ ++Vendored Libraries ++------------------ ++ ++- Update vendoring to 20.8 ++ ++Improved Documentation ++---------------------- ++ ++- Update documentation to reflect that pip still uses legacy resolver by default in Python 2 environments. (`#9269 `_) ++ ++ + 20.3.1 (2020-12-03) + =================== + +diff --git a/news/9117.bugfix.rst b/news/9117.bugfix.rst +deleted file mode 100644 +index 7991dac7d0..0000000000 +--- a/news/9117.bugfix.rst ++++ /dev/null +@@ -1,2 +0,0 @@ +-New resolver: The "Requirement already satisfied" log is not printed only once +-for each package during resolution. +diff --git a/news/9185.feature.rst b/news/9185.feature.rst +deleted file mode 100644 +index a9d9ae7187..0000000000 +--- a/news/9185.feature.rst ++++ /dev/null +@@ -1,2 +0,0 @@ +-New resolver: Resolve direct and pinned (``==`` or ``===``) requirements first +-to improve resolver performance. +diff --git a/news/9191.bugfix.rst b/news/9191.bugfix.rst +deleted file mode 100644 +index e1c6d633de..0000000000 +--- a/news/9191.bugfix.rst ++++ /dev/null +@@ -1,2 +0,0 @@ +-Fix crash when logic for redacting authentication information from URLs +-in ``--help`` is given a list of strings, instead of a single string. +diff --git a/news/9203.bugfix.rst b/news/9203.bugfix.rst +deleted file mode 100644 +index 29b39d66c3..0000000000 +--- a/news/9203.bugfix.rst ++++ /dev/null +@@ -1,2 +0,0 @@ +-New resolver: Correctly implement PEP 592. Do not return yanked versions from +-an index, unless the version range can only be satisfied by yanked candidates. +diff --git a/news/9232.bugfix.rst b/news/9232.bugfix.rst +deleted file mode 100644 +index 2d50d1ce41..0000000000 +--- a/news/9232.bugfix.rst ++++ /dev/null +@@ -1,2 +0,0 @@ +-New resolver: Make constraints also apply to package variants with extras, so +-the resolver correctly avoids backtracking on them. +diff --git a/news/9246.bugfix.rst b/news/9246.bugfix.rst +deleted file mode 100644 +index e7ebd398f3..0000000000 +--- a/news/9246.bugfix.rst ++++ /dev/null +@@ -1,2 +0,0 @@ +-New resolver: Discard a candidate if it fails to provide metadata from source, +-or if the provided metadata is inconsistent, instead of quitting outright. +diff --git a/news/9249.feature.rst b/news/9249.feature.rst +deleted file mode 100644 +index 1c56b39ef5..0000000000 +--- a/news/9249.feature.rst ++++ /dev/null +@@ -1 +0,0 @@ +-Add a mechanism to delay resolving certain packages, and use it for setuptools. +diff --git a/news/9269.doc.rst b/news/9269.doc.rst +deleted file mode 100644 +index f8ff14d942..0000000000 +--- a/news/9269.doc.rst ++++ /dev/null +@@ -1 +0,0 @@ +-Update documentation to reflect that pip still uses legacy resolver by default in Python 2 environments. +diff --git a/news/packaging.vendor.rst b/news/packaging.vendor.rst +deleted file mode 100644 +index 24d7440e05..0000000000 +--- a/news/packaging.vendor.rst ++++ /dev/null +@@ -1 +0,0 @@ +-Update vendoring to 20.8 diff --git a/python-pip.spec b/python-pip.spec index 3d035b59a33f24b5c58f6925acf4d9cb6a79f840..26f93c1f5548f2648b01d7c8e70aa3830b80406b 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: 2b0b426b77275a7c1321606ddc9b717ea592d924.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 +* 20201215095849755409 patch-tracking 20.2.2-4 +- append patch file of upstream repository from <2b0b426b77275a7c1321606ddc9b717ea592d924> to <2b0b426b77275a7c1321606ddc9b717ea592d924> + * 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