From e2c7102ed7981cd79d28a5eb0a196f8242b1adab Mon Sep 17 00:00:00 2001
From: Tim Felgentreff <tim.felgentreff@oracle.com>
Date: Thu, 31 Jul 2025 06:31:23 +0200
Subject: [PATCH] chore: remove some GraalPy Windows workarounds. (#2501)

GraalPy made a release where pytest works on Windows
---
 test/test_before_test.py |  4 +---
 test/test_testing.py     | 16 ++++------------
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/test/test_before_test.py b/test/test_before_test.py
index 3c722d08..bf023849 100644
--- a/test/test_before_test.py
+++ b/test/test_before_test.py
@@ -63,9 +63,7 @@ def test(tmp_path, build_frontend_env):
             # the 'false ||' bit is to ensure this command runs in a shell on
             # mac/linux.
             "CIBW_TEST_COMMAND": f"false || {utils.invoke_pytest()} {{project}}/test",
-            # pytest fails on GraalPy 24.2.0 on Windows so we skip it there
-            # until https://github.com/oracle/graalpython/issues/490 is fixed
-            "CIBW_TEST_COMMAND_WINDOWS": "where graalpy || pytest {project}/test",
+            "CIBW_TEST_COMMAND_WINDOWS": "pytest {project}/test",
             **build_frontend_env,
         },
     )
diff --git a/test/test_testing.py b/test/test_testing.py
index de750eae..65cb66ba 100644
--- a/test/test_testing.py
+++ b/test/test_testing.py
@@ -81,9 +81,7 @@ def test(tmp_path):
             # the 'false ||' bit is to ensure this command runs in a shell on
             # mac/linux.
             "CIBW_TEST_COMMAND": f"false || {utils.invoke_pytest()} {{project}}/test",
-            # pytest fails on GraalPy 24.2.0 on Windows so we skip it there
-            # until https://github.com/oracle/graalpython/issues/490 is fixed
-            "CIBW_TEST_COMMAND_WINDOWS": "COLOR 00 || where graalpy || pytest {project}/test",
+            "CIBW_TEST_COMMAND_WINDOWS": "COLOR 00 || pytest {project}/test",
         },
     )
 
@@ -104,9 +102,7 @@ def test_extras_require(tmp_path):
             # the 'false ||' bit is to ensure this command runs in a shell on
             # mac/linux.
             "CIBW_TEST_COMMAND": f"false || {utils.invoke_pytest()} {{project}}/test",
-            # pytest fails on GraalPy 24.2.0 on Windows so we skip it there
-            # until https://github.com/oracle/graalpython/issues/490 is fixed
-            "CIBW_TEST_COMMAND_WINDOWS": "COLOR 00 || where graalpy || pytest {project}/test",
+            "CIBW_TEST_COMMAND_WINDOWS": "COLOR 00 || pytest {project}/test",
         },
         single_python=True,
     )
@@ -138,9 +134,7 @@ def test_dependency_groups(tmp_path):
             # the 'false ||' bit is to ensure this command runs in a shell on
             # mac/linux.
             "CIBW_TEST_COMMAND": f"false || {utils.invoke_pytest()} {{project}}/test",
-            # pytest fails on GraalPy 24.2.0 on Windows so we skip it there
-            # until https://github.com/oracle/graalpython/issues/490 is fixed
-            "CIBW_TEST_COMMAND_WINDOWS": "COLOR 00 || where graalpy || pytest {project}/test",
+            "CIBW_TEST_COMMAND_WINDOWS": "COLOR 00 || pytest {project}/test",
         },
         single_python=True,
     )
@@ -230,9 +224,7 @@ def test_test_sources(tmp_path):
         project_dir,
         add_env={
             "CIBW_TEST_REQUIRES": "pytest",
-            # pytest fails on GraalPy 24.2.0 on Windows so we skip it there
-            # until https://github.com/oracle/graalpython/issues/490 is fixed
-            "CIBW_TEST_COMMAND_WINDOWS": "where graalpy || pytest",
+            "CIBW_TEST_COMMAND_WINDOWS": "pytest",
             "CIBW_TEST_COMMAND": utils.invoke_pytest(),
             "CIBW_TEST_SOURCES": "test",
         },