fix conflicts with main branch

This commit is contained in:
Grzegorz Bokota
2020-01-16 16:10:05 +01:00
parent e64916fe9c
commit 1f784a1a29
2 changed files with 21 additions and 7 deletions
+6 -3
View File
@@ -15,7 +15,8 @@ def test_cpp11(tmp_path):
# this test checks if c++11 standard is supported.
actual_wheels = utils.cibuildwheel_run(project_dir, add_env=add_env)
expected_wheels = [x for x in utils.expected_wheels('spam', '0.1.0', "10.9") if "cp27-cp27m-win" not in x]
expected_wheels = [x for x in utils.expected_wheels('spam', '0.1.0',
macosx_deployment_target="10.9") if "cp27-cp27m-win" not in x]
assert set(actual_wheels) == set(expected_wheels)
@@ -30,7 +31,8 @@ def test_cpp14():
# this test checks if c++14 standard is supported.
actual_wheels = utils.cibuildwheel_run(project_dir, add_env=add_env)
expected_wheels = [x for x in utils.expected_wheels('spam', '0.1.0', "10.9")
expected_wheels = [x for x in utils.expected_wheels(
'spam', '0.1.0', macosx_deployment_target="10.9")
if "cp27-cp27m-win" not in x and "cp35-cp35m-win" not in x]
assert set(actual_wheels) == set(expected_wheels)
@@ -49,7 +51,8 @@ def test_cpp17():
# this test checks if c++17 standard is supported.
actual_wheels = utils.cibuildwheel_run(project_dir, add_env=add_env)
expected_wheels = [x for x in utils.expected_wheels('spam', '0.1.0', "10.13")
expected_wheels = [x for x in utils.expected_wheels('spam', '0.1.0',
macosx_deployment_target="10.13")
if "cp27-cp27m-win" not in x and "cp35-cp35m-win" not in x]
assert set(actual_wheels) == set(expected_wheels)