| |
@@ -113,12 +113,14 @@
|
| |
#global prerel ...
|
| |
%global upstream_version %{general_version}%{?prerel}
|
| |
Version: %{general_version}%{?prerel:~%{prerel}}
|
| |
- Release: 2%{?dist}
|
| |
+ Release: 3%{?dist}
|
| |
License: Python
|
| |
|
| |
# Whether to use RPM build wheels from the python-{pip,setuptools}-wheel package
|
| |
# Uses upstream bundled prebuilt wheels otherwise
|
| |
- %bcond_without rpmwheels
|
| |
+ # pip 20.2.3 deprecated support for Python 3.5 and
|
| |
+ # pip 21.0 will stop support it in January 2021
|
| |
+ %bcond_with rpmwheels
|
| |
|
| |
# =======================
|
| |
# Build-time requirements
|
| |
@@ -374,12 +376,6 @@
|
| |
#
|
| |
# We keep them in /usr/share/python-wheels
|
| |
Patch189: 00189-use-rpm-wheels.patch
|
| |
- # The following versions of setuptools/pip are bundled when this patch is not applied.
|
| |
- # The versions are written in Lib/ensurepip/__init__.py, this patch removes them.
|
| |
- # When the bundled setuptools/pip wheel is updated, the patch no longer applies cleanly.
|
| |
- # In such cases, the patch needs to be amended and the versions updated here:
|
| |
- %global pip_version 9.0.1
|
| |
- %global setuptools_version 28.8.0
|
| |
|
| |
# 00205 # acb31cbf04decda6abbf87ab7682dfcba07433c8
|
| |
# Make LIBPL respect lib64
|
| |
@@ -502,8 +498,30 @@
|
| |
Requires: python-setuptools-wheel
|
| |
Requires: python-pip-wheel
|
| |
%else
|
| |
- Provides: bundled(python3dist(pip)) = %{pip_version}
|
| |
- Provides: bundled(python3dist(setuptools)) = %{setuptools_version}
|
| |
+ # pip, setuptools and their bundled dependencies
|
| |
+ Provides: bundled(python3dist(pip)) = 9.0.1
|
| |
+ Provides: bundled(python3dist(appdirs)) = 1.4.0
|
| |
+ Provides: bundled(python3dist(CacheControl)) = 0.11.7
|
| |
+ Provides: bundled(python3dist(colorama)) = 0.3.7
|
| |
+ Provides: bundled(python3dist(distlib)) = 0.2.4
|
| |
+ Provides: bundled(python3dist(distro)) = 1.0.1
|
| |
+ Provides: bundled(python3dist(html5lib)) = 1.0~b10
|
| |
+ Provides: bundled(python3dist(ipaddress)) = 1.0.17
|
| |
+ Provides: bundled(python3dist(lockfile)) = 0.12.2
|
| |
+ Provides: bundled(python3dist(ordereddict)) = 1.1
|
| |
+ Provides: bundled(python3dist(packaging)) = 16.8
|
| |
+ Provides: bundled(python3dist(progress)) = 1.2
|
| |
+ Provides: bundled(python3dist(pyparsing)) = 2.1.10
|
| |
+ Provides: bundled(python3dist(requests)) = 2.11.1
|
| |
+ Provides: bundled(python3dist(retrying)) = 1.3.3
|
| |
+ Provides: bundled(python3dist(six)) = 1.10.0
|
| |
+ Provides: bundled(python3dist(webencodings)) = 0.5
|
| |
+
|
| |
+ Provides: bundled(python3dist(setuptools)) = 28.8.0
|
| |
+ Provides: bundled(python3dist(appdirs)) = 1.4.0
|
| |
+ Provides: bundled(python3dist(packaging)) = 16.7
|
| |
+ Provides: bundled(python3dist(pyparsing)) = 2.1.10
|
| |
+ Provides: bundled(python3dist(six)) = 1.10.0
|
| |
%endif
|
| |
|
| |
%description
|
| |
@@ -1117,6 +1135,9 @@
|
| |
# ======================================================
|
| |
|
| |
%changelog
|
| |
+ * Thu Oct 22 2020 Lumír Balhar <lbalhar@redhat.com> - 3.5.10-3
|
| |
+ - Use bundled wheels because the latest pip no longer supports Python 3.5
|
| |
+
|
| |
* Mon Oct 05 2020 Miro Hrončok <mhroncok@redhat.com> - 3.5.10-2
|
| |
- Use upstream architecture names on Fedora 34+
|
| |
- https://fedoraproject.org/wiki/Changes/Python_Upstream_Architecture_Names
|
| |
Related to the latest update of pip: https://src.fedoraproject.org/rpms/python-pip/pull-request/72
Let's see whether CI will work.