Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions testing/cffi0/test_zintegration.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,21 @@ 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'),
'-m',
'pip',
'install',
'setuptools',
'wheel',
'--upgrade'
])

Expand Down Expand Up @@ -98,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)
Expand Down
Loading