f

Author: mayeut

cibuildwheel/architecture.py

@@ -26,6 +26,19 @@
 ]
 
 
+def _check_aarch32_el0() -> bool:
+    """Check if running armv7l natively on aarch64 is supported"""
+    if not sys.platform.startswith("linux"):
+        return False
+    if platform_module.machine() != "aarch64":
+        return False
+    executable = shutil.which("linux32")
+    if executable is None:
+        return False
+    check = subprocess.run([executable, "uname", "-m"], check=False, capture_output=True, text=True)
+    return check.returncode == 0 and check.stdout.startswith("armv")
+
+
 @functools.total_ordering
 class Architecture(Enum):
     value: str
@@ -120,18 +133,8 @@ def auto_archs(platform: PlatformName) -> set[Architecture]:
             if Architecture.x86_64 in result:
                 # x86_64 machines can run i686 containers
                 result.add(Architecture.i686)
-            elif Architecture.aarch64 in result and sys.platform.startswith("linux"):
-                # check aarch32 EL0 support
-                executable = shutil.which("linux32")
-                if executable is not None:
-                    check = subprocess.run(
-                        [executable, "uname", "-m"],
-                        check=False,
-                        capture_output=True,
-                        text=True,
-                    )
-                    if check.returncode == 0 and check.stdout.startswith("armv"):
-                        result.add(Architecture.armv7l)
+            elif Architecture.aarch64 in result and _check_aarch32_el0():
+                result.add(Architecture.armv7l)
 
         if platform == "windows" and Architecture.AMD64 in result:
             result.add(Architecture.x86)

unit_test/architecture_test.py

@@ -1,10 +1,12 @@
 from __future__ import annotations
 
 import platform as platform_module
+import shutil
 import sys
 
 import pytest
 
+import cibuildwheel.architecture
 from cibuildwheel.architecture import Architecture
 
 
@@ -24,6 +26,7 @@ def platform_machine(request, monkeypatch):
     platform_name, platform_value, machine_value, machine_name = request.param
     monkeypatch.setattr(sys, "platform", platform_value)
     monkeypatch.setattr(platform_module, "machine", lambda: machine_value)
+    monkeypatch.setattr(cibuildwheel.architecture, "_check_aarch32_el0", lambda: True)
     return platform_name, machine_name
 
 
@@ -34,7 +37,7 @@ def test_arch_auto(platform_machine):
     expected = {
         "32": {Architecture.i686},
         "64": {Architecture.x86_64, Architecture.i686},
-        "arm": {Architecture.aarch64},
+        "arm": {Architecture.aarch64, Architecture.armv7l},
     }
     assert arch_set == expected[machine_name]
 
@@ -71,7 +74,7 @@ def test_arch_auto32(platform_machine):
     platform_name, machine_name = platform_machine
 
     arch_set = Architecture.parse_config("auto32", "linux")
-    expected = {"32": {Architecture.i686}, "64": {Architecture.i686}, "arm": set()}
+    expected = {"32": {Architecture.i686}, "64": {Architecture.i686}, "arm": {Architecture.armv7l}}
     assert arch_set == expected[machine_name]
 
     arch_set = Architecture.parse_config("auto32", "macos")
@@ -80,3 +83,18 @@ def test_arch_auto32(platform_machine):
     arch_set = Architecture.parse_config("auto32", "windows")
     expected = {"32": {Architecture.x86}, "64": {Architecture.x86}, "arm": set()}
     assert arch_set == expected[machine_name]
+
+
+def test_arch_auto_no_aarch32(monkeypatch):
+    monkeypatch.setattr(sys, "platform", "linux")
+    monkeypatch.setattr(platform_module, "machine", lambda: "aarch64")
+    monkeypatch.setattr(shutil, "which", lambda *args, **kwargs: None)
+
+    arch_set = Architecture.parse_config("auto", "linux")
+    assert arch_set == {Architecture.aarch64}
+
+    arch_set = Architecture.parse_config("auto64", "linux")
+    assert arch_set == {Architecture.aarch64}
+
+    arch_set = Architecture.parse_config("auto32", "linux")
+    assert len(arch_set) == 0

unit_test/main_tests/conftest.py

@@ -8,7 +8,7 @@
 
 import pytest
 
-from cibuildwheel import __main__, linux, macos, pyodide, windows
+from cibuildwheel import __main__, architecture, linux, macos, pyodide, windows
 from cibuildwheel.util import file
 
 
@@ -44,8 +44,8 @@ def ignore_call(*args, **kwargs):
     monkeypatch.setattr(linux, "build", fail_on_call)
     monkeypatch.setattr(macos, "build", fail_on_call)
     monkeypatch.setattr(pyodide, "build", fail_on_call)
-
     monkeypatch.setattr(Path, "mkdir", ignore_call)
+    monkeypatch.setattr(architecture, "_check_aarch32_el0", lambda: True)
 
 
 @pytest.fixture(autouse=True)