chore: refactor cibuildwheel.utils (#2252)

* chore: refactor cibuildwheel.utils

* rework build_frontend extra flags

* ci(fix): use tonistiigi/binfmt:qemu-v8.1.5 image for qemu
This commit is contained in:
Matthieu Darbois
2025-01-27 14:35:56 -05:00
committed by GitHub
parent 318a963cc3
commit b605f8fec8
39 changed files with 1188 additions and 1187 deletions
+4 -3
View File
@@ -8,7 +8,8 @@ from pathlib import Path
import pytest
from cibuildwheel import linux, macos, pyodide, util, windows
from cibuildwheel import __main__, linux, macos, pyodide, windows
from cibuildwheel.util import file
class ArgsInterceptor:
@@ -38,7 +39,7 @@ def mock_protection(monkeypatch):
pass
monkeypatch.setattr(subprocess, "Popen", fail_on_call)
monkeypatch.setattr(util, "download", fail_on_call)
monkeypatch.setattr(file, "download", fail_on_call)
monkeypatch.setattr(windows, "build", fail_on_call)
monkeypatch.setattr(linux, "build", fail_on_call)
monkeypatch.setattr(macos, "build", fail_on_call)
@@ -58,7 +59,7 @@ def disable_print_wheels(monkeypatch):
def empty_cm(*args, **kwargs):
yield
monkeypatch.setattr(util, "print_new_wheels", empty_cm)
monkeypatch.setattr(__main__, "print_new_wheels", empty_cm)
@pytest.fixture
+6 -5
View File
@@ -9,8 +9,10 @@ import pytest
from cibuildwheel.__main__ import main
from cibuildwheel.environment import ParsedEnvironment
from cibuildwheel.frontend import _split_config_settings
from cibuildwheel.options import BuildOptions, _get_pinned_container_images
from cibuildwheel.util import BuildSelector, EnableGroup, resources_dir, split_config_settings
from cibuildwheel.selector import BuildSelector, EnableGroup
from cibuildwheel.util import resources
# CIBW_PLATFORM is tested in main_platform_test.py
@@ -281,13 +283,13 @@ def test_config_settings(platform_specific, platform, intercepted_build_args, mo
assert build_options.config_settings == config_settings
assert split_config_settings(config_settings, "build") == [
assert _split_config_settings(config_settings, "build") == [
"--config-setting=setting=value",
"--config-setting=setting=value2",
"--config-setting=other=something else",
]
assert split_config_settings(config_settings, "pip") == [
assert _split_config_settings(config_settings, "pip") == [
"--config-settings=setting=value",
"--config-settings=setting=value2",
"--config-settings=other=something else",
@@ -411,8 +413,7 @@ def test_defaults(platform, intercepted_build_args):
main()
build_options: BuildOptions = intercepted_build_args.args[0].build_options(identifier=None)
defaults_config_path = resources_dir / "defaults.toml"
with defaults_config_path.open("rb") as f:
with resources.DEFAULTS.open("rb") as f:
defaults_toml = tomllib.load(f)
root_defaults = defaults_toml["tool"]["cibuildwheel"]
+1 -1
View File
@@ -6,7 +6,7 @@ import pytest
from cibuildwheel.__main__ import main
from cibuildwheel.architecture import Architecture
from cibuildwheel.util import EnableGroup
from cibuildwheel.selector import EnableGroup
from ..conftest import MOCK_PACKAGE_DIR