.

Author: w1th0utnam3

.github/workflows/pysplashsurf_CI.yml

@@ -205,9 +205,8 @@ jobs:
         uses: PyO3/maturin-action@v1
         with:
           target: ${{ matrix.target }}
-          args: --release --out wheelhouse --auditwheel repair -m pysplashsurf/Cargo.toml
+          args: --release --out wheelhouse -m pysplashsurf/Cargo.toml
           # sccache: ${{ !startsWith(github.ref, 'refs/tags/') }}
-          manylinux: 2014
       - name: Audit & fix wheels
         run: |
           pip install delocate
@@ -218,18 +217,53 @@ jobs:
           name: wheels-macos-${{ matrix.target }}
           path: wheelhouse
 
+  # windows_wheels:
+  #   name: Build wheels for "${{ matrix.python-version }}"
+  #   needs: generate-stub
+  #   runs-on: windows-latest
+  #   strategy:
+  #     fail-fast: false
+  #     matrix:
+  #       include:
+  #         - archs: "AMD64"
+  #           python-version: "win_amd64"
+  #         - archs: "x86"
+  #           python-version: "win32"
+  #   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 }}
+  #           # Tests are broken on Windows because trimesh library tries to write temporary files which fails
+  #           #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
+
   windows_wheels:
-    name: Build wheels for "${{ matrix.python-version }}"
+    name: Build wheels for Windows ${{ matrix.target }}
     needs: generate-stub
     runs-on: windows-latest
     strategy:
       fail-fast: false
       matrix:
-        include:
-          - archs: "AMD64"
-            python-version: "win_amd64"
-          - archs: "x86"
-            python-version: "win32"
+        target: [x86_64, x86]
     steps:
       - uses: actions/checkout@v4
       - name: Download stub artifact
@@ -240,21 +274,20 @@ 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 }}
-            # Tests are broken on Windows because trimesh library tries to write temporary files which fails
-            #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/') }}
+      - name: Audit & fix wheels
+        run: |
+          pip install delvewheel
+          delvewheel repair -v wheelhouse/*.whl
       - name: Upload wheels
         uses: actions/upload-artifact@v4
         with:
-          name: wheels-${{ matrix.python-version }}
+          name: wheels-windows-${{ matrix.target }}
           path: wheelhouse
 
   sdist: