From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Tue, 23 Jan 2024 15:58:44 +0000 (+0100)
Subject: [3.12] gh-108303: Move `.whl` test files to `Lib/test/wheeldata/` (GH-114343) (#114488)
X-Git-Tag: v3.12.2~104
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=be85f35f12bebc669b0aa1c2e9cdd0624fb32a10;p=thirdparty%2FPython%2Fcpython.git

[3.12] gh-108303: Move `.whl` test files to `Lib/test/wheeldata/` (GH-114343) (#114488)

gh-108303: Move `.whl` test files to `Lib/test/wheeldata/` (GH-114343)
(cherry picked from commit ba253a4794ae2d35a6f6df46a98a1ed38bd61268)

Co-authored-by: Nikita Sobolev <mail@sobolevn.me>
---

diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
index fd9265c93c35..8c4b4e023f63 100644
--- a/Lib/test/support/__init__.py
+++ b/Lib/test/support/__init__.py
@@ -2179,7 +2179,9 @@ def _findwheel(pkgname):
     If set, the wheels are searched for in WHEEL_PKG_DIR (see ensurepip).
     Otherwise, they are searched for in the test directory.
     """
-    wheel_dir = sysconfig.get_config_var('WHEEL_PKG_DIR') or TEST_HOME_DIR
+    wheel_dir = sysconfig.get_config_var('WHEEL_PKG_DIR') or os.path.join(
+        TEST_HOME_DIR, 'wheeldata',
+    )
     filenames = os.listdir(wheel_dir)
     filenames = sorted(filenames, reverse=True)  # approximate "newest" first
     for filename in filenames:
diff --git a/Lib/test/setuptools-67.6.1-py3-none-any.whl b/Lib/test/wheeldata/setuptools-67.6.1-py3-none-any.whl
similarity index 100%
rename from Lib/test/setuptools-67.6.1-py3-none-any.whl
rename to Lib/test/wheeldata/setuptools-67.6.1-py3-none-any.whl
diff --git a/Lib/test/wheel-0.40.0-py3-none-any.whl b/Lib/test/wheeldata/wheel-0.40.0-py3-none-any.whl
similarity index 100%
rename from Lib/test/wheel-0.40.0-py3-none-any.whl
rename to Lib/test/wheeldata/wheel-0.40.0-py3-none-any.whl
diff --git a/Makefile.pre.in b/Makefile.pre.in
index e6f6e6c675a6..7f46f340efe0 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -2241,6 +2241,7 @@ TESTSUBDIRS=	idlelib/idle_test \
 		test/tokenizedata \
 		test/tracedmodules \
 		test/typinganndata \
+		test/wheeldata \
 		test/xmltestdata \
 		test/xmltestdata/c14n-20 \
 		test/ziptestdata