34 lines
1.2 KiB
Diff
34 lines
1.2 KiB
Diff
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
|
|
|
|
This can be removed when Fedora 41 goes EOL (or updates setuptools).
|
|
---
|
|
Lib/test/support/__init__.py | 9 ++++++++-
|
|
1 file changed, 8 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
|
|
index 88f6110351..210ddcdbe3 100644
|
|
--- a/Lib/test/support/__init__.py
|
|
+++ b/Lib/test/support/__init__.py
|
|
@@ -2512,9 +2512,16 @@ def run_command(cmd):
|
|
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,
|
|
)
|
|
run_command(cmd)
|
|
|