Update to 19.3.1 (#1761508)
Drop upstreamed patch that fixed expected output in test to not break with alpha/beta/rc Python versions
This commit is contained in:
Tomas Orsava
Miro Hrončok
parent
3bced42530
commit
f6e9c0640b
8 changed files with 806 additions and 110 deletions
|
|
@ -15,35 +15,35 @@
|
|||
Name: python-%{srcname}
|
||||
# When updating, update the bundled libraries versions bellow!
|
||||
# You can use vendor_meta.sh in the dist git repo
|
||||
Version: 19.2.3
|
||||
Release: 2%{?dist}
|
||||
Version: 19.3.1
|
||||
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.
|
||||
# Here is the list of the libraries with corresponding licenses:
|
||||
|
||||
# appdirs: MIT
|
||||
# certifi: MPLv2.0
|
||||
# chardet: LGPLv2
|
||||
# colorama: BSD
|
||||
# CacheControl: ASL 2.0
|
||||
# contextlib2: Python
|
||||
# distlib: Python
|
||||
# distro: ASL 2.0
|
||||
# html5lib: MIT
|
||||
# six: MIT
|
||||
# colorama: BSD
|
||||
# CacheControl: ASL 2.0
|
||||
# msgpack-python: ASL 2.0
|
||||
# lockfile: MIT
|
||||
# progress: ISC
|
||||
# idna: BSD
|
||||
# ipaddress: Python
|
||||
# msgpack: ASL 2.0
|
||||
# packaging: ASL 2.0 or BSD
|
||||
# pep517: MIT
|
||||
# progress: ISC
|
||||
# pyparsing: MIT
|
||||
# pytoml: MIT
|
||||
# retrying: ASL 2.0
|
||||
# requests: ASL 2.0
|
||||
# chardet: LGPLv2
|
||||
# idna: BSD
|
||||
# urllib3: MIT
|
||||
# certifi: MPLv2.0
|
||||
# retrying: ASL 2.0
|
||||
# setuptools: MIT
|
||||
# six: MIT
|
||||
# urllib3: MIT
|
||||
# webencodings: BSD
|
||||
|
||||
License: MIT and Python and ASL 2.0 and BSD and ISC and LGPLv2 and MPLv2.0 and (ASL 2.0 or BSD)
|
||||
|
|
@ -62,6 +62,7 @@ BuildRequires: python-wheel-wheel
|
|||
|
||||
# to get tests:
|
||||
# git clone https://github.com/pypa/pip && cd pip
|
||||
# VERSION= # define the version you want
|
||||
# git checkout $VERSION && tar -czvf ../pip-$VERSION-tests.tar.gz tests/
|
||||
%if %{with tests}
|
||||
Source1: pip-%{version}-tests.tar.gz
|
||||
|
|
@ -73,9 +74,6 @@ Source2: https://github.com/pypa/pypa-docs-theme/archive/%{pypa_theme_com
|
|||
Source3: https://github.com/python/python-docs-theme/archive/2018.2.tar.gz
|
||||
%endif
|
||||
|
||||
# Fix expected output in test to not break with alpha/beta/rc Python versions
|
||||
Patch0: https://github.com/pypa/pip/pull/6788.patch
|
||||
|
||||
# Downstream only patch
|
||||
# Emit a warning to the user if pip install is run with root privileges
|
||||
# Issue upstream: https://github.com/pypa/pip/issues/4288
|
||||
|
|
@ -93,6 +91,12 @@ Patch3: remove-existing-dist-only-if-path-conflicts.patch
|
|||
# https://bugzilla.redhat.com/show_bug.cgi?id=1655253
|
||||
Patch4: dummy-certifi.patch
|
||||
|
||||
%if %{with tests}
|
||||
# Mark tests that need the Internet as network tests so we can skip them
|
||||
# https://github.com/pypa/pip/pull/7359
|
||||
Patch5: network-tests.patch
|
||||
%endif
|
||||
|
||||
# Downstream only patch
|
||||
# Users might have local installations of pip from using
|
||||
# `pip install --user --upgrade pip` on older/newer versions.
|
||||
|
|
@ -125,26 +129,26 @@ Packages" or "Pip Installs Python".
|
|||
%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)) = 2019.6.16
|
||||
Provides: bundled(python%{1}dist(certifi)) = 2019.9.11
|
||||
Provides: bundled(python%{1}dist(chardet)) = 3.0.4
|
||||
Provides: bundled(python%{1}dist(colorama)) = 0.4.1
|
||||
Provides: bundled(python%{1}dist(contextlib2)) = 0.6.0
|
||||
Provides: bundled(python%{1}dist(distlib)) = 0.2.9.post0
|
||||
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
|
||||
Provides: bundled(python%{1}dist(lockfile)) = 0.12.2
|
||||
Provides: bundled(python%{1}dist(msgpack)) = 0.6.1
|
||||
Provides: bundled(python%{1}dist(packaging)) = 19.0
|
||||
Provides: bundled(python%{1}dist(pep517)) = 0.5.0
|
||||
Provides: bundled(python%{1}dist(msgpack)) = 0.6.2
|
||||
Provides: bundled(python%{1}dist(packaging)) = 19.2
|
||||
Provides: bundled(python%{1}dist(pep517)) = 0.7.0
|
||||
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(pyparsing)) = 2.4.2
|
||||
Provides: bundled(python%{1}dist(pytoml)) = 0.1.21
|
||||
Provides: bundled(python%{1}dist(requests)) = 2.22.0
|
||||
Provides: bundled(python%{1}dist(retrying)) = 1.3.3
|
||||
Provides: bundled(python%{1}dist(setuptools)) = 41.0.1
|
||||
Provides: bundled(python%{1}dist(setuptools)) = 41.4.0
|
||||
Provides: bundled(python%{1}dist(six)) = 1.12.0
|
||||
Provides: bundled(python%{1}dist(urllib3)) = 1.25.3
|
||||
Provides: bundled(python%{1}dist(urllib3)) = 1.25.6
|
||||
Provides: bundled(python%{1}dist(webencodings)) = 0.5.1
|
||||
}
|
||||
|
||||
|
|
@ -243,11 +247,13 @@ mv python-docs-theme-2018.2 python-docs-theme
|
|||
popd
|
||||
%endif
|
||||
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%if %{with tests}
|
||||
%patch5 -p1
|
||||
%endif
|
||||
|
||||
# this goes together with patch4
|
||||
rm src/pip/_vendor/certifi/*.pem
|
||||
|
|
@ -376,6 +382,10 @@ ln -sf %{buildroot}%{_bindir}/pip3 _bin/pip
|
|||
%{python_wheeldir}/%{python_wheelname}
|
||||
|
||||
%changelog
|
||||
* Mon Nov 04 2019 Tomas Orsava <torsava@redhat.com> - 19.3.1-1
|
||||
- Update to 19.3.1 (#1761508)
|
||||
- Drop upstreamed patch that fixed expected output in test to not break with alpha/beta/rc Python versions
|
||||
|
||||
* Wed Oct 30 2019 Miro Hrončok <mhroncok@redhat.com> - 19.2.3-2
|
||||
- Make /usr/bin/pip(3) work with user-installed pip 19.3+ (#1767212)
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue