rpms/python-pip
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update bundled provides to match 20.1.1 and verify it in %check

Browse Source
This commit is contained in:
Miro Hrončok 2020-07-08 10:55:58 +02:00
parent acf982e208
commit 8253bfab57
1 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
python-pip.spec
View File

@ -18,7 +18,7 @@ Name: python-%{srcname}
# When updating, update the bundled libraries versions bellow! # When updating, update the bundled libraries versions bellow!
# You can use vendor_meta.sh in the dist git repo # You can use vendor_meta.sh in the dist git repo
Version: %{base_version}%{?prerel:~%{prerel}} Version: %{base_version}%{?prerel:~%{prerel}}
Release: 4%{?dist} Release: 5%{?dist}
Summary: A tool for installing and managing Python packages Summary: A tool for installing and managing Python packages
# We bundle a lot of libraries with pip, which itself is under MIT license. # We bundle a lot of libraries with pip, which itself is under MIT license.
@ -122,30 +122,32 @@ Packages" or "Pip Installs Python".
# Virtual provides for the packages bundled by pip. # Virtual provides for the packages bundled by pip.
# You can find the versions in src/pip/_vendor/vendor.txt file. # You can generate it with:
# %%{_rpmconfigdir}/pythonbundles.py --namespace 'python%%{1}dist' src/pip/_vendor/vendor.txt
%global bundled() %{expand: %global bundled() %{expand:
Provides: bundled(python%{1}dist(appdirs)) = 1.4.3 Provides: bundled(python%{1}dist(appdirs)) = 1.4.3
Provides: bundled(python%{1}dist(CacheControl)) = 0.12.6 Provides: bundled(python%{1}dist(cachecontrol)) = 0.12.6
Provides: bundled(python%{1}dist(certifi)) = 2019.11.28 Provides: bundled(python%{1}dist(certifi)) = 2020.4.5.1
Provides: bundled(python%{1}dist(chardet)) = 3.0.4 Provides: bundled(python%{1}dist(chardet)) = 3.0.4
Provides: bundled(python%{1}dist(colorama)) = 0.4.3 Provides: bundled(python%{1}dist(colorama)) = 0.4.3
Provides: bundled(python%{1}dist(contextlib2)) = 0.6.0 Provides: bundled(python%{1}dist(contextlib2)) = 0.6^post1
Provides: bundled(python%{1}dist(distlib)) = 0.3.0 Provides: bundled(python%{1}dist(distlib)) = 0.3
Provides: bundled(python%{1}dist(distro)) = 1.4.0 Provides: bundled(python%{1}dist(distro)) = 1.5
Provides: bundled(python%{1}dist(html5lib)) = 1.0.1 Provides: bundled(python%{1}dist(html5lib)) = 1.0.1
Provides: bundled(python%{1}dist(idna)) = 2.8 Provides: bundled(python%{1}dist(idna)) = 2.9
Provides: bundled(python%{1}dist(ipaddress)) = 1.0.23 Provides: bundled(python%{1}dist(ipaddress)) = 1.0.23
Provides: bundled(python%{1}dist(msgpack)) = 0.6.2 Provides: bundled(python%{1}dist(msgpack)) = 1
Provides: bundled(python%{1}dist(packaging)) = 20.1 Provides: bundled(python%{1}dist(packaging)) = 20.3
Provides: bundled(python%{1}dist(pep517)) = 0.7.0 Provides: bundled(python%{1}dist(pep517)) = 0.8.2
Provides: bundled(python%{1}dist(progress)) = 1.5 Provides: bundled(python%{1}dist(progress)) = 1.5
Provides: bundled(python%{1}dist(pyparsing)) = 2.4.6 Provides: bundled(python%{1}dist(pyparsing)) = 2.4.7
Provides: bundled(python%{1}dist(pytoml)) = 0.1.21 Provides: bundled(python%{1}dist(requests)) = 2.23
Provides: bundled(python%{1}dist(requests)) = 2.22.0 Provides: bundled(python%{1}dist(resolvelib)) = 0.3
Provides: bundled(python%{1}dist(retrying)) = 1.3.3 Provides: bundled(python%{1}dist(retrying)) = 1.3.3
Provides: bundled(python%{1}dist(setuptools)) = 44.0.0 Provides: bundled(python%{1}dist(setuptools)) = 44
Provides: bundled(python%{1}dist(six)) = 1.14.0 Provides: bundled(python%{1}dist(six)) = 1.14
Provides: bundled(python%{1}dist(urllib3)) = 1.25.7 Provides: bundled(python%{1}dist(toml)) = 0.10
Provides: bundled(python%{1}dist(urllib3)) = 1.25.8
Provides: bundled(python%{1}dist(webencodings)) = 0.5.1 Provides: bundled(python%{1}dist(webencodings)) = 0.5.1
} }
@ -173,7 +175,9 @@ Summary: A tool for installing and managing Python3 packages
BuildRequires: python%{python3_pkgversion}-devel BuildRequires: python%{python3_pkgversion}-devel
# python3 bootstrap: this is rebuilt before the final build of python3, which # python3 bootstrap: this is rebuilt before the final build of python3, which
# adds the dependency on python3-rpm-generators, so we require it manually # adds the dependency on python3-rpm-generators, so we require it manually
BuildRequires: python%{python3_pkgversion}-rpm-generators # Note that the package prefix is always python3-, even if we build for 3.X
# The minimal version is for bundled provides verification script
BuildRequires: python3-rpm-generators >= 11-8
BuildRequires: python%{python3_pkgversion}-setuptools BuildRequires: python%{python3_pkgversion}-setuptools
BuildRequires: bash-completion BuildRequires: bash-completion
%if %{with tests} %if %{with tests}
@ -342,6 +346,10 @@ install -p dist/%{python_wheelname} -t %{buildroot}%{python_wheeldir}
%if %{with tests} %if %{with tests}
%check %check
# Verify bundled provides are up to date
%{_rpmconfigdir}/pythonbundles.py src/pip/_vendor/vendor.txt --compare-with '%{bundled 3}'
# Upstream tests
# bash completion tests only work from installed package # bash completion tests only work from installed package
# needs unaltered sys.path and we cannot do that in %%check # needs unaltered sys.path and we cannot do that in %%check
# test_pep517_and_build_options # test_pep517_and_build_options
@ -406,6 +414,9 @@ ln -sf %{buildroot}%{_bindir}/pip3 _bin/pip
%{python_wheeldir}/%{python_wheelname} %{python_wheeldir}/%{python_wheelname}
%changelog %changelog
* Wed Jul 08 2020 Miro Hrončok <mhroncok@redhat.com> - 20.1.1-5
- Update bundled provides to match 20.1.1
* Tue Jun 16 2020 Lumír Balhar <lbalhar@redhat.com> - 20.1.1-4 * Tue Jun 16 2020 Lumír Balhar <lbalhar@redhat.com> - 20.1.1-4
- Deselect tests incompatible with the latest virtualenv - Deselect tests incompatible with the latest virtualenv