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

test/conftest.py

@@ -8,8 +8,9 @@ import pytest
 from filelock import FileLock
 
 from cibuildwheel.architecture import Architecture
+from cibuildwheel.ci import detect_ci_provider
 from cibuildwheel.options import CommandLineArguments, Options
-from cibuildwheel.util import detect_ci_provider, find_uv
+from cibuildwheel.venv import find_uv
 
 from .utils import EMULATED_ARCHS, platform
 

test/test_dependency_versions.py

@@ -7,7 +7,7 @@ from pathlib import Path
 
 import pytest
 
-import cibuildwheel.util
+from cibuildwheel.util import resources
 
 from . import test_projects, utils
 
@@ -69,7 +69,7 @@ def test_pinned_versions(tmp_path, python_version, build_frontend_env_nouv):
     build_environment = {}
     build_pattern = f"[cp]p{version_no_dot}-*"
     constraint_filename = f"constraints-python{version_no_dot}.txt"
-    constraint_file = cibuildwheel.util.resources_dir / constraint_filename
+    constraint_file = resources.PATH / constraint_filename
     constraint_versions = get_versions_from_constraint_file(constraint_file)
 
     build_environment["EXPECTED_PIP_VERSION"] = constraint_versions["pip"]

test/test_emscripten.py

@@ -6,7 +6,8 @@ import textwrap
 
 import pytest
 
-from cibuildwheel.util import CIBW_CACHE_PATH, CIProvider, detect_ci_provider
+from cibuildwheel.ci import CIProvider, detect_ci_provider
+from cibuildwheel.util.file import CIBW_CACHE_PATH
 
 from . import test_projects, utils
 

test/utils.py

@@ -18,7 +18,7 @@ from typing import Any, Final
 import pytest
 
 from cibuildwheel.architecture import Architecture
-from cibuildwheel.util import CIBW_CACHE_PATH
+from cibuildwheel.util.file import CIBW_CACHE_PATH
 
 EMULATED_ARCHS: Final[list[str]] = sorted(
     arch.value for arch in (Architecture.all_archs("linux") - Architecture.auto_archs("linux"))