Update to 22.2
Resolves: rhbz#2109468
This commit is contained in:
parent
3e8bb70757
commit
6300db47ba
6 changed files with 56 additions and 135 deletions
|
|
@ -13,7 +13,7 @@
|
|||
%endif
|
||||
|
||||
%global srcname pip
|
||||
%global base_version 22.0.4
|
||||
%global base_version 22.2
|
||||
%global upstream_version %{base_version}%{?prerel}
|
||||
%global python_wheel_name %{srcname}-%{upstream_version}-py3-none-any.whl
|
||||
|
||||
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
Name: python-%{srcname}
|
||||
Version: %{base_version}%{?prerel:~%{prerel}}
|
||||
Release: 5%{?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.
|
||||
|
|
@ -89,10 +89,6 @@ Patch: nowarn-pip._internal.main.patch
|
|||
# Upstream issue: https://github.com/pypa/packaging/issues/368
|
||||
Patch: no-version-warning.patch
|
||||
|
||||
# Fallback to pep517 if setup.py is present and setuptools cannot be imported
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=2020635
|
||||
Patch: https://github.com/pypa/pip/commit/452d7da880.patch
|
||||
|
||||
# Downstream only patch
|
||||
# Users might have local installations of pip from using
|
||||
# `pip install --user --upgrade pip` on older/newer versions.
|
||||
|
|
@ -128,30 +124,28 @@ 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.12.10
|
||||
Provides: bundled(python%{1}dist(certifi)) = 2021.10.8
|
||||
Provides: bundled(python%{1}dist(chardet)) = 4
|
||||
Provides: bundled(python%{1}dist(colorama)) = 0.4.4
|
||||
Provides: bundled(python%{1}dist(distlib)) = 0.3.3
|
||||
Provides: bundled(python%{1}dist(distro)) = 1.6
|
||||
Provides: bundled(python%{1}dist(html5lib)) = 1.1
|
||||
Provides: bundled(python%{1}dist(cachecontrol)) = 0.12.11
|
||||
Provides: bundled(python%{1}dist(certifi)) = 2022.6.15
|
||||
Provides: bundled(python%{1}dist(chardet)) = 5
|
||||
Provides: bundled(python%{1}dist(colorama)) = 0.4.5
|
||||
Provides: bundled(python%{1}dist(distlib)) = 0.3.5
|
||||
Provides: bundled(python%{1}dist(distro)) = 1.7
|
||||
Provides: bundled(python%{1}dist(idna)) = 3.3
|
||||
Provides: bundled(python%{1}dist(msgpack)) = 1.0.3
|
||||
Provides: bundled(python%{1}dist(msgpack)) = 1.0.4
|
||||
Provides: bundled(python%{1}dist(packaging)) = 21.3
|
||||
Provides: bundled(python%{1}dist(pep517)) = 0.12
|
||||
Provides: bundled(python%{1}dist(platformdirs)) = 2.4.1
|
||||
Provides: bundled(python%{1}dist(progress)) = 1.6
|
||||
Provides: bundled(python%{1}dist(pygments)) = 2.11.2
|
||||
Provides: bundled(python%{1}dist(pyparsing)) = 3.0.7
|
||||
Provides: bundled(python%{1}dist(requests)) = 2.27.1
|
||||
Provides: bundled(python%{1}dist(platformdirs)) = 2.5.2
|
||||
Provides: bundled(python%{1}dist(pygments)) = 2.12
|
||||
Provides: bundled(python%{1}dist(pyparsing)) = 3.0.9
|
||||
Provides: bundled(python%{1}dist(requests)) = 2.28.1
|
||||
Provides: bundled(python%{1}dist(resolvelib)) = 0.8.1
|
||||
Provides: bundled(python%{1}dist(rich)) = 11
|
||||
Provides: bundled(python%{1}dist(rich)) = 12.5.1
|
||||
Provides: bundled(python%{1}dist(setuptools)) = 44
|
||||
Provides: bundled(python%{1}dist(six)) = 1.16
|
||||
Provides: bundled(python%{1}dist(tenacity)) = 8.0.1
|
||||
Provides: bundled(python%{1}dist(tomli)) = 1.0.3
|
||||
Provides: bundled(python%{1}dist(typing-extensions)) = 4.0.1
|
||||
Provides: bundled(python%{1}dist(urllib3)) = 1.26.8
|
||||
Provides: bundled(python%{1}dist(tomli)) = 2.0.1
|
||||
Provides: bundled(python%{1}dist(typing-extensions)) = 4.3
|
||||
Provides: bundled(python%{1}dist(urllib3)) = 1.26.10
|
||||
Provides: bundled(python%{1}dist(webencodings)) = 0.5.1
|
||||
}
|
||||
|
||||
|
|
@ -270,9 +264,6 @@ sed -i '/"sphinxcontrib.towncrier",/d' docs/html/conf.py
|
|||
# tests expect wheels in here
|
||||
ln -s %{python_wheel_dir} tests/data/common_wheels
|
||||
|
||||
# Remove shebang from files in bundled chardet
|
||||
grep -lr "^#\!/usr/bin/env python" src/pip/_vendor/chardet/ | xargs sed -i "1d"
|
||||
|
||||
# Remove windows executable binaries
|
||||
rm -v src/pip/_vendor/distlib/*.exe
|
||||
sed -i '/\.exe/d' setup.py
|
||||
|
|
@ -411,6 +402,10 @@ pytest_k='not completion and
|
|||
%{python_wheel_dir}/%{python_wheel_name}
|
||||
|
||||
%changelog
|
||||
* Fri Jul 22 2022 Charalampos Stratakis <cstratak@redhat.com> - 22.2-1
|
||||
- Update to 22.2
|
||||
Resolves: rhbz#2109468
|
||||
|
||||
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 22.0.4-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue