| 1 |
From: Stefano Rivera <[email protected]> |
| 2 |
Date: Sat, 4 Nov 2023 18:59:01 +0200 |
| 3 |
Subject: Use virtualenvs' bundled wheel and setuptools |
| 4 |
|
| 5 |
We can't install it from the Internet in our builds, without Internet |
| 6 |
access. |
| 7 |
|
| 8 |
Bug-Debian: https://bugs.debian.org/1055337 |
| 9 |
--- |
| 10 |
testing/cffi0/test_zintegration.py | 14 +------------- |
| 11 |
1 file changed, 1 insertion(+), 13 deletions(-) |
| 12 |
|
| 13 |
diff --git a/testing/cffi0/test_zintegration.py b/testing/cffi0/test_zintegration.py |
| 14 |
index 600e2cf..8cda324 100644 |
| 15 |
--- a/testing/cffi0/test_zintegration.py |
| 16 |
+++ b/testing/cffi0/test_zintegration.py |
| 17 |
@@ -22,20 +22,8 @@ def create_venv(name): |
| 18 |
#'--never-download', <= could be added, but causes failures |
| 19 |
# in random cases on random machines |
| 20 |
'-p', os.path.abspath(sys.executable), |
| 21 |
+ '--wheel=bundle', '--setuptools=bundle', |
| 22 |
str(tmpdir)]) |
| 23 |
- |
| 24 |
- # Newer venv/virtualenv no longer include setuptools and wheel by default, which |
| 25 |
- # breaks a number of these tests; ensure they're always present |
| 26 |
- subprocess.check_call([ |
| 27 |
- os.path.join(tmpdir, 'bin/python'), |
| 28 |
- '-m', |
| 29 |
- 'pip', |
| 30 |
- 'install', |
| 31 |
- 'setuptools', |
| 32 |
- 'wheel', |
| 33 |
- '--upgrade' |
| 34 |
- ]) |
| 35 |
- |
| 36 |
except OSError as e: |
| 37 |
pytest.skip("Cannot execute virtualenv: %s" % (e,)) |
| 38 |
|