Hongru/cibuildwheel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: use Ruff (#1405)

Browse Source 
chore: use ruff

Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>
This commit is contained in:
Henry Schreiner
2023-01-30 15:53:44 -05:00
committed by GitHub
parent 80a8ec7f32
commit c8b037ba3e
25 changed files with 141 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files
unit_test/main_tests/conftest.py
+5 -5
View File
@@ -47,7 +47,7 @@ def mock_protection(monkeypatch):
@pytest.fixture(autouse=True)
def fake_package_dir_autouse(fake_package_dir):
def fake_package_dir_autouse(fake_package_dir): # noqa: ARG001
pass
@@ -60,9 +60,9 @@ def disable_print_wheels(monkeypatch):
monkeypatch.setattr(util, "print_new_wheels", empty_cm)
@pytest.fixture
def allow_empty(request, monkeypatch, fake_package_dir):
monkeypatch.setattr(sys, "argv", fake_package_dir + ["--allow-empty"])
@pytest.fixture()
def allow_empty(monkeypatch, fake_package_dir):
monkeypatch.setattr(sys, "argv", [*fake_package_dir, "--allow-empty"])
@pytest.fixture(params=["linux", "macos", "windows"])
@@ -81,7 +81,7 @@ def platform(request, monkeypatch):
return platform_value
@pytest.fixture
@pytest.fixture()
def intercepted_build_args(monkeypatch):
intercepted = ArgsInterceptor()
unit_test/main_tests/main_options_test.py
+14 -10
View File
@@ -19,7 +19,8 @@ from cibuildwheel.util import BuildSelector, resources_dir, split_config_setting
# CIBW_PLATFORM is tested in main_platform_test.py
def test_output_dir(platform, intercepted_build_args, monkeypatch):
@pytest.mark.usefixtures("platform")
def test_output_dir(intercepted_build_args, monkeypatch):
OUTPUT_DIR = Path("some_output_dir")
monkeypatch.setenv("CIBW_OUTPUT_DIR", str(OUTPUT_DIR))
@@ -29,17 +30,19 @@ def test_output_dir(platform, intercepted_build_args, monkeypatch):
assert intercepted_build_args.args[0].globals.output_dir == OUTPUT_DIR.resolve()
def test_output_dir_default(platform, intercepted_build_args, monkeypatch):
@pytest.mark.usefixtures("platform")
def test_output_dir_default(intercepted_build_args):
main()
assert intercepted_build_args.args[0].globals.output_dir == Path("wheelhouse").resolve()
@pytest.mark.usefixtures("platform")
@pytest.mark.parametrize("also_set_environment", [False, True])
def test_output_dir_argument(also_set_environment, platform, intercepted_build_args, monkeypatch):
def test_output_dir_argument(also_set_environment, intercepted_build_args, monkeypatch):
OUTPUT_DIR = Path("some_output_dir")
monkeypatch.setattr(sys, "argv", sys.argv + ["--output-dir", str(OUTPUT_DIR)])
monkeypatch.setattr(sys, "argv", [*sys.argv, "--output-dir", str(OUTPUT_DIR)])
if also_set_environment:
monkeypatch.setenv("CIBW_OUTPUT_DIR", "not_this_output_dir")
@@ -48,7 +51,8 @@ def test_output_dir_argument(also_set_environment, platform, intercepted_build_a
assert intercepted_build_args.args[0].globals.output_dir == OUTPUT_DIR.resolve()
def test_build_selector(platform, intercepted_build_args, monkeypatch, allow_empty):
@pytest.mark.usefixtures("platform", "allow_empty")
def test_build_selector(intercepted_build_args, monkeypatch):
BUILD = "some build* *-selector"
SKIP = "some skip* *-selector"
@@ -65,7 +69,8 @@ def test_build_selector(platform, intercepted_build_args, monkeypatch, allow_emp
# Unit tests for BuildSelector are in build_selector_test.py
def test_empty_selector(platform, intercepted_build_args, monkeypatch):
@pytest.mark.usefixtures("platform", "intercepted_build_args")
def test_empty_selector(monkeypatch):
monkeypatch.setenv("CIBW_SKIP", "*")
with pytest.raises(SystemExit) as e:
@@ -75,7 +80,7 @@ def test_empty_selector(platform, intercepted_build_args, monkeypatch):
@pytest.mark.parametrize(
"architecture, image, full_image",
("architecture", "image", "full_image"),
[
("x86_64", None, "quay.io/pypa/manylinux2014_x86_64:*"),
("x86_64", "manylinux1", "quay.io/pypa/manylinux1_x86_64:*"),
@@ -303,9 +308,8 @@ def test_config_settings(platform_specific, platform, intercepted_build_args, mo
"?p35*",
],
)
def test_build_selector_deprecated_error(
monkeypatch, platform, intercepted_build_args, selector, pattern, allow_empty, capsys
):
@pytest.mark.usefixtures("platform", "intercepted_build_args", "allow_empty")
def test_build_selector_deprecated_error(monkeypatch, selector, pattern, capsys):
monkeypatch.setenv(selector, pattern)
if selector == "CIBW_BUILD":
unit_test/main_tests/main_platform_test.py
+14 -13
View File
@@ -24,7 +24,7 @@ def test_unknown_platform_non_ci(monkeypatch, capsys):
with pytest.raises(SystemExit) as exit:
main()
assert exit.value.code == 2
assert exit.value.code == 2
_, err = capsys.readouterr()
assert "cibuildwheel: Unable to detect platform." in err
@@ -38,7 +38,7 @@ def test_unknown_platform_on_ci(monkeypatch, capsys):
with pytest.raises(SystemExit) as exit:
main()
assert exit.value.code == 2
assert exit.value.code == 2
_, err = capsys.readouterr()
assert 'cibuildwheel: Unable to detect platform from "sys.platform"' in err
@@ -57,7 +57,7 @@ def test_unknown_platform(monkeypatch, capsys):
def test_platform_argument(platform, intercepted_build_args, monkeypatch):
monkeypatch.setenv("CIBW_PLATFORM", "nonexistent")
monkeypatch.setattr(sys, "argv", sys.argv + ["--platform", platform])
monkeypatch.setattr(sys, "argv", [*sys.argv, "--platform", platform])
main()
@@ -66,14 +66,15 @@ def test_platform_argument(platform, intercepted_build_args, monkeypatch):
assert options.globals.package_dir == MOCK_PACKAGE_DIR.resolve()
def test_platform_environment(platform, intercepted_build_args, monkeypatch):
@pytest.mark.usefixtures("platform")
def test_platform_environment(intercepted_build_args):
main()
options = intercepted_build_args.args[0]
assert options.globals.package_dir == MOCK_PACKAGE_DIR.resolve()
def test_archs_default(platform, intercepted_build_args, monkeypatch):
def test_archs_default(platform, intercepted_build_args):
main()
options = intercepted_build_args.args[0]
@@ -93,7 +94,7 @@ def test_archs_argument(platform, intercepted_build_args, monkeypatch, use_env_v
monkeypatch.setenv("CIBW_ARCHS", "ppc64le")
else:
monkeypatch.setenv("CIBW_ARCHS", "unused")
monkeypatch.setattr(sys, "argv", sys.argv + ["--archs", "ppc64le"])
monkeypatch.setattr(sys, "argv", [*sys.argv, "--archs", "ppc64le"])
if platform in {"macos", "windows"}:
with pytest.raises(SystemExit) as exit:
@@ -195,7 +196,7 @@ def test_archs_platform_all(platform, intercepted_build_args, monkeypatch):
@pytest.mark.parametrize(
"only,plat",
("only", "plat"),
(
("cp311-manylinux_x86_64", "linux"),
("cp310-win_amd64", "windows"),
@@ -206,7 +207,7 @@ def test_archs_platform_all(platform, intercepted_build_args, monkeypatch):
def test_only_argument(intercepted_build_args, monkeypatch, only, plat):
monkeypatch.setenv("CIBW_BUILD", "unused")
monkeypatch.setenv("CIBW_SKIP", "unused")
monkeypatch.setattr(sys, "argv", sys.argv + ["--only", only])
monkeypatch.setattr(sys, "argv", [*sys.argv, "--only", only])
main()
@@ -219,7 +220,7 @@ def test_only_argument(intercepted_build_args, monkeypatch, only, plat):
@pytest.mark.parametrize("only", ("cp311-manylxinux_x86_64", "some_linux_thing"))
def test_only_failed(monkeypatch, only):
monkeypatch.setattr(sys, "argv", sys.argv + ["--only", only])
monkeypatch.setattr(sys, "argv", [*sys.argv, "--only", only])
with pytest.raises(SystemExit):
main()
@@ -227,7 +228,7 @@ def test_only_failed(monkeypatch, only):
def test_only_no_platform(monkeypatch):
monkeypatch.setattr(
sys, "argv", sys.argv + ["--only", "cp311-manylinux_x86_64", "--platform", "macos"]
sys, "argv", [*sys.argv, "--only", "cp311-manylinux_x86_64", "--platform", "macos"]
)
with pytest.raises(SystemExit):
@@ -236,7 +237,7 @@ def test_only_no_platform(monkeypatch):
def test_only_no_archs(monkeypatch):
monkeypatch.setattr(
sys, "argv", sys.argv + ["--only", "cp311-manylinux_x86_64", "--archs", "x86_64"]
sys, "argv", [*sys.argv, "--only", "cp311-manylinux_x86_64", "--archs", "x86_64"]
)
with pytest.raises(SystemExit):
@@ -244,7 +245,7 @@ def test_only_no_archs(monkeypatch):
@pytest.mark.parametrize(
"envvar_name,envvar_value",
("envvar_name", "envvar_value"),
(
("CIBW_BUILD", "cp310-*"),
("CIBW_SKIP", "cp311-*"),
@@ -253,7 +254,7 @@ def test_only_no_archs(monkeypatch):
),
)
def test_only_overrides_env_vars(monkeypatch, intercepted_build_args, envvar_name, envvar_value):
monkeypatch.setattr(sys, "argv", sys.argv + ["--only", "cp311-manylinux_x86_64"])
monkeypatch.setattr(sys, "argv", [*sys.argv, "--only", "cp311-manylinux_x86_64"])
monkeypatch.setenv(envvar_name, envvar_value)
main()
unit_test/main_tests/main_requires_python_test.py
+11 -6
View File
@@ -9,7 +9,7 @@ from packaging.specifiers import SpecifierSet
from cibuildwheel.__main__ import main
@pytest.fixture(autouse=True, scope="function")
@pytest.fixture(autouse=True)
def fake_package_dir(monkeypatch, tmp_path):
"""
Set up a fake project
@@ -25,7 +25,8 @@ def fake_package_dir(monkeypatch, tmp_path):
return local_path
def test_no_override(platform, monkeypatch, intercepted_build_args):
@pytest.mark.usefixtures("platform")
def test_no_override(intercepted_build_args):
main()
@@ -38,7 +39,8 @@ def test_no_override(platform, monkeypatch, intercepted_build_args):
assert intercepted_build_selector.requires_python is None
def test_override_env(platform, monkeypatch, intercepted_build_args):
@pytest.mark.usefixtures("platform")
def test_override_env(monkeypatch, intercepted_build_args):
monkeypatch.setenv("CIBW_PROJECT_REQUIRES_PYTHON", ">=3.8")
main()
@@ -52,7 +54,8 @@ def test_override_env(platform, monkeypatch, intercepted_build_args):
assert not intercepted_build_selector("cp36-win32")
def test_override_setup_cfg(platform, monkeypatch, intercepted_build_args, fake_package_dir):
@pytest.mark.usefixtures("platform")
def test_override_setup_cfg(intercepted_build_args, fake_package_dir):
fake_package_dir.joinpath("setup.cfg").write_text(
textwrap.dedent(
@@ -74,7 +77,8 @@ def test_override_setup_cfg(platform, monkeypatch, intercepted_build_args, fake_
assert not intercepted_build_selector("cp36-win32")
def test_override_pyproject_toml(platform, monkeypatch, intercepted_build_args, fake_package_dir):
@pytest.mark.usefixtures("platform")
def test_override_pyproject_toml(intercepted_build_args, fake_package_dir):
fake_package_dir.joinpath("pyproject.toml").write_text(
textwrap.dedent(
@@ -96,7 +100,8 @@ def test_override_pyproject_toml(platform, monkeypatch, intercepted_build_args,
assert not intercepted_build_selector("cp36-win32")
def test_override_setup_py_simple(platform, monkeypatch, intercepted_build_args, fake_package_dir):
@pytest.mark.usefixtures("platform")
def test_override_setup_py_simple(intercepted_build_args, fake_package_dir):
fake_package_dir.joinpath("setup.py").write_text(
textwrap.dedent(