Update to 21.0 (#1919530)
This commit is contained in:
parent
b650cd95c0
commit
093819ce2e
3 changed files with 71 additions and 56 deletions
|
|
@ -13,16 +13,16 @@
|
|||
%endif
|
||||
|
||||
%global srcname pip
|
||||
%global base_version 20.3.3
|
||||
%global base_version 21.0
|
||||
%global upstream_version %{base_version}%{?prerel}
|
||||
%global python_wheelname %{srcname}-%{upstream_version}-py2.py3-none-any.whl
|
||||
%global python_wheelname %{srcname}-%{upstream_version}-py3-none-any.whl
|
||||
%global python_wheeldir %{_datadir}/python-wheels
|
||||
|
||||
%global bashcompdir %(pkg-config --variable=completionsdir bash-completion 2>/dev/null)
|
||||
|
||||
Name: python-%{srcname}
|
||||
Version: %{base_version}%{?prerel:~%{prerel}}
|
||||
Release: 3%{?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.
|
||||
|
|
@ -130,22 +130,21 @@ Packages" or "Pip Installs Python".
|
|||
%global bundled() %{expand:
|
||||
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.11.8
|
||||
Provides: bundled(python%{1}dist(chardet)) = 3.0.4
|
||||
Provides: bundled(python%{1}dist(certifi)) = 2020.12.5
|
||||
Provides: bundled(python%{1}dist(chardet)) = 4
|
||||
Provides: bundled(python%{1}dist(colorama)) = 0.4.4
|
||||
Provides: bundled(python%{1}dist(contextlib2)) = 0.6^post1
|
||||
Provides: bundled(python%{1}dist(distlib)) = 0.3.1
|
||||
Provides: bundled(python%{1}dist(distro)) = 1.5
|
||||
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(msgpack)) = 1.0.2
|
||||
Provides: bundled(python%{1}dist(packaging)) = 20.8
|
||||
Provides: bundled(python%{1}dist(pep517)) = 0.9.1
|
||||
Provides: bundled(python%{1}dist(progress)) = 1.5
|
||||
Provides: bundled(python%{1}dist(pyparsing)) = 2.4.7
|
||||
Provides: bundled(python%{1}dist(requests)) = 2.25
|
||||
Provides: bundled(python%{1}dist(resolvelib)) = 0.5.3
|
||||
Provides: bundled(python%{1}dist(requests)) = 2.25.1
|
||||
Provides: bundled(python%{1}dist(resolvelib)) = 0.5.4
|
||||
Provides: bundled(python%{1}dist(retrying)) = 1.3.3
|
||||
Provides: bundled(python%{1}dist(setuptools)) = 44
|
||||
Provides: bundled(python%{1}dist(six)) = 1.15
|
||||
|
|
@ -256,13 +255,14 @@ rm src/pip/_vendor/certifi/*.pem
|
|||
# furo is not available in Fedora
|
||||
sed -i '/html_theme = "furo"/d' docs/html/conf.py
|
||||
|
||||
# towncrier extension for Sphinx is not yet available in Fedora
|
||||
sed -i "/'sphinxcontrib.towncrier',/d" docs/html/conf.py
|
||||
|
||||
# tests expect wheels in here
|
||||
ln -s %{python_wheeldir} tests/data/common_wheels
|
||||
|
||||
# Upstream uses a Python 2/3 compatibility library for csv with Python 3 semantics in tests
|
||||
# We only target Python 3 and csv23 is not (yet) packaged
|
||||
# As of 20.1b1, this workaround was sufficient to get around the missing dependency
|
||||
sed -i -e 's/csv23/csv/g' tests/lib/wheel.py
|
||||
# Remove shebang from files in bundled chardet
|
||||
grep -lr "^#\!/usr/bin/env python" src/pip/_vendor/chardet/ | xargs sed -i "1d"
|
||||
|
||||
|
||||
%build
|
||||
|
|
@ -398,6 +398,9 @@ pytest_k='not completion and
|
|||
%{python_wheeldir}/%{python_wheelname}
|
||||
|
||||
%changelog
|
||||
* Tue Jan 26 2021 Lumír Balhar <lbalhar@redhat.com> - 21.0-1
|
||||
- Update to 21.0 (#1919530)
|
||||
|
||||
* Thu Dec 17 2020 Petr Viktorin <pviktori@redhat.com> - 20.3.3-1
|
||||
- Update to 20.3.3
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue