Skip to content

Commit e2c7102

Browse files
authored
chore: remove some GraalPy Windows workarounds. (#2501)
GraalPy made a release where pytest works on Windows
1 parent 9e4e50b commit e2c7102

File tree

2 files changed

+5
-15
lines changed

2 files changed

+5
-15
lines changed

test/test_before_test.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,7 @@ def test(tmp_path, build_frontend_env):
6363
# the 'false ||' bit is to ensure this command runs in a shell on
6464
# mac/linux.
6565
"CIBW_TEST_COMMAND": f"false || {utils.invoke_pytest()} {{project}}/test",
66-
# pytest fails on GraalPy 24.2.0 on Windows so we skip it there
67-
# until https://github.com/oracle/graalpython/issues/490 is fixed
68-
"CIBW_TEST_COMMAND_WINDOWS": "where graalpy || pytest {project}/test",
66+
"CIBW_TEST_COMMAND_WINDOWS": "pytest {project}/test",
6967
**build_frontend_env,
7068
},
7169
)

test/test_testing.py

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,7 @@ def test(tmp_path):
8181
# the 'false ||' bit is to ensure this command runs in a shell on
8282
# mac/linux.
8383
"CIBW_TEST_COMMAND": f"false || {utils.invoke_pytest()} {{project}}/test",
84-
# pytest fails on GraalPy 24.2.0 on Windows so we skip it there
85-
# until https://github.com/oracle/graalpython/issues/490 is fixed
86-
"CIBW_TEST_COMMAND_WINDOWS": "COLOR 00 || where graalpy || pytest {project}/test",
84+
"CIBW_TEST_COMMAND_WINDOWS": "COLOR 00 || pytest {project}/test",
8785
},
8886
)
8987

@@ -104,9 +102,7 @@ def test_extras_require(tmp_path):
104102
# the 'false ||' bit is to ensure this command runs in a shell on
105103
# mac/linux.
106104
"CIBW_TEST_COMMAND": f"false || {utils.invoke_pytest()} {{project}}/test",
107-
# pytest fails on GraalPy 24.2.0 on Windows so we skip it there
108-
# until https://github.com/oracle/graalpython/issues/490 is fixed
109-
"CIBW_TEST_COMMAND_WINDOWS": "COLOR 00 || where graalpy || pytest {project}/test",
105+
"CIBW_TEST_COMMAND_WINDOWS": "COLOR 00 || pytest {project}/test",
110106
},
111107
single_python=True,
112108
)
@@ -138,9 +134,7 @@ def test_dependency_groups(tmp_path):
138134
# the 'false ||' bit is to ensure this command runs in a shell on
139135
# mac/linux.
140136
"CIBW_TEST_COMMAND": f"false || {utils.invoke_pytest()} {{project}}/test",
141-
# pytest fails on GraalPy 24.2.0 on Windows so we skip it there
142-
# until https://github.com/oracle/graalpython/issues/490 is fixed
143-
"CIBW_TEST_COMMAND_WINDOWS": "COLOR 00 || where graalpy || pytest {project}/test",
137+
"CIBW_TEST_COMMAND_WINDOWS": "COLOR 00 || pytest {project}/test",
144138
},
145139
single_python=True,
146140
)
@@ -230,9 +224,7 @@ def test_test_sources(tmp_path):
230224
project_dir,
231225
add_env={
232226
"CIBW_TEST_REQUIRES": "pytest",
233-
# pytest fails on GraalPy 24.2.0 on Windows so we skip it there
234-
# until https://github.com/oracle/graalpython/issues/490 is fixed
235-
"CIBW_TEST_COMMAND_WINDOWS": "where graalpy || pytest",
227+
"CIBW_TEST_COMMAND_WINDOWS": "pytest",
236228
"CIBW_TEST_COMMAND": utils.invoke_pytest(),
237229
"CIBW_TEST_SOURCES": "test",
238230
},

0 commit comments

Comments
 (0)