Update to 19.1 (#1702525)

This commit is contained in:
Miro Hrončok 2019-04-25 15:32:31 +02:00
commit a2422cfdac
5 changed files with 25 additions and 60 deletions

View file

@ -22,7 +22,7 @@
Name: python-%{srcname}
# When updating, update the bundled libraries versions bellow!
# You can use vendor_meta.sh in the dist git repo
Version: 19.0.3
Version: 19.1
Release: 1%{?dist}
Summary: A tool for installing and managing Python packages
@ -101,9 +101,6 @@ Patch3: remove-existing-dist-only-if-path-conflicts.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1655253
Patch4: dummy-certifi.patch
# pytest 4 support
Patch5: https://github.com/pypa/pip/commit/d4264dc3b2ab292c9843fb1d001c7fc0a5fc67c4.patch
# Downstream only patch
# Users might have local installations of pip from using
# `pip install --user --upgrade pip` on older versions.
@ -131,15 +128,15 @@ Packages" or "Pip Installs Python".
# Virtual provides for the packages bundled by pip.
# You can find the versions in pip/_vendor/vendor.txt file.
# You can find the versions in src/pip/_vendor/vendor.txt file.
%global bundled() %{expand:
Provides: bundled(python%{1}dist(appdirs)) = 1.4.3
Provides: bundled(python%{1}dist(CacheControl)) = 0.12.5
Provides: bundled(python%{1}dist(certifi)) = 2018.11.29
Provides: bundled(python%{1}dist(certifi)) = 2019.3.9
Provides: bundled(python%{1}dist(chardet)) = 3.0.4
Provides: bundled(python%{1}dist(colorama)) = 0.4.1
Provides: bundled(python%{1}dist(distlib)) = 0.2.8
Provides: bundled(python%{1}dist(distro)) = 1.3.0
Provides: bundled(python%{1}dist(distro)) = 1.4.0
Provides: bundled(python%{1}dist(html5lib)) = 1.0.1
Provides: bundled(python%{1}dist(idna)) = 2.8
Provides: bundled(python%{1}dist(ipaddress)) = 1.0.22
@ -147,12 +144,12 @@ Provides: bundled(python%{1}dist(lockfile)) = 0.12.2
Provides: bundled(python%{1}dist(msgpack)) = 0.5.6
Provides: bundled(python%{1}dist(packaging)) = 19.0
Provides: bundled(python%{1}dist(pep517)) = 0.5.0
Provides: bundled(python%{1}dist(progress)) = 1.4
Provides: bundled(python%{1}dist(pyparsing)) = 2.3.1
Provides: bundled(python%{1}dist(progress)) = 1.5
Provides: bundled(python%{1}dist(pyparsing)) = 2.4.0
Provides: bundled(python%{1}dist(pytoml)) = 0.1.20
Provides: bundled(python%{1}dist(requests)) = 2.21.0
Provides: bundled(python%{1}dist(retrying)) = 1.3.3
Provides: bundled(python%{1}dist(setuptools)) = 40.6.3
Provides: bundled(python%{1}dist(setuptools)) = 41.0.1
Provides: bundled(python%{1}dist(six)) = 1.12.0
Provides: bundled(python%{1}dist(urllib3)) = 1.24.1
Provides: bundled(python%{1}dist(webencodings)) = 0.5.1
@ -275,7 +272,6 @@ popd
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
# this goes together with patch4
rm src/pip/_vendor/certifi/*.pem
@ -416,14 +412,15 @@ install -p dist/%{python_wheelname} -t %{buildroot}%{python_wheeldir}
%if %{with tests}
%check
# bash completion tests only work from installed package
# needs network https://github.com/pypa/pip/pull/6263
# test_constraints_local_editable_install_pep518
# test_pep517_wheels_are_not_confused_with_other_files
# test_upgrade_argparse_shadowed
# needs unaltered sys.path and we cannot do that in %%check
# test_pep517_and_build_options
# test_config_file_venv_option
# TODO investigate failures
# test_uninstall_non_local_distutils
# test_venv_modification
%global pytest_k 'not completion and not test_constraints_local_editable_install_pep518 and not test_pep517_wheels_are_not_confused_with_other_files and not test_upgrade_argparse_shadowed and not test_uninstall_non_local_distutils and not test_venv_modification'
pytest_k='not completion and
not test_pep517_and_build_options and
not test_config_file_venv_option and
not test_uninstall_non_local_distutils'
mkdir _bin
export PATH="$PWD/_bin:$PATH"
@ -431,13 +428,13 @@ export PATH="$PWD/_bin:$PATH"
%if %{with python2}
export PYTHONPATH=%{buildroot}%{python2_sitelib}
ln -s %{buildroot}%{_bindir}/pip2 _bin/pip
%{__python2} -m pytest -m 'not network' -k %{pytest_k}
%{__python2} -m pytest -m 'not network' -k "$(echo $pytest_k)"
%endif
export PYTHONPATH=%{buildroot}%{python3_sitelib}
ln -sf %{buildroot}%{_bindir}/pip3 _bin/pip
%{__python3} -m pytest -m 'not network' -k %{pytest_k}
%{__python3} -m pytest -m 'not network' -k "$(echo $pytest_k)"
%endif
@ -496,6 +493,9 @@ ln -sf %{buildroot}%{_bindir}/pip3 _bin/pip
%endif
%changelog
* Thu Apr 25 2019 Miro Hrončok <mhroncok@redhat.com> - 19.1-1
- Update to 19.1 (#1702525)
* Wed Mar 06 2019 Miro Hrončok <mhroncok@redhat.com> - 19.0.3-1
- Update to 19.0.3 (#1679277)