diff --git a/bin/generate_schema.py b/bin/generate_schema.py index fe5f09187..6674dea31 100755 --- a/bin/generate_schema.py +++ b/bin/generate_schema.py @@ -28,7 +28,6 @@ description: How to inherit the parent's value. enable: enum: - - cpython-experimental-riscv64 - cpython-freethreading - cpython-prerelease - graalpy diff --git a/cibuildwheel/__main__.py b/cibuildwheel/__main__.py index 574e5fcba..fe828784c 100644 --- a/cibuildwheel/__main__.py +++ b/cibuildwheel/__main__.py @@ -463,13 +463,6 @@ def detect_warnings(*, options: Options) -> Generator[str, None, None]: build_selector = options.globals.build_selector test_selector = options.globals.test_selector - if EnableGroup.CPythonExperimentalRiscV64 in build_selector.enable: - yield ( - "'cpython-experimental-riscv64' enable is deprecated and will be removed in a future version. " - "It should be removed from tool.cibuildwheel.enable in pyproject.toml " - "or CIBW_ENABLE environment variable." - ) - all_valid_identifiers = [ config.identifier for module in ALL_PLATFORM_MODULES.values() diff --git a/cibuildwheel/resources/cibuildwheel.schema.json b/cibuildwheel/resources/cibuildwheel.schema.json index bae1f9eb5..58086fb56 100644 --- a/cibuildwheel/resources/cibuildwheel.schema.json +++ b/cibuildwheel/resources/cibuildwheel.schema.json @@ -13,7 +13,6 @@ }, "enable": { "enum": [ - "cpython-experimental-riscv64", "cpython-freethreading", "cpython-prerelease", "graalpy", diff --git a/cibuildwheel/selector.py b/cibuildwheel/selector.py index 829e791b5..37dc813a0 100644 --- a/cibuildwheel/selector.py +++ b/cibuildwheel/selector.py @@ -29,7 +29,6 @@ class EnableGroup(StrEnum): Groups of build selectors that are not enabled by default. """ - CPythonExperimentalRiscV64 = "cpython-experimental-riscv64" CPythonFreeThreading = "cpython-freethreading" CPythonPrerelease = "cpython-prerelease" GraalPy = "graalpy" @@ -39,7 +38,7 @@ class EnableGroup(StrEnum): @classmethod def all_groups(cls) -> frozenset["EnableGroup"]: - return frozenset(set(cls) - {cls.CPythonExperimentalRiscV64}) + return frozenset(cls) @classmethod def parse_option_value(cls, value: str) -> frozenset["EnableGroup"]: diff --git a/unit_test/main_tests/main_options_test.py b/unit_test/main_tests/main_options_test.py index 45cbe0562..7c8a6dde9 100644 --- a/unit_test/main_tests/main_options_test.py +++ b/unit_test/main_tests/main_options_test.py @@ -1,4 +1,3 @@ -import os import sys import tomllib from fnmatch import fnmatch @@ -142,70 +141,6 @@ def test_empty_selector(monkeypatch): assert e.value.code == 3 -@pytest.mark.usefixtures("platform", "intercepted_build_args") -def test_riscv64_warning1(monkeypatch, capsys): - monkeypatch.setenv("CIBW_ENABLE", "cpython-experimental-riscv64") - - main() - - _, err = capsys.readouterr() - print(err) - assert "'cpython-experimental-riscv64' enable is deprecated" in err - - -@pytest.mark.usefixtures("platform", "intercepted_build_args") -def test_riscv64_warning2(monkeypatch, capsys, tmp_path): - local_path = tmp_path / "tmp_project" - os.mkdir(local_path) # noqa:PTH102 Path.mkdir has been monkeypatched already - local_path.joinpath("setup.py").touch() - - monkeypatch.setattr( - sys, "argv", ["cibuildwheel", "--only", "cp313-manylinux_riscv64", str(local_path)] - ) - monkeypatch.setenv("CIBW_ENABLE", "cpython-experimental-riscv64") - - main() - - _, err = capsys.readouterr() - print(err) - assert "'cpython-experimental-riscv64' enable is deprecated" in err - - -@pytest.mark.usefixtures("platform", "intercepted_build_args") -def test_riscv64_no_warning(monkeypatch, capsys, tmp_path): - local_path = tmp_path / "tmp_project" - os.mkdir(local_path) # noqa:PTH102 Path.mkdir has been monkeypatched already - local_path.joinpath("setup.py").touch() - - monkeypatch.setattr( - sys, "argv", ["cibuildwheel", "--only", "cp313-manylinux_riscv64", str(local_path)] - ) - - main() - - _, err = capsys.readouterr() - print(err) - assert "'cpython-experimental-riscv64' enable is deprecated" not in err - - -@pytest.mark.usefixtures("platform", "intercepted_build_args") -def test_riscv64_no_warning2(monkeypatch, capsys, tmp_path): - local_path = tmp_path / "tmp_project" - os.mkdir(local_path) # noqa:PTH102 Path.mkdir has been monkeypatched already - local_path.joinpath("setup.py").touch() - - monkeypatch.setattr( - sys, "argv", ["cibuildwheel", "--only", "cp313-manylinux_riscv64", str(local_path)] - ) - monkeypatch.setenv("CIBW_ENABLE", "all") - - main() - - _, err = capsys.readouterr() - print(err) - assert "'cpython-experimental-riscv64' enable is deprecated" not in err - - @pytest.mark.parametrize( ("architecture", "image", "full_image"), [