Update to 25.3
- Fixes: rhbz#2406299
This commit is contained in:
Miro Hrončok
parent
1f462a281f
commit
2b2a030e77
3 changed files with 18 additions and 43 deletions
|
|
@ -6,7 +6,7 @@
|
|||
%bcond man 1
|
||||
|
||||
%global srcname pip
|
||||
%global base_version 25.2
|
||||
%global base_version 25.3
|
||||
%global upstream_version %{base_version}%{?prerel}
|
||||
%global python_wheel_name %{srcname}-%{upstream_version}-py3-none-any.whl
|
||||
|
||||
|
|
@ -57,12 +57,16 @@ Source1: https://files.pythonhosted.org/packages/0d/6d/b4752b044bf94cb802
|
|||
# See https://github.com/pypa/pip/pull/13382 as an attempt to drop the requirement from pip tests.
|
||||
Source2: https://files.pythonhosted.org/packages/0b/2c/87f3254fd8ffd29e4c02732eee68a83a1d3c346ae39bc6822dcbcb697f2b/wheel-0.45.1-py3-none-any.whl
|
||||
|
||||
# flit_core.whl
|
||||
# This is not built as RPM-packaged wheel in Fedora at all.
|
||||
Source3: https://files.pythonhosted.org/packages/f2/65/b6ba90634c984a4fcc02c7e3afe523fef500c4980fec67cc27536ee50acf/flit_core-3.12.0-py3-none-any.whl
|
||||
|
||||
# coverage.whl
|
||||
# There is no RPM-packaged python-coverage-wheel, the package is archful.
|
||||
# Upstream uses this to measure coverage, which we don't.
|
||||
# This is a dummy placeholder package that only contains empty coverage.process_startup().
|
||||
# That way, we don't need to patch the usage out of conftest.py.
|
||||
Source3: coverage-0-py3-none-any.whl
|
||||
Source4: coverage-0-py3-none-any.whl
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
|
|
@ -93,10 +97,6 @@ Patch: remove-existing-dist-only-if-path-conflicts.patch
|
|||
# The same patch is a part of the RPM-packaged python-certifi
|
||||
Patch: dummy-certifi.patch
|
||||
|
||||
# https://fedoraproject.org/wiki/Changes/dropingOfCertPemFile
|
||||
# https://github.com/sethmlarson/truststore/pull/183
|
||||
Patch: truststore-pem-path.patch
|
||||
|
||||
# pytest-subket has been introduced to intercept network calls
|
||||
# https://github.com/pypa/pip/commit/a4b40f62332ccb3228b12cc5ae1493c75177247a
|
||||
# We don't need a layer to check that, as we're by default in an offline environment
|
||||
|
|
@ -124,23 +124,23 @@ Packages" or "Pip Installs Python".
|
|||
# %%{_rpmconfigdir}/pythonbundles.py --namespace 'python%%{1}dist' src/pip/_vendor/vendor.txt
|
||||
%global bundled() %{expand:
|
||||
Provides: bundled(python%{1}dist(cachecontrol)) = 0.14.3
|
||||
Provides: bundled(python%{1}dist(certifi)) = 2025.7.14
|
||||
Provides: bundled(python%{1}dist(certifi)) = 2025.10.5
|
||||
Provides: bundled(python%{1}dist(dependency-groups)) = 1.3.1
|
||||
Provides: bundled(python%{1}dist(distlib)) = 0.4
|
||||
Provides: bundled(python%{1}dist(distro)) = 1.9
|
||||
Provides: bundled(python%{1}dist(idna)) = 3.10
|
||||
Provides: bundled(python%{1}dist(msgpack)) = 1.1.1
|
||||
Provides: bundled(python%{1}dist(msgpack)) = 1.1.2
|
||||
Provides: bundled(python%{1}dist(packaging)) = 25
|
||||
Provides: bundled(python%{1}dist(platformdirs)) = 4.3.8
|
||||
Provides: bundled(python%{1}dist(platformdirs)) = 4.5
|
||||
Provides: bundled(python%{1}dist(pygments)) = 2.19.2
|
||||
Provides: bundled(python%{1}dist(pyproject-hooks)) = 1.2
|
||||
Provides: bundled(python%{1}dist(requests)) = 2.32.4
|
||||
Provides: bundled(python%{1}dist(resolvelib)) = 1.2
|
||||
Provides: bundled(python%{1}dist(rich)) = 14.1
|
||||
Provides: bundled(python%{1}dist(requests)) = 2.32.5
|
||||
Provides: bundled(python%{1}dist(resolvelib)) = 1.2.1
|
||||
Provides: bundled(python%{1}dist(rich)) = 14.2
|
||||
Provides: bundled(python%{1}dist(setuptools)) = 70.3
|
||||
Provides: bundled(python%{1}dist(tomli)) = 2.2.1
|
||||
Provides: bundled(python%{1}dist(tomli)) = 2.3
|
||||
Provides: bundled(python%{1}dist(tomli-w)) = 1.2
|
||||
Provides: bundled(python%{1}dist(truststore)) = 0.10.1
|
||||
Provides: bundled(python%{1}dist(truststore)) = 0.10.4
|
||||
Provides: bundled(python%{1}dist(urllib3)) = 1.26.20
|
||||
}
|
||||
|
||||
|
|
@ -175,7 +175,7 @@ BuildRequires: python%{python3_pkgversion}-devel
|
|||
# The minimal version is for bundled provides verification script
|
||||
BuildRequires: python3-rpm-generators >= 11-8
|
||||
BuildRequires: pyproject-rpm-macros
|
||||
BuildRequires: python%{python3_pkgversion}-setuptools
|
||||
BuildRequires: python%{python3_pkgversion}-flit-core
|
||||
BuildRequires: bash-completion
|
||||
BuildRequires: ca-certificates
|
||||
Requires: ca-certificates
|
||||
|
|
@ -229,7 +229,7 @@ sed -Ei '/(--disable-socket|--allow-unix-socket|--allow-hosts=localhost)/d' pypr
|
|||
%if %{with tests}
|
||||
# tests expect wheels in here
|
||||
mkdir tests/data/common_wheels
|
||||
cp -a %{SOURCE1} %{SOURCE2} %{SOURCE3} tests/data/common_wheels
|
||||
cp -a %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} tests/data/common_wheels
|
||||
%endif
|
||||
|
||||
|
||||
|
|
|
|||
3
sources
3
sources
|
|
@ -1,4 +1,5 @@
|
|||
SHA512 (pip-25.2.tar.gz) = 5cc65c9091fdda7905e26ce32ddaa3a1c2fd287d69fd3da67c814ba7e8e5be59301d8327c06cdca78c1b95f4a5b5f75c87f36a549022408cc0e8f9411c0db11e
|
||||
SHA512 (pip-25.3.tar.gz) = f50db092213ec3bb819d3da5669f73d119b5ec7f7ac5e8a587a17c27eafa32bc17a057df09389c526a3769ef3577f5553187d54ceffa89aed63f4b4498ff044e
|
||||
SHA512 (setuptools-79.0.1-py3-none-any.whl) = fef6cfc6f95a5bb7320f1680e1c665cb8d9a4e4227cde4d8aab8a50bed4bcf04320085b9d7d5343359f887008db5c5a861e57f3d08b7b0b2311a28adaeee6b4a
|
||||
SHA512 (wheel-0.45.1-py3-none-any.whl) = 86c16248ec804ee0ac95d43b03d47351dceb534d0cdc4025ca1eb073e39e539de44c870b9261f0373144e1537f0e42675a759a318a8d5d346bbd9efcb704061d
|
||||
SHA512 (flit_core-3.12.0-py3-none-any.whl) = 790c12b1f43201e365fb3f8f2f0a54e1a578876799dfdf8bfeea679a25ea096bf62946d006618c1458ae6e37ce6d00998f37e9aba426d5ab80d32ef2d75da4e0
|
||||
SHA512 (coverage-0-py3-none-any.whl) = e734192565347010efe68f8ba600254259c9b647f3c553fd4e5d87b1d7f955cb15d6f7d807716f4a6415d239beed945fbec7210feaf502e9cc849c332845926e
|
||||
|
|
|
|||
|
|
@ -1,26 +0,0 @@
|
|||
From 2c8231f03987daaf9524f9568884a7b296480b32 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
|
||||
Date: Thu, 17 Jul 2025 09:50:35 +0200
|
||||
Subject: [PATCH] Fedora 43 removes some symbolic links
|
||||
|
||||
See https://fedoraproject.org/wiki/Changes/dropingOfCertPemFile
|
||||
---
|
||||
src/pip/_vendor/truststore/_openssl.py | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/pip/_vendor/truststore/_openssl.py b/src/pip/_vendor/truststore/_openssl.py
|
||||
index 9951cf7..3e25a56 100644
|
||||
--- a/src/pip/_vendor/truststore/_openssl.py
|
||||
+++ b/src/pip/_vendor/truststore/_openssl.py
|
||||
@@ -6,8 +6,10 @@
|
||||
|
||||
# candidates based on https://github.com/tiran/certifi-system-store by Christian Heimes
|
||||
_CA_FILE_CANDIDATES = [
|
||||
- # Alpine, Arch, Fedora 34+, OpenWRT, RHEL 9+, BSD
|
||||
+ # Alpine, Arch, Fedora 34-42, OpenWRT, RHEL 9-10, BSD
|
||||
"/etc/ssl/cert.pem",
|
||||
+ # Fedora 43+, RHEL 11+
|
||||
+ "/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem",
|
||||
# Fedora <= 34, RHEL <= 9, CentOS <= 9
|
||||
"/etc/pki/tls/cert.pem",
|
||||
# Debian, Ubuntu (requires ca-certificates)
|
||||
Loading…
Add table
Add a link
Reference in a new issue