Update to 20.2.2 (#1838553)

python-pip.spec

@@ -3,12 +3,13 @@
 %bcond_without doc
 
 %global srcname pip
-%global base_version 20.1.1
+%global base_version 20.2.2
 %global upstream_version %{base_version}%{?prerel}
 %global python_wheelname %{srcname}-%{upstream_version}-py2.py3-none-any.whl
 %global python_wheeldir %{_datadir}/python-wheels
 
 %if %{with doc}
+# Commit hash to use from the repo https://github.com/pypa/pypa-docs-theme
 %global pypa_theme_commit_hash d2e63fbfc62af3b7050f619b2f5bb8658985b931
 %endif
 
@@ -18,7 +19,7 @@ Name:           python-%{srcname}
 # When updating, update the bundled libraries versions bellow!
 # You can use vendor_meta.sh in the dist git repo
 Version:        %{base_version}%{?prerel:~%{prerel}}
-Release:        7%{?dist}
+Release:        1%{?dist}
 Summary:        A tool for installing and managing Python packages
 
 # We bundle a lot of libraries with pip, which itself is under MIT license.
@@ -40,11 +41,12 @@ Summary:        A tool for installing and managing Python packages
 # pep517: MIT
 # progress: ISC
 # pyparsing: MIT
-# pytoml: MIT
 # requests: ASL 2.0
+# resolvelib: ISC
 # retrying: ASL 2.0
 # setuptools: MIT
 # six: MIT
+# toml: MIT
 # urllib3: MIT
 # webencodings: BSD
 
@@ -90,12 +92,6 @@ Patch4:         dummy-certifi.patch
 # this warning is juts moot. Also, the warning breaks CPython test suite.
 Patch5:         nowarn-pip._internal.main.patch
 
-# Backport: Update tests to be endian safe
-# This updates `test_path_to_display` and `test_str_to_display__encoding`
-# to use the endian safe expected result instead of the hardcoded one.
-# This fixes https://github.com/pypa/pip/issues/7921
-Patch6:         https://github.com/pypa/pip/commit/b30dd1e04e.patch
-
 # Downstream only patch
 # Users might have local installations of pip from using
 # `pip install --user --upgrade pip` on older/newer versions.
@@ -131,29 +127,29 @@ Packages" or "Pip Installs Python".
 # You can generate it with:
 # %%{_rpmconfigdir}/pythonbundles.py --namespace 'python%%{1}dist' src/pip/_vendor/vendor.txt
 %global bundled() %{expand:
-Provides: bundled(python%{1}dist(appdirs)) = 1.4.3
+Provides: bundled(python%{1}dist(appdirs)) = 1.4.4
 Provides: bundled(python%{1}dist(cachecontrol)) = 0.12.6
-Provides: bundled(python%{1}dist(certifi)) = 2020.4.5.1
+Provides: bundled(python%{1}dist(certifi)) = 2020.6.20
 Provides: bundled(python%{1}dist(chardet)) = 3.0.4
 Provides: bundled(python%{1}dist(colorama)) = 0.4.3
 Provides: bundled(python%{1}dist(contextlib2)) = 0.6^post1
-Provides: bundled(python%{1}dist(distlib)) = 0.3
+Provides: bundled(python%{1}dist(distlib)) = 0.3.1
 Provides: bundled(python%{1}dist(distro)) = 1.5
-Provides: bundled(python%{1}dist(html5lib)) = 1.0.1
-Provides: bundled(python%{1}dist(idna)) = 2.9
+Provides: bundled(python%{1}dist(html5lib)) = 1.1
+Provides: bundled(python%{1}dist(idna)) = 2.10
 Provides: bundled(python%{1}dist(ipaddress)) = 1.0.23
 Provides: bundled(python%{1}dist(msgpack)) = 1
-Provides: bundled(python%{1}dist(packaging)) = 20.3
+Provides: bundled(python%{1}dist(packaging)) = 20.4
 Provides: bundled(python%{1}dist(pep517)) = 0.8.2
 Provides: bundled(python%{1}dist(progress)) = 1.5
 Provides: bundled(python%{1}dist(pyparsing)) = 2.4.7
-Provides: bundled(python%{1}dist(requests)) = 2.23
-Provides: bundled(python%{1}dist(resolvelib)) = 0.3
+Provides: bundled(python%{1}dist(requests)) = 2.24
+Provides: bundled(python%{1}dist(resolvelib)) = 0.4
 Provides: bundled(python%{1}dist(retrying)) = 1.3.3
 Provides: bundled(python%{1}dist(setuptools)) = 44
-Provides: bundled(python%{1}dist(six)) = 1.14
-Provides: bundled(python%{1}dist(toml)) = 0.10
-Provides: bundled(python%{1}dist(urllib3)) = 1.25.8
+Provides: bundled(python%{1}dist(six)) = 1.15
+Provides: bundled(python%{1}dist(toml)) = 0.10.1
+Provides: bundled(python%{1}dist(urllib3)) = 1.25.9
 Provides: bundled(python%{1}dist(webencodings)) = 0.5.1
 }
 
@@ -405,6 +401,9 @@ pytest_k='not completion and
 %{python_wheeldir}/%{python_wheelname}
 
 %changelog
+* Wed Aug 05 2020 Tomas Orsava <torsava@redhat.com> - 20.2.2-1
+- Update to 20.2.2 (#1838553)
+
 * Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 20.1.1-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild