https://github.com/python/cpython/commit/be85f35f12bebc669b0aa1c2e9cdd0624fb32a10
commit: be85f35f12bebc669b0aa1c2e9cdd0624fb32a10
branch: 3.12
author: Miss Islington (bot) <31488909+miss-isling...@users.noreply.github.com>
committer: vstinner <vstin...@python.org>
date: 2024-01-23T15:58:44Z
summary:
[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 <m...@sobolevn.me>
files:
A Lib/test/wheeldata/setuptools-67.6.1-py3-none-any.whl
A Lib/test/wheeldata/wheel-0.40.0-py3-none-any.whl
D Lib/test/setuptools-67.6.1-py3-none-any.whl
D Lib/test/wheel-0.40.0-py3-none-any.whl
M Lib/test/support/__init__.py
M Makefile.pre.in
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
_______________________________________________
Python-checkins mailing list -- python-checkins@python.org
To unsubscribe send an email to python-checkins-le...@python.org
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: arch...@mail-archive.com
