Update to 24.1.1

python-pip.spec

@@ -6,7 +6,7 @@
 %bcond doc %[%{defined fedora} || %{defined epel}]
 
 %global srcname pip
-%global base_version 24.0
+%global base_version 24.1.1
 %global upstream_version %{base_version}%{?prerel}
 %global python_wheel_name %{srcname}-%{upstream_version}-py3-none-any.whl
 
@@ -18,35 +18,27 @@ Summary:        A tool for installing and managing Python packages
 # We bundle a lot of libraries with pip, which itself is under MIT license.
 # Here is the list of the libraries with corresponding licenses:
 
-# appdirs: MIT
 # certifi: MPL-2.0
-# chardet: LGPL-2.1-only
-# colorama: BSD-3-Clause
 # CacheControl: Apache-2.0
 # distlib: Python-2.0.1
 # distro: Apache-2.0
-# html5lib: MIT
 # idna: BSD-3-Clause
-# ipaddress: Python-2.0.1
 # msgpack: Apache-2.0
 # packaging: Apache-2.0 OR BSD-2-Clause
-# progress: ISC
+# platformdirs: MIT
 # pygments: BSD-2-Clause
-# pyparsing: MIT
 # pyproject-hooks: MIT
 # requests: Apache-2.0
 # resolvelib: ISC
 # rich: MIT
 # setuptools: MIT
-# six: MIT
 # tenacity: Apache-2.0
 # truststore: MIT
 # tomli: MIT
 # typing-extensions: Python-2.0.1
 # urllib3: MIT
-# webencodings: BSD-3-Clause
 
-License:        MIT AND Python-2.0.1 AND Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND LGPL-2.1-only AND MPL-2.0 AND (Apache-2.0 OR BSD-2-Clause)
+License:        MIT AND Python-2.0.1 AND Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MPL-2.0 AND (Apache-2.0 OR BSD-2-Clause)
 URL:            https://pip.pypa.io/
 Source0:        https://github.com/pypa/pip/archive/%{upstream_version}/%{srcname}-%{upstream_version}.tar.gz
 
@@ -77,13 +69,6 @@ Patch:          dummy-certifi.patch
 # this warning is juts moot. Also, the warning breaks CPython test suite.
 Patch:          nowarn-pip._internal.main.patch
 
-# Don't warn the user about packaging's LegacyVersion being deprecated.
-# (This also breaks Python's test suite when warnings are treated as errors.)
-# Upstream issue: https://github.com/pypa/packaging/issues/368
-Patch:          no-version-warning.patch
-
-# Python 3.13 support: Also patch time.time_ns() in unit tests
-Patch:          https://github.com/pypa/pip/pull/12698.patch
 
 %description
 pip is a package management system used to install and manage software packages
@@ -97,30 +82,25 @@ 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(cachecontrol)) = 0.13.1
-Provides: bundled(python%{1}dist(certifi)) = 2023.7.22
-Provides: bundled(python%{1}dist(chardet)) = 5.1
-Provides: bundled(python%{1}dist(colorama)) = 0.4.6
+Provides: bundled(python%{1}dist(cachecontrol)) = 0.14
+Provides: bundled(python%{1}dist(certifi)) = 2024.2.2
 Provides: bundled(python%{1}dist(distlib)) = 0.3.8
-Provides: bundled(python%{1}dist(distro)) = 1.8
-Provides: bundled(python%{1}dist(idna)) = 3.4
-Provides: bundled(python%{1}dist(msgpack)) = 1.0.5
-Provides: bundled(python%{1}dist(packaging)) = 21.3
-Provides: bundled(python%{1}dist(platformdirs)) = 3.8.1
-Provides: bundled(python%{1}dist(pygments)) = 2.15.1
-Provides: bundled(python%{1}dist(pyparsing)) = 3.1
+Provides: bundled(python%{1}dist(distro)) = 1.9
+Provides: bundled(python%{1}dist(idna)) = 3.7
+Provides: bundled(python%{1}dist(msgpack)) = 1.0.8
+Provides: bundled(python%{1}dist(packaging)) = 24.1
+Provides: bundled(python%{1}dist(platformdirs)) = 4.2.1
+Provides: bundled(python%{1}dist(pygments)) = 2.17.2
 Provides: bundled(python%{1}dist(pyproject-hooks)) = 1
-Provides: bundled(python%{1}dist(requests)) = 2.31
+Provides: bundled(python%{1}dist(requests)) = 2.32.3
 Provides: bundled(python%{1}dist(resolvelib)) = 1.0.1
-Provides: bundled(python%{1}dist(rich)) = 13.4.2
-Provides: bundled(python%{1}dist(setuptools)) = 68
-Provides: bundled(python%{1}dist(six)) = 1.16
-Provides: bundled(python%{1}dist(tenacity)) = 8.2.2
-Provides: bundled(python%{1}dist(truststore)) = 0.8
+Provides: bundled(python%{1}dist(rich)) = 13.7.1
+Provides: bundled(python%{1}dist(setuptools)) = 69.5.1
+Provides: bundled(python%{1}dist(tenacity)) = 8.2.3
 Provides: bundled(python%{1}dist(tomli)) = 2.0.1
-Provides: bundled(python%{1}dist(typing-extensions)) = 4.7.1
-Provides: bundled(python%{1}dist(urllib3)) = 1.26.17
-Provides: bundled(python%{1}dist(webencodings)) = 0.5.1
+Provides: bundled(python%{1}dist(truststore)) = 0.9.1
+Provides: bundled(python%{1}dist(typing-extensions)) = 4.11
+Provides: bundled(python%{1}dist(urllib3)) = 1.26.18
 }
 
 # Some manylinux1 wheels need libcrypt.so.1.
@@ -224,14 +204,14 @@ ln -s %{python_wheel_dir} tests/data/common_wheels
 
 # Remove windows executable binaries
 rm -v src/pip/_vendor/distlib/*.exe
-sed -i '/\.exe/d' setup.py
+sed -i '/\.exe/d' pyproject.toml
 
 # Remove RIGHT-TO-LEFT OVERRIDE from AUTHORS.txt
 # https://github.com/pypa/pip/pull/12046
 %{python3} -c 'from pathlib import Path; p = Path("AUTHORS.txt"); p.write_text("".join(c for c in p.read_text() if c != "\u202e"))'
 
 # Remove unused test requirements
-sed -Ei '/pytest-(cov|xdist|rerunfailures)/d' tests/requirements.txt
+sed -Ei '/(pytest-(cov|xdist|rerunfailures)|proxy\.py)/d' tests/requirements.txt
 
 
 %if %{with tests}
@@ -323,12 +303,14 @@ install -p %{_pyproject_wheeldir}/%{python_wheel_name} -t %{buildroot}%{python_w
 # bash completion tests only work from installed package
 pytest_k='not completion'
 
-# --deselect'ed tests are not compatible with the latest virtualenv
+# --ignore'd tests are not compatible with the latest virtualenv
 # These files contain almost 500 tests so we should enable them back
 # as soon as pip will be compatible upstream
 # https://github.com/pypa/pip/pull/8441
+# among them, tests/functional/test_proxy.py needs proxy.py which is not
+# yet packaged in Fedora
 %pytest -m 'not network' -k "$(echo $pytest_k)" \
-    --deselect tests/functional --deselect tests/lib/test_lib.py
+    --ignore tests/functional --ignore tests/lib/test_lib.py
 %endif