From 66e3ecca49bd6e2a6208d4f19ee7514e8de4befc Mon Sep 17 00:00:00 2001 From: sobolevn Date: Sat, 20 Jan 2024 14:42:01 +0300 Subject: [PATCH 1/3] gh-108303: Move `.whl` test files to `Lib/test/whldata/` --- Lib/test/support/__init__.py | 4 +++- .../setuptools-67.6.1-py3-none-any.whl | Bin .../{ => whldata}/wheel-0.40.0-py3-none-any.whl | Bin 3 files changed, 3 insertions(+), 1 deletion(-) rename Lib/test/{ => whldata}/setuptools-67.6.1-py3-none-any.whl (100%) rename Lib/test/{ => whldata}/wheel-0.40.0-py3-none-any.whl (100%) diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py index 8344dd1849c61d..afdaaf8f04409d 100644 --- a/Lib/test/support/__init__.py +++ b/Lib/test/support/__init__.py @@ -2193,7 +2193,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, 'whldata', + ) 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/whldata/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/whldata/setuptools-67.6.1-py3-none-any.whl diff --git a/Lib/test/wheel-0.40.0-py3-none-any.whl b/Lib/test/whldata/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/whldata/wheel-0.40.0-py3-none-any.whl From aa7612595d9b5b6a6bcb912ee4e5bd696601cfc5 Mon Sep 17 00:00:00 2001 From: sobolevn Date: Tue, 23 Jan 2024 12:04:38 +0300 Subject: [PATCH 2/3] Rename to `wheeldata/` --- Lib/test/support/__init__.py | 2 +- .../setuptools-67.6.1-py3-none-any.whl | Bin .../wheel-0.40.0-py3-none-any.whl | Bin 3 files changed, 1 insertion(+), 1 deletion(-) rename Lib/test/{whldata => wheeldata}/setuptools-67.6.1-py3-none-any.whl (100%) rename Lib/test/{whldata => 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 afdaaf8f04409d..f2e6af078a5f29 100644 --- a/Lib/test/support/__init__.py +++ b/Lib/test/support/__init__.py @@ -2194,7 +2194,7 @@ def _findwheel(pkgname): Otherwise, they are searched for in the test directory. """ wheel_dir = sysconfig.get_config_var('WHEEL_PKG_DIR') or os.path.join( - TEST_HOME_DIR, 'whldata', + TEST_HOME_DIR, 'wheeldata', ) filenames = os.listdir(wheel_dir) filenames = sorted(filenames, reverse=True) # approximate "newest" first diff --git a/Lib/test/whldata/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/whldata/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/whldata/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/whldata/wheel-0.40.0-py3-none-any.whl rename to Lib/test/wheeldata/wheel-0.40.0-py3-none-any.whl From 6618982afc81f54960da323ebdfb8101f0cad874 Mon Sep 17 00:00:00 2001 From: sobolevn Date: Tue, 23 Jan 2024 17:29:48 +0300 Subject: [PATCH 3/3] Add it to `Makefile` --- Makefile.pre.in | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.pre.in b/Makefile.pre.in index d251e7c481b52b..55282e5bcc22d2 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -2317,6 +2317,7 @@ TESTSUBDIRS= idlelib/idle_test \ test/tokenizedata \ test/tracedmodules \ test/typinganndata \ + test/wheeldata \ test/xmltestdata \ test/xmltestdata/c14n-20