fix: review from @joerick
This commit is contained in:
@@ -202,7 +202,7 @@ def test_cpp17_py27_modern_msvc_workaround(tmp_path):
|
||||
add_env_x64['CIBW_BUILD'] = 'cp27-win_amd64'
|
||||
actual_wheels += utils.cibuildwheel_run(project_dir, add_env=add_env_x64)
|
||||
|
||||
expected_wheels = [w for w in utils.expected_wheels('spam', '0.1.0', filter_27=False)
|
||||
expected_wheels = [w for w in utils.expected_wheels('spam', '0.1.0', exclude_27=False)
|
||||
if 'cp27-cp27m-win' in w
|
||||
or 'pp27-pypy_73-win32' in w]
|
||||
|
||||
|
||||
+4
-3
@@ -77,7 +77,7 @@ def cibuildwheel_run(project_path, package_dir='.', env=None, add_env=None, outp
|
||||
|
||||
def expected_wheels(package_name, package_version, manylinux_versions=None,
|
||||
macosx_deployment_target='10.9', machine_arch=None, *,
|
||||
filter_27=IS_WINDOWS_RUNNING_ON_TRAVIS):
|
||||
exclude_27=IS_WINDOWS_RUNNING_ON_TRAVIS):
|
||||
'''
|
||||
Returns a list of expected wheels from a run of cibuildwheel.
|
||||
'''
|
||||
@@ -135,8 +135,9 @@ def expected_wheels(package_name, package_version, manylinux_versions=None,
|
||||
for platform_tag in platform_tags:
|
||||
wheels.append(f'{package_name}-{package_version}-{python_abi_tag}-{platform_tag}.whl')
|
||||
|
||||
if filter_27:
|
||||
# Python 2.7 isn't supported on Travis.
|
||||
# Travis on Windows does not support using the default Python 2.7 compiler,
|
||||
# so we support skipping here.
|
||||
if exclude_27:
|
||||
wheels = [w for w in wheels if '-cp27-' not in w and '-pp2' not in w]
|
||||
|
||||
return wheels
|
||||
|
||||
Reference in New Issue
Block a user