diff --git a/dce6b34abb0f283d765032434adc620a91134c88.patch b/dce6b34abb0f283d765032434adc620a91134c88.patch new file mode 100644 index 0000000000000000000000000000000000000000..3951f3921451e0a189da62b49bf6e9e253d80329 --- /dev/null +++ b/dce6b34abb0f283d765032434adc620a91134c88.patch @@ -0,0 +1,246 @@ +diff --git a/AUTHORS.txt b/AUTHORS.txt +index f6fe855d7a..7ab324ce42 100644 +--- a/AUTHORS.txt ++++ b/AUTHORS.txt +@@ -79,6 +79,8 @@ Benjamin Peterson + Benjamin VanEvery + Benoit Pierre + Berker Peksag ++Bernard ++Bernard Tyers + Bernardo B. Marques + Bernhard M. Wiedemann + Bertil Hatt +diff --git a/NEWS.rst b/NEWS.rst +index fffba7cf31..feff159190 100644 +--- a/NEWS.rst ++++ b/NEWS.rst +@@ -9,6 +9,55 @@ + + .. towncrier release notes start + ++20.3 (2020-11-30) ++================= ++ ++Deprecations and Removals ++------------------------- ++ ++- Remove --unstable-feature flag as it has been deprecated. (`#9133 `_) ++ ++Features ++-------- ++ ++- Add support for :pep:`600`: Future 'manylinux' Platform Tags for Portable Linux Built Distributions. (`#9077 `_) ++- The new resolver now resolves packages in a deterministic order. (`#9100 `_) ++- Add support for MacOS Big Sur compatibility tags. (`#9138 `_) ++ ++Bug Fixes ++--------- ++ ++- New Resolver: Rework backtracking and state management, to avoid getting stuck in an infinite loop. (`#9011 `_) ++- New resolver: Check version equality with ``packaging.version`` to avoid edge ++ cases if a wheel used different version normalization logic in its filename ++ and metadata. (`#9083 `_) ++- New resolver: Show each requirement in the conflict error message only once to reduce cluttering. (`#9101 `_) ++- Fix a regression that made ``pip wheel`` generate zip files of editable ++ requirements in the wheel directory. (`#9122 `_) ++- Fix ResourceWarning in VCS subprocesses (`#9156 `_) ++- Redact auth from URL in help message. (`#9160 `_) ++- New Resolver: editable installations are done, regardless of whether ++ the already-installed distribution is editable. (`#9169 `_) ++ ++Vendored Libraries ++------------------ ++ ++- Upgrade certifi to 2020.11.8 ++- Upgrade colorama to 0.4.4 ++- Upgrade packaging to 20.7 ++- Upgrade pep517 to 0.9.1 ++- Upgrade requests to 2.25.0 ++- Upgrade resolvelib to 0.5.3 ++- Upgrade toml to 0.10.2 ++- Upgrade urllib3 to 1.26.2 ++ ++Improved Documentation ++---------------------- ++ ++- Add a section to the User Guide to cover backtracking during dependency resolution. (`#9039 `_) ++- Reorder and revise installation instructions to make them easier to follow. (`#9131 `_) ++ ++ + 20.3b1 (2020-10-31) + =================== + +diff --git a/news/9011.bugfix.rst b/news/9011.bugfix.rst +deleted file mode 100644 +index 4e299dd9b6..0000000000 +--- a/news/9011.bugfix.rst ++++ /dev/null +@@ -1 +0,0 @@ +-New Resolver: Rework backtracking and state management, to avoid getting stuck in an infinite loop. +diff --git a/news/9039.doc.rst b/news/9039.doc.rst +deleted file mode 100644 +index 37241250da..0000000000 +--- a/news/9039.doc.rst ++++ /dev/null +@@ -1 +0,0 @@ +-Add a section to the User Guide to cover backtracking during dependency resolution. +diff --git a/news/9077.feature.rst b/news/9077.feature.rst +deleted file mode 100644 +index f77dacd065..0000000000 +--- a/news/9077.feature.rst ++++ /dev/null +@@ -1 +0,0 @@ +-Add support for :pep:`600`: Future 'manylinux' Platform Tags for Portable Linux Built Distributions. +diff --git a/news/9083.bugfix.rst b/news/9083.bugfix.rst +deleted file mode 100644 +index 97fc552b6f..0000000000 +--- a/news/9083.bugfix.rst ++++ /dev/null +@@ -1,3 +0,0 @@ +-New resolver: Check version equality with ``packaging.version`` to avoid edge +-cases if a wheel used different version normalization logic in its filename +-and metadata. +diff --git a/news/9100.feature.rst b/news/9100.feature.rst +deleted file mode 100644 +index eb6c728394..0000000000 +--- a/news/9100.feature.rst ++++ /dev/null +@@ -1 +0,0 @@ +-The new resolver now resolves packages in a deterministic order. +diff --git a/news/9101.bugfix.rst b/news/9101.bugfix.rst +deleted file mode 100644 +index 441f2a9313..0000000000 +--- a/news/9101.bugfix.rst ++++ /dev/null +@@ -1 +0,0 @@ +-New resolver: Show each requirement in the conflict error message only once to reduce cluttering. +diff --git a/news/9122.bugfix.rst b/news/9122.bugfix.rst +deleted file mode 100644 +index da2ae5e5f9..0000000000 +--- a/news/9122.bugfix.rst ++++ /dev/null +@@ -1,2 +0,0 @@ +-Fix a regression that made ``pip wheel`` generate zip files of editable +-requirements in the wheel directory. +diff --git a/news/9131.doc.rst b/news/9131.doc.rst +deleted file mode 100644 +index 18862aa554..0000000000 +--- a/news/9131.doc.rst ++++ /dev/null +@@ -1 +0,0 @@ +-Reorder and revise installation instructions to make them easier to follow. +diff --git a/news/9133.removal.rst b/news/9133.removal.rst +deleted file mode 100644 +index 876e89b13e..0000000000 +--- a/news/9133.removal.rst ++++ /dev/null +@@ -1 +0,0 @@ +-Remove --unstable-feature flag as it has been deprecated. +diff --git a/news/9138.feature.rst b/news/9138.feature.rst +deleted file mode 100644 +index 98009cdd1a..0000000000 +--- a/news/9138.feature.rst ++++ /dev/null +@@ -1 +0,0 @@ +-Add support for MacOS Big Sur compatibility tags. +diff --git a/news/9156.bugfix.rst b/news/9156.bugfix.rst +deleted file mode 100644 +index 9b433fae2f..0000000000 +--- a/news/9156.bugfix.rst ++++ /dev/null +@@ -1 +0,0 @@ +-Fix ResourceWarning in VCS subprocesses +diff --git a/news/9160.bugfix.rst b/news/9160.bugfix.rst +deleted file mode 100644 +index fad6dc1f0d..0000000000 +--- a/news/9160.bugfix.rst ++++ /dev/null +@@ -1 +0,0 @@ +-Redact auth from URL in help message. +diff --git a/news/9169.bugfix.rst b/news/9169.bugfix.rst +deleted file mode 100644 +index 299ec27336..0000000000 +--- a/news/9169.bugfix.rst ++++ /dev/null +@@ -1,2 +0,0 @@ +-New Resolver: editable installations are done, regardless of whether +-the already-installed distribution is editable. +diff --git a/news/9171.trivial.rst b/news/9171.trivial.rst +deleted file mode 100644 +index ca02166a2e..0000000000 +--- a/news/9171.trivial.rst ++++ /dev/null +@@ -1,3 +0,0 @@ +-Fixed moving the ``:orphan:`` to top of documents in the Sphinx +-extension for collecting the UX feedback from docs (initially +-introduced in PR #8848). +diff --git a/news/certifi.vendor.rst b/news/certifi.vendor.rst +deleted file mode 100644 +index b181bc30c4..0000000000 +--- a/news/certifi.vendor.rst ++++ /dev/null +@@ -1 +0,0 @@ +-Upgrade certifi to 2020.11.8 +diff --git a/news/colorama.vendor.rst b/news/colorama.vendor.rst +deleted file mode 100644 +index 30c755eb04..0000000000 +--- a/news/colorama.vendor.rst ++++ /dev/null +@@ -1 +0,0 @@ +-Upgrade colorama to 0.4.4 +diff --git a/news/packaging.vendor.rst b/news/packaging.vendor.rst +deleted file mode 100644 +index 4e49a4639b..0000000000 +--- a/news/packaging.vendor.rst ++++ /dev/null +@@ -1 +0,0 @@ +-Upgrade packaging to 20.7 +diff --git a/news/pep517.vendor.rst b/news/pep517.vendor.rst +deleted file mode 100644 +index 945f1e7468..0000000000 +--- a/news/pep517.vendor.rst ++++ /dev/null +@@ -1 +0,0 @@ +-Upgrade pep517 to 0.9.1 +diff --git a/news/requests.vendor.rst b/news/requests.vendor.rst +deleted file mode 100644 +index 515ca25a94..0000000000 +--- a/news/requests.vendor.rst ++++ /dev/null +@@ -1 +0,0 @@ +-Upgrade requests to 2.25.0 +diff --git a/news/resolvelib.vendor.rst b/news/resolvelib.vendor.rst +deleted file mode 100644 +index 52d32af8be..0000000000 +--- a/news/resolvelib.vendor.rst ++++ /dev/null +@@ -1 +0,0 @@ +-Upgrade resolvelib to 0.5.3 +diff --git a/news/toml.vendor.rst b/news/toml.vendor.rst +deleted file mode 100644 +index 566c104f80..0000000000 +--- a/news/toml.vendor.rst ++++ /dev/null +@@ -1 +0,0 @@ +-Upgrade toml to 0.10.2 +diff --git a/news/urllib3.vendor.rst b/news/urllib3.vendor.rst +deleted file mode 100644 +index 10e1e7b45f..0000000000 +--- a/news/urllib3.vendor.rst ++++ /dev/null +@@ -1 +0,0 @@ +-Upgrade urllib3 to 1.26.2 +diff --git a/src/pip/__init__.py b/src/pip/__init__.py +index cd09297136..ae0fe9a9f2 100644 +--- a/src/pip/__init__.py ++++ b/src/pip/__init__.py +@@ -4,7 +4,7 @@ + from typing import List, Optional + + +-__version__ = "20.3.dev1" ++__version__ = "21.0.dev0" + + + def main(args=None): diff --git a/python-pip.spec b/python-pip.spec index 3d035b59a33f24b5c58f6925acf4d9cb6a79f840..296a40a47178eeb2251e1b6e6d1532d4bf42d43a 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: dce6b34abb0f283d765032434adc620a91134c88.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 +* 20201130205849754646 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