From ae8df6dbd0c11f976963e5edda47fe1644e97204 Mon Sep 17 00:00:00 2001 From: Stefano Rivera Date: Mon, 28 Apr 2025 07:30:27 -0400 Subject: [PATCH 1/2] No need to install wheel any more setuptools has had a native bdist_wheel since 70.1.0: https://setuptools.pypa.io/en/latest/history.html#v70-1-0 --- testing/cffi0/test_zintegration.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/testing/cffi0/test_zintegration.py b/testing/cffi0/test_zintegration.py index 8d71d81b..fe3ac507 100644 --- a/testing/cffi0/test_zintegration.py +++ b/testing/cffi0/test_zintegration.py @@ -17,14 +17,14 @@ def create_venv(name): try: # FUTURE: we should probably update this to use venv for at least more modern Pythons, and # install setuptools/pip/etc explicitly for the tests that require them (as venv has stopped including - # setuptools and wheel by default for newer versions). + # setuptools by default for newer versions). subprocess.check_call(['virtualenv', #'--never-download', <= could be added, but causes failures # in random cases on random machines '-p', os.path.abspath(sys.executable), str(tmpdir)]) - # Newer venv/virtualenv no longer include setuptools and wheel by default, which + # Newer venv/virtualenv no longer include setuptools by default, which # breaks a number of these tests; ensure they're always present subprocess.check_call([ os.path.join(tmpdir, 'bin/python'), @@ -32,7 +32,6 @@ def create_venv(name): 'pip', 'install', 'setuptools', - 'wheel', '--upgrade' ]) From 1293c6063ec62003aa1962c3b0dbdddbaca875ca Mon Sep 17 00:00:00 2001 From: Stefano Rivera Date: Mon, 28 Apr 2025 12:04:37 -0400 Subject: [PATCH 2/2] Explicitly specify --no-build-isolation as that's our expectation in these tests Previously we relied on pip to build the packages in non-PEP517 mode, which implied no build isolation. The latest `virtualenv` (with pypa/virtualenv#2868) won't include `wheel` in the virtualenv, which will mean that pip uses PEP-517 mode, which is isolated by default. --- testing/cffi0/test_zintegration.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/cffi0/test_zintegration.py b/testing/cffi0/test_zintegration.py index fe3ac507..3daf4a5c 100644 --- a/testing/cffi0/test_zintegration.py +++ b/testing/cffi0/test_zintegration.py @@ -97,7 +97,7 @@ def remove(dir): # there's a setuptools/easy_install bug that causes this to fail when the build/install occur together and # we're in the same directory with the build (it tries to look up dependencies for itself on PyPI); # subsequent runs will succeed because this test doesn't properly clean up the build- use pip for now. - subprocess.check_call((vp, '-m', 'pip', 'install', '.'), env=env) + subprocess.check_call((vp, '-m', 'pip', 'install', '.', '--no-build-isolation'), env=env) subprocess.check_call((vp, str(python_f)), env=env) finally: os.chdir(olddir)