Add macOS/i86 wheels

PiperOrigin-RevId: 932631343

Author: dmitriplotnikov

release/pyproject.toml

@@ -54,6 +54,7 @@ container-engine = "docker; disable_host_mount: True"
 before-all = "git config --global http.sslVerify false && echo 'Installing bazelisk' && cp {project}/bazelisk-linux-amd64 /usr/local/bin/bazel"
 
 [tool.cibuildwheel.macos]
+archs = ["x86_64", "arm64"]
 before-all = "echo 'Installing bazelisk'; brew install bazelisk"
 
 [tool.cibuildwheel.windows]

release/setup.py

@@ -16,6 +16,7 @@
 
 import glob
 import os
+import platform
 import re
 import shutil
 import subprocess
@@ -48,7 +49,7 @@ def build_extension(self, ext):
     # the bazel build.
     python_version = f'{sys.version_info.major}.{sys.version_info.minor}'
 
-    print(f'Building for target Python version: {python_version}')
+    print(f'Building for target Python version: {python_version}', flush=True)
 
     module_bazel_path = os.path.join(os.path.dirname(__file__), 'MODULE.bazel')
     if os.path.exists(module_bazel_path):
@@ -75,8 +76,17 @@ def build_extension(self, ext):
       self.platform_config_windows(cmd, python_version)
     if sys.platform == 'darwin':
       self.platform_config_macos(cmd)
-    print(f"Building {ext.name} with bazel: {' '.join(cmd)}")
+    print(f'Building {ext.name} with bazel: {" ".join(cmd)}', flush=True)
+    sys.stdout.flush()
     subprocess.check_call(cmd)
+    if sys.platform == 'darwin':
+      try:
+        if os.path.exists('bazel-bin'):
+          print(f'bazel-bin symlink points to: {os.readlink("bazel-bin")}', flush=True)
+        else:
+          print('bazel-bin directory/symlink does not exist!', flush=True)
+      except Exception as e:
+        print(f'Failed to read bazel-bin symlink: {e}', flush=True)
 
     # Determine the output path of the bazel build
     # We handle targets like //:py_cel and //ext:ext_math
@@ -111,8 +121,15 @@ def build_extension(self, ext):
           f'Could not find bazel output for {ext.target} at {candidate_base}.*'
       )
 
-    print(f'Copying {found} to {dest_path}')
+    print(f'Copying {found} to {dest_path}', flush=True)
     shutil.copyfile(found, dest_path)
+    if sys.platform == 'darwin':
+      try:
+        print(f'Checking file architecture for {dest_path}:', flush=True)
+        sys.stdout.flush()
+        subprocess.call(['file', dest_path])
+      except Exception as e:
+        print(f'Failed to run file command: {e}', flush=True)
 
   def platform_config_windows(self, cmd, python_version):
     """Applies Windows-specific Bazel workarounds for Hermetic Python."""
@@ -163,6 +180,24 @@ def platform_config_macos(self, cmd):
     """Applies macOS-specific Bazel configurations."""
     cmd.extend(['--macos_minimum_os=10.13', '--cxxopt=-faligned-allocation'])
 
+    archflags = os.environ.get('ARCHFLAGS', '')
+    if 'x86_64' in archflags:
+      target_arch = 'x86_64'
+    elif 'arm64' in archflags:
+      target_arch = 'arm64'
+    else:
+      machine = platform.machine()
+      if machine in ('AMD64', 'x86_64'):
+        target_arch = 'x86_64'
+      elif machine in ('arm64', 'aarch64'):
+        target_arch = 'arm64'
+      else:
+        target_arch = machine
+
+    print(f'Target architecture for macOS: {target_arch}', flush=True)
+    cmd.append(f'--macos_cpus={target_arch}')
+    cmd.append(f'--cpu=darwin_{target_arch}')
+
 
 setuptools.setup(
     name='cel-expr-python',