GraalPy on Windows now works with virtualenv

Author: timfel

cibuildwheel/platforms/windows.py

@@ -445,22 +445,6 @@ def build(options: Options, tmp_path: Path) -> None:
                     build_frontend, build_options.build_verbosity, build_options.config_settings
                 )
 
-                if (
-                    config.identifier.startswith("gp")
-                    and build_frontend.name == "build"
-                    and "--no-isolation" not in extra_flags
-                    and "-n" not in extra_flags
-                ):
-                    # GraalPy fails to discover its standard library when a venv is created
-                    # from a virtualenv seeded executable. See
-                    # https://github.com/oracle/graalpython/issues/491 and remove this once
-                    # fixed upstream.
-                    log.notice(
-                        "Disabling build isolation to workaround GraalPy bug. If the build fails, consider using pip or build[uv] as build frontend."
-                    )
-                    shell("graalpy -m pip install setuptools wheel", env=env)
-                    extra_flags = [*extra_flags, "-n"]
-
                 build_env = env.copy()
                 if pip_version is not None:
                     build_env["VIRTUALENV_PIP"] = pip_version

test/test_dependency_versions.py

@@ -135,17 +135,6 @@ def test_dependency_constraints(method, tmp_path, build_frontend_env_nouv):
 
     build_environment = {}
 
-    if (
-        utils.get_platform() == "windows"
-        and method == "file"
-        and build_frontend_env_nouv["CIBW_BUILD_FRONTEND"] == "build"
-    ):
-        # GraalPy fails to discover its standard library when a venv is created
-        # from a virtualenv seeded executable. See
-        # https://github.com/oracle/graalpython/issues/491 and remove this once
-        # fixed upstream.
-        build_frontend_env_nouv["CIBW_SKIP"] = "gp*"
-
     for package_name, version in tool_versions.items():
         env_name = f"EXPECTED_{package_name.upper()}_VERSION"
         build_environment[env_name] = version
@@ -165,13 +154,4 @@ def test_dependency_constraints(method, tmp_path, build_frontend_env_nouv):
     # also check that we got the right wheels
     expected_wheels = utils.expected_wheels("spam", "0.1.0")
 
-    if (
-        utils.get_platform() == "windows"
-        and method == "file"
-        and build_frontend_env_nouv["CIBW_BUILD_FRONTEND"] == "build"
-    ):
-        # See reference to https://github.com/oracle/graalpython/issues/491
-        # above
-        expected_wheels = [w for w in expected_wheels if "graalpy" not in w]
-
     assert set(actual_wheels) == set(expected_wheels)

test/test_pep518.py

@@ -33,26 +33,12 @@ def test_pep518(tmp_path, build_frontend_env):
     project_dir = tmp_path / "project"
     basic_project.generate(project_dir)
 
-    # GraalPy fails to discover its standard library when a venv is created
-    # from a virtualenv seeded executable. See
-    # https://github.com/oracle/graalpython/issues/491 and remove this once
-    # fixed upstream.
-    if build_frontend_env["CIBW_BUILD_FRONTEND"] == "build" and utils.get_platform() == "windows":
-        build_frontend_env["CIBW_SKIP"] = "gp*"
-
     # build the wheels
     actual_wheels = utils.cibuildwheel_run(project_dir, add_env=build_frontend_env)
 
     # check that the expected wheels are produced
     expected_wheels = utils.expected_wheels("spam", "0.1.0")
 
-    # GraalPy fails to discover its standard library when a venv is created
-    # from a virtualenv seeded executable. See
-    # https://github.com/oracle/graalpython/issues/491 and remove this once
-    # fixed upstream.
-    if build_frontend_env["CIBW_BUILD_FRONTEND"] == "build" and utils.get_platform() == "windows":
-        expected_wheels = [w for w in expected_wheels if "graalpy" not in w]
-
     assert set(actual_wheels) == set(expected_wheels)
 
     # These checks ensure an extra file is not created when using custom