Merge pull request #217 from messense/cibuildwheel

Fix building  macOS arm64 wheel with cibuildwheel

Author: messense

.github/workflows/ci.yml

@@ -13,7 +13,7 @@ jobs:
   fmt:
     runs-on: "ubuntu-latest"
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v2
@@ -27,7 +27,7 @@ jobs:
   mypy:
     runs-on: "ubuntu-latest"
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v2
@@ -41,7 +41,7 @@ jobs:
   pytest:
     runs-on: "ubuntu-latest"
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v2
@@ -75,7 +75,7 @@ jobs:
             platform: { os: "windows-latest", python-architecture: "x86" }
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v2
@@ -248,7 +248,7 @@ jobs:
   test-cross:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@master
+      - uses: actions/checkout@v3
       - name: Setup python
         uses: actions/setup-python@v2
         with:
@@ -293,7 +293,7 @@ jobs:
   test-zigbuild:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@master
+      - uses: actions/checkout@v3
       - name: Setup python
         uses: actions/setup-python@v2
         with:
@@ -338,3 +338,22 @@ jobs:
             pip3 install namespace_package --no-index --find-links /io/dist/ --force-reinstall
             python3 -c "from namespace_package import rust; assert rust.rust_func() == 14"
             python3 -c "from namespace_package import python; assert python.python_func() == 15"
+
+  test-cibuildwheel:
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+          target: aarch64-apple-darwin
+          override: true
+      - uses: pypa/cibuildwheel@v2.3.1
+        env:
+          CIBW_BUILD: cp39-*
+          CIBW_BEFORE_BUILD: pip install -e .
+          CIBW_ARCHS_MACOS: "x86_64 universal2 arm64"
+          CIBW_BUILD_VERBOSITY: 1
+        with:
+          package-dir: examples/namespace_package

CHANGELOG.md

@@ -5,6 +5,9 @@
 - Add support for `kebab-case` executable names. [#205](https://github.com/PyO3/setuptools-rust/pull/205)
 - Add support for custom cargo profiles. [#216](https://github.com/PyO3/setuptools-rust/pull/216)
 
+### Fixed
+- Fix building macOS arm64 wheel with cibuildwheel. [#217](https://github.com/PyO3/setuptools-rust/pull/217)
+
 ## 1.1.2 (2021-12-05)
 ### Changed
 - Removed dependency on `tomli` to simplify installation. [#200](https://github.com/PyO3/setuptools-rust/pull/200)

setuptools_rust/build.py

@@ -92,6 +92,12 @@ def run_for_extension(self, ext: RustExtension) -> None:
         universal2 = False
         if self.plat_name.startswith("macosx-") and arch_flags:
             universal2 = "x86_64" in arch_flags and "arm64" in arch_flags
+            if not universal2 and not self.target:
+                if "arm64" in arch_flags:
+                    self.target = "aarch64-apple-darwin"
+                elif "x86_64" in arch_flags:
+                    self.target = "x86_64-apple-darwin"
+
         if universal2:
             arm64_dylib_paths = self.build_extension(ext, "aarch64-apple-darwin")
             x86_64_dylib_paths = self.build_extension(ext, "x86_64-apple-darwin")