update github actions

.github/workflows/pip.yml

@@ -0,0 +1,38 @@
+name: Pip
+
+on:
+  workflow_dispatch:
+  pull_request:
+  push:
+    branches:
+      - main
+
+jobs:
+  build:
+    name: Build with Pip
+    runs-on: ${{ matrix.platform }}
+    strategy:
+      fail-fast: false
+      matrix:
+        platform: [windows-latest, macos-latest, ubuntu-latest]
+        python-version: ["3.8", "3.12"]
+
+    steps:
+    - uses: actions/checkout@v4
+
+    - uses: actions/setup-python@v5
+      with:
+        python-version: ${{ matrix.python-version }}
+
+    - name: Set min macOS version
+      if: runner.os == 'macOS'
+      run: |
+        echo "MACOSX_DEPLOYMENT_TARGET=10.14" >> $GITHUB_ENV
+
+    - name: Build and install
+      run: |
+        python -m pip install pytest numpy drjit
+        pip install --verbose .
+
+    - name: Test
+      run: python -m pytest

.github/workflows/wheels.yml

@@ -10,26 +10,14 @@ on:
     types:
       - published
 
-env:
-  CIBW_SKIP: "*-musllinux* pp* cp36-* cp37-*"
-  CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
-  CIBW_ARCHS_WINDOWS: auto64
-  CIBW_ARCHS_LINUX: auto64
-  CIBW_REPAIR_WHEEL_COMMAND_LINUX: "python .github/workflows/tag_wheel_manylinux.py {wheel} {dest_dir}"
-  CIBW_REPAIR_WHEEL_COMMAND_MACOS: "delocate-wheel --require-archs {delocate_archs} -w {dest_dir} --ignore-missing-dependencies {wheel}"
-  CIBW_TEST_COMMAND: "python -c \"import fastsweep\""
-  CIBW_TEST_REQUIRES: pytest numpy drjit
-  CIBW_TEST_SKIP: "*-macosx_arm64"
-  MACOSX_DEPLOYMENT_TARGET: 10.14
-
 jobs:
   build_sdist:
     name: Build SDist
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
-        submodules: recursive
+        submodules: true
 
     - name: Build SDist
       run: pipx run build --sdist
@@ -43,64 +31,24 @@ jobs:
         path: dist/*.tar.gz
 
   build_wheels:
-    name: >
-      Build wheels on ${{ matrix.os }}
-      ${{ (matrix.os == 'macos-latest' && format('({0})', matrix.cibw-arch)) || '' }}
+    name: Wheels on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     strategy:
-      matrix:
-        os: [ubuntu-20.04, windows-latest]
-        include:
-          - os: macos-latest
-            cibw-arch: x86_64
-          - os: macos-latest
-            cibw-arch: arm64
       fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-13, macos-14, windows-latest]
 
     steps:
-    - uses: actions/checkout@v3
-      with:
-        submodules: recursive
-
-    - uses: actions/setup-python@v4
-      name: Install Python
-      with:
-        python-version: '3.10'
-
-    - name: Prepare compiler environment for Windows
-      if: runner.os == 'Windows'
-      uses: ilammy/msvc-dev-cmd@v1
+    - uses: actions/checkout@v4
       with:
-        arch: x64
+        submodules: true
 
-    - name: Install cibuildwheel
-      run: |
-        python -m pip install cibuildwheel==2.11.2
-
-    - name: Prepare cibuildwheel environment for macOS
-      if: runner.os == 'macOS'
-      run: |
-        [[ "arm64" == "${{ matrix.cibw-arch }}" ]] && \
-        echo "FASTSWEEP_CMAKE_TOOLCHAIN_FILE=$(pwd)/.github/workflows/macOS_arm64_toolchain.cmake" >> $GITHUB_ENV && \
-        echo "CIBW_BEFORE_BUILD_MACOS=\
-        rm -rf /tmp/drjit_wheel && mkdir -p /tmp/drjit_wheel/ && cd /tmp/drjit_wheel && \
-        pip download --platform=macosx_11_0_arm64 --only-binary=:all: drjit && \
-        unzip *.whl" >> $GITHUB_ENV && \
-        echo "FASTSWEEP_DRJIT_CMAKE_DIR=/tmp/drjit_wheel/drjit/share/cmake/drjit" >> $GITHUB_ENV
-
-        echo "CIBW_ARCHS_MACOS=${{ matrix.cibw-arch }}" >> $GITHUB_ENV
-
-    - name: Build wheels
-      run: |
-        python -m cibuildwheel --output-dir wheelhouse
+    - uses: pypa/[email protected]
 
     - name: Verify clean directory
       run: git diff --exit-code
       shell: bash
 
-    - name: Check metadata
-      run: pipx run twine check wheelhouse/*
-
     - name: Upload wheels
       uses: actions/upload-artifact@v4
       with:
@@ -112,15 +60,17 @@ jobs:
     needs: [build_wheels, build_sdist]
     runs-on: ubuntu-latest
     if: github.event_name == 'release' && github.event.action == 'published'
-    steps:
-    - uses: actions/setup-python@v2
 
-    - uses: actions/download-artifact@v2
+    steps:
+    - uses: actions/setup-python@v5
+    - uses: actions/download-artifact@v4
       with:
-        name: artifact
-        path: dist
+        name: dist
+        pattern: dist-*
+        merge-multiple: true
 
-    - uses: pypa/gh-action-pypi-publish@v1.5.0
+    - uses: pypa/gh-action-pypi-publish@release/v1
       with:
         user: __token__
-        password: ${{ secrets.PYPI_API_TOKEN }}
+        password: ${{ secrets.PYPI_API_TOKEN }}
+