break: drop unused riscv64 enable option (#2525)
This commit is contained in:
@@ -28,7 +28,6 @@ $defs:
|
|||||||
description: How to inherit the parent's value.
|
description: How to inherit the parent's value.
|
||||||
enable:
|
enable:
|
||||||
enum:
|
enum:
|
||||||
- cpython-experimental-riscv64
|
|
||||||
- cpython-freethreading
|
- cpython-freethreading
|
||||||
- cpython-prerelease
|
- cpython-prerelease
|
||||||
- graalpy
|
- graalpy
|
||||||
|
|||||||
@@ -463,13 +463,6 @@ def detect_warnings(*, options: Options) -> Generator[str, None, None]:
|
|||||||
build_selector = options.globals.build_selector
|
build_selector = options.globals.build_selector
|
||||||
test_selector = options.globals.test_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 = [
|
all_valid_identifiers = [
|
||||||
config.identifier
|
config.identifier
|
||||||
for module in ALL_PLATFORM_MODULES.values()
|
for module in ALL_PLATFORM_MODULES.values()
|
||||||
|
|||||||
@@ -13,7 +13,6 @@
|
|||||||
},
|
},
|
||||||
"enable": {
|
"enable": {
|
||||||
"enum": [
|
"enum": [
|
||||||
"cpython-experimental-riscv64",
|
|
||||||
"cpython-freethreading",
|
"cpython-freethreading",
|
||||||
"cpython-prerelease",
|
"cpython-prerelease",
|
||||||
"graalpy",
|
"graalpy",
|
||||||
|
|||||||
@@ -29,7 +29,6 @@ class EnableGroup(StrEnum):
|
|||||||
Groups of build selectors that are not enabled by default.
|
Groups of build selectors that are not enabled by default.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
CPythonExperimentalRiscV64 = "cpython-experimental-riscv64"
|
|
||||||
CPythonFreeThreading = "cpython-freethreading"
|
CPythonFreeThreading = "cpython-freethreading"
|
||||||
CPythonPrerelease = "cpython-prerelease"
|
CPythonPrerelease = "cpython-prerelease"
|
||||||
GraalPy = "graalpy"
|
GraalPy = "graalpy"
|
||||||
@@ -39,7 +38,7 @@ class EnableGroup(StrEnum):
|
|||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def all_groups(cls) -> frozenset["EnableGroup"]:
|
def all_groups(cls) -> frozenset["EnableGroup"]:
|
||||||
return frozenset(set(cls) - {cls.CPythonExperimentalRiscV64})
|
return frozenset(cls)
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def parse_option_value(cls, value: str) -> frozenset["EnableGroup"]:
|
def parse_option_value(cls, value: str) -> frozenset["EnableGroup"]:
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
import os
|
|
||||||
import sys
|
import sys
|
||||||
import tomllib
|
import tomllib
|
||||||
from fnmatch import fnmatch
|
from fnmatch import fnmatch
|
||||||
@@ -142,70 +141,6 @@ def test_empty_selector(monkeypatch):
|
|||||||
assert e.value.code == 3
|
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(
|
@pytest.mark.parametrize(
|
||||||
("architecture", "image", "full_image"),
|
("architecture", "image", "full_image"),
|
||||||
[
|
[
|
||||||
|
|||||||
Reference in New Issue
Block a user