Hongru/cibuildwheel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing Windows tests by skipping pp27 in 10_cpp_standards tests (and pp36 for C++17) on Windows

Browse Source
This commit is contained in:
Yannick Jadoul
2020-02-15 23:47:03 +01:00
parent 176f4aca1f
commit b743b8ae5b
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/10_cpp_standards/cibuildwheel_test.py
+17 -11
View File
@@ -10,22 +10,23 @@ project_dir = os.path.dirname(__file__)
def test_cpp11(tmp_path): def test_cpp11(tmp_path):
# This test checks that the C++11 standard is supported # This test checks that the C++11 standard is supported
add_env = {'CIBW_SKIP': 'cp27-win*', 'CIBW_ENVIRONMENT': 'STANDARD=11'} add_env = {'CIBW_SKIP': 'cp27-win* pp27_73-win32', 'CIBW_ENVIRONMENT': 'STANDARD=11'}
# VC++ for Python 2.7 does not support modern standards # VC++ for Python 2.7 does not support modern standards
if utils.platform == 'macos': if utils.platform == 'macos':
add_env['MACOSX_DEPLOYMENT_TARGET'] = '10.9' add_env['MACOSX_DEPLOYMENT_TARGET'] = '10.9'
actual_wheels = utils.cibuildwheel_run(project_dir, add_env=add_env) actual_wheels = utils.cibuildwheel_run(project_dir, add_env=add_env)
expected_wheels = [x for x in utils.expected_wheels( expected_wheels = [w for w in utils.expected_wheels(
'spam', '0.1.0', macosx_deployment_target='10.9') 'spam', '0.1.0', macosx_deployment_target='10.9')
if 'cp27-cp27m-win' not in x] if 'cp27-cp27m-win' not in w and
'pp27-pypy_73-win32' not in w]
assert set(actual_wheels) == set(expected_wheels) assert set(actual_wheels) == set(expected_wheels)
def test_cpp14(): def test_cpp14():
# This test checks that the C++14 standard is supported # This test checks that the C++14 standard is supported
add_env = {'CIBW_SKIP': 'cp27-win* cp35-win*', 'CIBW_ENVIRONMENT': 'STANDARD=14'} add_env = {'CIBW_SKIP': 'cp27-win* pp27_73-win32 cp35-win*', 'CIBW_ENVIRONMENT': 'STANDARD=14'}
# VC++ for Python 2.7 does not support modern standards # VC++ for Python 2.7 does not support modern standards
# The manylinux1 docker image does not have a compiler which supports C++11 # The manylinux1 docker image does not have a compiler which supports C++11
# Python 3.4 and 3.5 are compiled with MSVC 10, which does not support C++14 # Python 3.4 and 3.5 are compiled with MSVC 10, which does not support C++14
@@ -33,27 +34,32 @@ def test_cpp14():
add_env['MACOSX_DEPLOYMENT_TARGET'] = '10.9' add_env['MACOSX_DEPLOYMENT_TARGET'] = '10.9'
actual_wheels = utils.cibuildwheel_run(project_dir, add_env=add_env) actual_wheels = utils.cibuildwheel_run(project_dir, add_env=add_env)
expected_wheels = [x for x in utils.expected_wheels( expected_wheels = [w for w in utils.expected_wheels(
'spam', '0.1.0', macosx_deployment_target='10.9') 'spam', '0.1.0', macosx_deployment_target='10.9')
if 'cp27-cp27m-win' not in x and 'cp35-cp35m-win' not in x] if 'cp27-cp27m-win' not in w and
'pp27-pypy_73-win32' not in w and
'cp35-cp35m-win' not in w]
assert set(actual_wheels) == set(expected_wheels) assert set(actual_wheels) == set(expected_wheels)
def test_cpp17(): def test_cpp17():
# This test checks that the C++17 standard is supported # This test checks that the C++17 standard is supported
# Python 2.7 uses the `register` keyword which is forbidden in the C++17 standard # Python and PyPy 2.7 use the `register` keyword which is forbidden in the C++17 standard
# The manylinux1 docker image does not have a compiler which supports C++11 # The manylinux1 docker image does not have a compiler which supports C++11
# Python 3.4 and 3.5 are compiled with MSVC 10, which does not support C++17 # Python 3.5 and PyPy 3.6 are compiled with MSVC 10, which does not support C++17
if os.environ.get('APPVEYOR_BUILD_WORKER_IMAGE', '') == 'Visual Studio 2015': if os.environ.get('APPVEYOR_BUILD_WORKER_IMAGE', '') == 'Visual Studio 2015':
pytest.skip('Visual Studio 2015 does not support C++17') pytest.skip('Visual Studio 2015 does not support C++17')
add_env = {'CIBW_SKIP': 'cp27-win* cp35-win*', 'CIBW_ENVIRONMENT': 'STANDARD=17'} add_env = {'CIBW_SKIP': 'cp27-win* pp27_73-win32 cp35-win* pp36_73-win32', 'CIBW_ENVIRONMENT': 'STANDARD=17'}
if utils.platform == 'macos': if utils.platform == 'macos':
add_env['MACOSX_DEPLOYMENT_TARGET'] = '10.13' add_env['MACOSX_DEPLOYMENT_TARGET'] = '10.13'
actual_wheels = utils.cibuildwheel_run(project_dir, add_env=add_env) actual_wheels = utils.cibuildwheel_run(project_dir, add_env=add_env)
expected_wheels = [x for x in utils.expected_wheels( expected_wheels = [w for w in utils.expected_wheels(
'spam', '0.1.0', macosx_deployment_target='10.13') 'spam', '0.1.0', macosx_deployment_target='10.13')
if 'cp27-cp27m-win' not in x and 'cp35-cp35m-win' not in x] if 'cp27-cp27m-win' not in w and
'pp27-pypy_73-win32' not in w and
'cp35-cp35m-win' not in w and
'pp36-pypy36_pp73-win32' not in w]
assert set(actual_wheels) == set(expected_wheels) assert set(actual_wheels) == set(expected_wheels)