From f87ca88524873e1322d1789f2b763d9d102be135 Mon Sep 17 00:00:00 2001 From: Nikita Sobolev Date: Tue, 23 Jan 2024 18:33:12 +0300 Subject: [PATCH] gh-108303: Move `.whl` test files to `Lib/test/wheeldata/` (GH-114343) (cherry picked from commit ba253a4794ae2d35a6f6df46a98a1ed38bd61268) Co-authored-by: Nikita Sobolev --- Lib/test/support/__init__.py | 4 +++- .../setuptools-67.6.1-py3-none-any.whl | Bin .../{ => wheeldata}/wheel-0.40.0-py3-none-any.whl | Bin Makefile.pre.in | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) rename Lib/test/{ => wheeldata}/setuptools-67.6.1-py3-none-any.whl (100%) rename Lib/test/{ => wheeldata}/wheel-0.40.0-py3-none-any.whl (100%) diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py index fd9265c93c35f3..8c4b4e023f633f 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 e6f6e6c675a641..7f46f340efe038 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