.

Author: w1th0utnam3

.github/workflows/pysplashsurf_CI.yml

@@ -128,30 +128,69 @@ jobs:
           manylinux: 2014
       - name: Audit wheels
         run: |
-          pip3 install auditwheel
+          pip install auditwheel
           auditwheel show wheelhouse/*.whl
       - name: Upload wheels
         uses: actions/upload-artifact@v4
         with:
           name: wheels-linux-${{ matrix.target }}
           path: wheelhouse
 
+  # macos_wheels:
+  #   name: Build wheels for "${{ matrix.python-version }}"
+  #   needs: generate-stub
+  #   runs-on: ${{ matrix.runner }}
+  #   strategy:
+  #     fail-fast: false
+  #     matrix:
+  #       include:
+  #         - runner: macos-13
+  #           python-version: "macosx_x86_64"
+  #           archs: "x86_64"
+  #           macosx_deployment_target: "13.0"
+  #         - runner: macos-14
+  #           python-version: "macosx_arm64"
+  #           archs: "arm64"
+  #           macosx_deployment_target: "14.0"
+  #   steps:
+  #     - uses: actions/checkout@v4
+  #     - name: Download stub artifact
+  #       uses: actions/download-artifact@v4
+  #       with:
+  #         name: pysplashsurf.pyi
+  #         path: pysplashsurf/pysplashsurf/
+  #     - uses: actions/setup-python@v5
+  #       with:
+  #         python-version: 3.12
+  #     - name: Install cibuildwheel
+  #       run: python -m pip install cibuildwheel==3.1.3
+  #     - name: Build wheels
+  #       run: python -m cibuildwheel --output-dir wheelhouse pysplashsurf
+  #       env:
+  #           CIBW_BUILD: ${{ format('cp312-{0}', matrix.python-version) }}
+  #           CIBW_ARCHS: ${{ matrix.archs }}
+  #           CIBW_ENVIRONMENT_MACOS: "MACOSX_DEPLOYMENT_TARGET=${{ matrix.macosx_deployment_target }}"
+  #           CIBW_TEST_COMMAND: "cargo install --path {project}/splashsurf && pytest pysplashsurf/tests"
+  #           CIBW_TEST_SOURCES: "pysplashsurf/tests"
+  #           CIBW_TEST_REQUIRES: pytest meshio trimesh rtree scipy
+  #     - name: Upload wheels
+  #       uses: actions/upload-artifact@v4
+  #       with:
+  #         name: wheels-${{ matrix.python-version }}
+  #         path: wheelhouse
+
   macos_wheels:
-    name: Build wheels for "${{ matrix.python-version }}"
+    name: Build wheels for macOS ${{ matrix.target }}
     needs: generate-stub
     runs-on: ${{ matrix.runner }}
     strategy:
       fail-fast: false
       matrix:
         include:
           - runner: macos-13
-            python-version: "macosx_x86_64"
-            archs: "x86_64"
-            macosx_deployment_target: "13.0"
+            target: x86_64
           - runner: macos-14
-            python-version: "macosx_arm64"
-            archs: "arm64"
-            macosx_deployment_target: "14.0"
+            target: aarch64
     steps:
       - uses: actions/checkout@v4
       - name: Download stub artifact
@@ -162,21 +201,21 @@ jobs:
       - uses: actions/setup-python@v5
         with:
           python-version: 3.12
-      - name: Install cibuildwheel
-        run: python -m pip install cibuildwheel==3.1.3
       - name: Build wheels
-        run: python -m cibuildwheel --output-dir wheelhouse pysplashsurf
-        env:
-            CIBW_BUILD: ${{ format('cp312-{0}', matrix.python-version) }}
-            CIBW_ARCHS: ${{ matrix.archs }}
-            CIBW_ENVIRONMENT_MACOS: "MACOSX_DEPLOYMENT_TARGET=${{ matrix.macosx_deployment_target }}"
-            CIBW_TEST_COMMAND: "cargo install --path {project}/splashsurf && pytest pysplashsurf/tests"
-            CIBW_TEST_SOURCES: "pysplashsurf/tests"
-            CIBW_TEST_REQUIRES: pytest meshio trimesh rtree scipy
+        uses: PyO3/maturin-action@v1
+        with:
+          target: ${{ matrix.target }}
+          args: --release --out wheelhouse -m pysplashsurf/Cargo.toml
+          # sccache: ${{ !startsWith(github.ref, 'refs/tags/') }}
+          manylinux: auto
+      - name: Audit wheels
+        run: |
+          pip install delocate
+          delocate-wheel -v wheelhouse/*.whl
       - name: Upload wheels
         uses: actions/upload-artifact@v4
         with:
-          name: wheels-${{ matrix.python-version }}
+          name: wheels-linux-${{ matrix.target }}
           path: wheelhouse
 
   windows_wheels: