Skip to content

Commit 4c1180f

Browse files
committed
Unxfail things that look like they were just a version mismatch
1 parent fc72b26 commit 4c1180f

File tree

3 files changed

+10
-16
lines changed

3 files changed

+10
-16
lines changed

bin/run_tests.py

-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
"-m",
4444
"pytest",
4545
f"--numprocesses={args.num_processes}",
46-
"-x",
4746
"--durations",
4847
"0",
4948
"--timeout=2400",

test/test_from_sdist.py

+8-12
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ def cibuildwheel_from_sdist_run(sdist_path, add_env=None, config_file=None):
5353
# tests
5454

5555

56-
@utils.skip_if_pyodide(reason="TODO: fix!")
5756
def test_simple(tmp_path):
5857
basic_project = test_projects.new_c_project()
5958

@@ -77,16 +76,15 @@ def test_simple(tmp_path):
7776
sdist_path,
7877
add_env={
7978
"CIBW_BEFORE_BUILD": setup_py_assertion_cmd,
80-
"CIBW_BUILD": "cp311-*",
79+
"CIBW_BUILD": "cp312-*",
8180
},
8281
)
8382

8483
# check that the expected wheels are produced
85-
expected_wheels = [w for w in utils.expected_wheels("spam", "0.1.0") if "cp311" in w]
84+
expected_wheels = [w for w in utils.expected_wheels("spam", "0.1.0") if "cp312" in w]
8685
assert set(actual_wheels) == set(expected_wheels)
8786

8887

89-
@utils.skip_if_pyodide(reason="TODO: fix!")
9088
def test_external_config_file_argument(tmp_path, capfd):
9189
basic_project = test_projects.new_c_project()
9290

@@ -109,20 +107,19 @@ def test_external_config_file_argument(tmp_path, capfd):
109107
# build the wheels from sdist
110108
actual_wheels = cibuildwheel_from_sdist_run(
111109
sdist_path,
112-
add_env={"CIBW_BUILD": "cp311-*"},
110+
add_env={"CIBW_BUILD": "cp312-*"},
113111
config_file=str(config_file),
114112
)
115113

116114
# check that the expected wheels are produced
117-
expected_wheels = [w for w in utils.expected_wheels("spam", "0.1.0") if "cp311" in w]
115+
expected_wheels = [w for w in utils.expected_wheels("spam", "0.1.0") if "cp312" in w]
118116
assert set(actual_wheels) == set(expected_wheels)
119117

120118
# check that before-all was run
121119
captured = capfd.readouterr()
122120
assert "test log statement from before-all" in captured.out
123121

124122

125-
@utils.skip_if_pyodide(reason="TODO: fix!")
126123
def test_config_in_pyproject_toml(tmp_path, capfd):
127124
# make a project with a pyproject.toml
128125
project = test_projects.new_c_project()
@@ -141,19 +138,18 @@ def test_config_in_pyproject_toml(tmp_path, capfd):
141138
# build the wheels from sdist
142139
actual_wheels = cibuildwheel_from_sdist_run(
143140
sdist_path,
144-
add_env={"CIBW_BUILD": "cp311-*"},
141+
add_env={"CIBW_BUILD": "cp312-*"},
145142
)
146143

147144
# check that the expected wheels are produced
148-
expected_wheels = [w for w in utils.expected_wheels("spam", "0.1.0") if "cp311" in w]
145+
expected_wheels = [w for w in utils.expected_wheels("spam", "0.1.0") if "cp312" in w]
149146
assert set(actual_wheels) == set(expected_wheels)
150147

151148
# check that before-build was run
152149
captured = capfd.readouterr()
153150
assert "test log statement from before-build 8419" in captured.out
154151

155152

156-
@utils.skip_if_pyodide(reason="Doesn't work")
157153
def test_internal_config_file_argument(tmp_path, capfd):
158154
# make a project with a config file inside
159155
project = test_projects.new_c_project(
@@ -179,12 +175,12 @@ def test_internal_config_file_argument(tmp_path, capfd):
179175
# build the wheels from sdist, referencing the config file inside
180176
actual_wheels = cibuildwheel_from_sdist_run(
181177
sdist_path,
182-
add_env={"CIBW_BUILD": "cp311-*"},
178+
add_env={"CIBW_BUILD": "cp312-*"},
183179
config_file="{package}/wheel_build_config.toml",
184180
)
185181

186182
# check that the expected wheels are produced
187-
expected_wheels = [w for w in utils.expected_wheels("spam", "0.1.0") if "cp311" in w]
183+
expected_wheels = [w for w in utils.expected_wheels("spam", "0.1.0") if "cp312" in w]
188184
assert set(actual_wheels) == set(expected_wheels)
189185

190186
# check that before-all was run

test/test_subdir_package.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
"""
3434

3535

36-
@utils.skip_if_pyodide(reason="Doesn't work")
3736
def test(capfd, tmp_path):
3837
project_dir = tmp_path / "project"
3938
subdir_package_project.generate(project_dir)
@@ -47,12 +46,12 @@ def test(capfd, tmp_path):
4746
"CIBW_BEFORE_BUILD": "python {project}/bin/before_build.py",
4847
"CIBW_TEST_COMMAND": "python {package}/test/run_tests.py",
4948
# this shouldn't depend on the version of python, so build only CPython 3.11
50-
"CIBW_BUILD": "cp311-*",
49+
"CIBW_BUILD": "cp312-*",
5150
},
5251
)
5352

5453
# check that the expected wheels are produced
55-
expected_wheels = [w for w in utils.expected_wheels("spam", "0.1.0") if "cp311" in w]
54+
expected_wheels = [w for w in utils.expected_wheels("spam", "0.1.0") if "cp312" in w]
5655
assert set(actual_wheels) == set(expected_wheels)
5756

5857
captured = capfd.readouterr()

0 commit comments

Comments
 (0)