public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/python3.12] f45: No longer support RPM wheels with setuptools.whl < 71, drop requirement on wheel.whl
@ 2026-10-26 16:21
0 siblings, 0 replies; only message in thread
From: @ 2026-10-26 16:21 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/python3.12
Branch : f45
Commit : b8723ffb0a3843ccd8e18ab4551bbd0ebe099300
Author : Miro Hrončok <miro@hroncok.cz>
Date : 2026-10-15T13:58:08+02:00
Stats : +11/-48 in 3 file(s)
URL : https://src.fedoraproject.org/rpms/python3.12/c/b8723ffb0a3843ccd8e18ab4551bbd0ebe099300?branch=f45
Log:
No longer support RPM wheels with setuptools.whl < 71, drop requirement on wheel.whl
Fedora 43 has setuptools 78, Fedora 42 had 74.
Fedora 41 had 69, went EOL in December 2025.
---
diff --git a/00461-downstream-only-install-wheel-in-test-venvs-when-setuptools-71.patch b/00461-downstream-only-install-wheel-in-test-venvs-when-setuptools-71.patch
deleted file mode 100644
index 5d1416c..0000000
--- a/00461-downstream-only-install-wheel-in-test-venvs-when-setuptools-71.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
-Date: Fri, 25 Apr 2025 09:33:37 +0200
-Subject: 00461: Downstream only: Install wheel in test venvs when setuptools <
- 71
-
----
- Lib/test/support/__init__.py | 11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
-index cab0f49366..26c0af4b13 100644
---- a/Lib/test/support/__init__.py
-+++ b/Lib/test/support/__init__.py
-@@ -2329,9 +2329,18 @@ def setup_venv_with_pip_setuptools(venv_dir):
- else:
- python = os.path.join(venv, 'bin', python_exe)
-
-+ setuptools_whl = _findwheel('setuptools')
-+ whl_filename = os.path.basename(setuptools_whl)
-+ setuptools_major = int(whl_filename.split('-')[1].split('.')[0])
-+ if setuptools_major >= 71: # we need 70.1+, but that's OK
-+ wheels = (setuptools_whl,)
-+ else:
-+ wheels = (setuptools_whl, _findwheel('wheel'))
-+
- cmd = (python, '-X', 'dev',
- '-m', 'pip', 'install',
-- _findwheel('setuptools'))
-+ *wheels,
-+ )
- if verbose:
- print()
- print('Run:', ' '.join(cmd))
diff --git a/00462-fix-pyssl_seterror-handling-ssl_error_syscall.patch b/00462-fix-pyssl_seterror-handling-ssl_error_syscall.patch
index 93984f2..bdea401 100644
--- a/00462-fix-pyssl_seterror-handling-ssl_error_syscall.patch
+++ b/00462-fix-pyssl_seterror-handling-ssl_error_syscall.patch
@@ -22,10 +22,10 @@ Co-authored-by: Petr Viktorin <encukou@gmail.com>
create mode 100644 Misc/NEWS.d/next/Library/2024-02-18-09-50-31.gh-issue-115627.HGchj0.rst
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
-index b13e37d0cd..daeb8cba74 100644
+index ad2a0989a2..c05d369a29 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
-@@ -2427,16 +2427,18 @@ def run(self):
+@@ -2600,16 +2600,18 @@ def run(self):
self.write(msg.lower())
except OSError as e:
# handles SSLError and socket errors
@@ -53,7 +53,7 @@ index b13e37d0cd..daeb8cba74 100644
try:
self.write(b"ERROR\n")
except OSError:
-@@ -3148,8 +3150,8 @@ def test_wrong_cert_tls13(self):
+@@ -3321,8 +3323,8 @@ def test_wrong_cert_tls13(self):
suppress_ragged_eofs=False) as s:
s.connect((HOST, server.port))
with self.assertRaisesRegex(
@@ -64,7 +64,7 @@ index b13e37d0cd..daeb8cba74 100644
):
# TLS 1.3 perform client cert exchange after handshake
s.write(b'data')
-@@ -4422,8 +4424,8 @@ def msg_cb(conn, direction, version, content_type, msg_type, data):
+@@ -4595,8 +4597,8 @@ def msg_cb(conn, direction, version, content_type, msg_type, data):
# test sometimes fails with EOF error. Test passes as long as
# server aborts connection with an error.
with self.assertRaisesRegex(
@@ -84,7 +84,7 @@ index 0000000000..75d926ab59
+Fix the :mod:`ssl` module error handling of connection terminate by peer.
+It now throws an OSError with the appropriate error code instead of an EOFError.
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
-index aae4dc323d..27dd7bbe11 100644
+index 91ca1362d4..12117f42c0 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -573,7 +573,7 @@ PySSL_ChainExceptions(PySSLSocket *sslsock) {
diff --git a/python3.12.spec b/python3.12.spec
index 0cfc139..488a2c9 100644
--- a/python3.12.spec
+++ b/python3.12.spec
@@ -17,7 +17,7 @@ URL: https://www.python.org/
#global prerel ...
%global upstream_version %{general_version}%{?prerel}
Version: %{general_version}%{?prerel:~%{prerel}}
-Release: 1%{?dist}
+Release: 2%{?dist}
License: Python-2.0.1
@@ -307,8 +307,7 @@ BuildRequires: /usr/sbin/ifconfig
# the first compatible version of pip is 23.1.2.
BuildRequires: %{python_wheel_pkg_prefix}-pip-wheel >= 23.1.2
%if %{with tests}
-BuildRequires: %{python_wheel_pkg_prefix}-setuptools-wheel
-BuildRequires: (%{python_wheel_pkg_prefix}-wheel-wheel if %{python_wheel_pkg_prefix}-setuptools-wheel < 71)
+BuildRequires: %{python_wheel_pkg_prefix}-setuptools-wheel >= 71
%endif
%endif
@@ -383,10 +382,6 @@ Patch371: 00371-revert-bpo-1596321-fix-threading-_shutdown-for-the-main-thread-g
# gh-127906: Add missing sys import to test_cppext
Patch460: 00460-gh-132415-update-vendored-setuptools-in-lib-test-wheeldata.patch
-# 00461 # f7bc103c7bcc6e48789b225e06daf835793e1086
-# Downstream only: Install wheel in test venvs when setuptools < 71
-Patch461: 00461-downstream-only-install-wheel-in-test-venvs-when-setuptools-71.patch
-
# 00462 # 5324dc5f57e0068f7e4f7b2f20006e88ff5f4e47
# Fix PySSL_SetError handling SSL_ERROR_SYSCALL
#
@@ -695,8 +690,7 @@ Requires: %{pkgname} = %{version}-%{release}
Requires: %{pkgname}-libs%{?_isa} = %{version}-%{release}
%if %{with rpmwheels}
-Requires: %{python_wheel_pkg_prefix}-setuptools-wheel
-Requires: (%{python_wheel_pkg_prefix}-wheel-wheel if %{python_wheel_pkg_prefix}-setuptools-wheel < 71)
+Requires: %{python_wheel_pkg_prefix}-setuptools-wheel >= 71
%else
Provides: bundled(python3dist(setuptools)) = %{setuptools_version}
%setuptools_bundled_provides
@@ -1758,6 +1752,9 @@ CheckPython optimized
# ======================================================
%changelog
+* Thu Oct 15 2026 Miro Hrončok <miro@hroncok.cz> - 3.12.15-2
+- No longer support RPM wheels with setuptools.whl < 71, drop requirement on wheel.whl
+
* Thu Oct 01 2026 Tomáš Hrnčiar <thrnciar@redhat.com> - 3.12.15-1
- Update to 3.12.15
- Security fix for CVE-2026-15310
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-10-26 16:21 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-10-26 16:21 [rpms/python3.12] f45: No longer support RPM wheels with setuptools.whl < 71, drop requirement on wheel.whl
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox