migrate windows and macos CI to use CIBW

Signed-off-by: Isotr0py <[email protected]>

.github/workflows/release.yml

@@ -9,25 +9,27 @@ on:
   push:
     branches:
       - main
-      - dev
     tags:
       - '*'
   pull_request:
     branches:
       - main
+  release:
+    types:
+      - published
   workflow_dispatch:
 
 permissions:
   contents: read
 
 jobs:
-  linux:
-    runs-on: ubuntu-latest
-    timeout-minutes: 60
+  build_wheels:
+    name: Build wheels on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        # todo: enable aarch64, armv7, s390x, ppc64le
-        target: [auto]
+        os: [ubuntu-latest, windows-latest, macos-latest, macos-14]
+        target: ["auto"]
 
     steps:
       - uses: actions/checkout@v4
@@ -45,119 +47,50 @@ jobs:
       #   with:
       #     platforms: all
 
+      - name: Setup Rust
+        if: runner.os != 'Linux'
+        uses: hecrj/setup-rust-action@v2
+        with:
+          profile: minimal
+
       - name: Setup Rust in containers  
         if: runner.os == 'Linux'
         run: |  
           echo "CIBW_BEFORE_ALL=curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal" >> $GITHUB_ENV  
           echo "CARGO_HOME=/usr/local/" >> $GITHUB_ENV
-
-      - name: Build wheels
-        uses: pypa/[email protected]
-        env:
-          CIBW_SKIP: '*-musllinux_i686'
-          CIBW_ARCHS_LINUX: ${{ matrix.target }}
-          CIBW_ENVIRONMENT_PASS_LINUX: CARGO_HOME
-          CIBW_BUILD_VERBOSITY: 1
-          CIBW_BUILD_FRONTEND: "pip; args: --config-settings=build-args='--features=vendored'"
-
-      - name: Upload wheels
-        uses: actions/upload-artifact@v4
-        with:
-          name: wheels-linux-${{ matrix.target }}
-          path: ./wheelhouse/*.whl
-
-  windows:
-    runs-on: windows-latest
-    timeout-minutes: 60
-    strategy:
-      matrix:
-        target: [x64]
-    steps:
-      - name: Install dependencys
-        uses: msys2/setup-msys2@v2
-        with:
-          update: true
-          install: >-
-            mingw-w64-x86_64-toolchain
-            mingw-w64-x86_64-libjxl
-
-      - name: Put MSYS2_MinGW64 on PATH
-        # there is not yet an environment variable for this path from msys2/setup-msys2
-        run: echo "${{ runner.temp }}/msys64/mingw64/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-
-      - uses: actions/checkout@v4
-        with:
-          submodules: recursive
-
-      - uses: actions/setup-python@v5
-        with:
-          python-version: '>=3.9 <=3.13'
-          architecture: ${{ matrix.target }}
-
-      - name: Build wheels
-        uses: PyO3/maturin-action@v1
-        env: 
-          RUST_BACKTRACE: 1
-        with:
-          rust-toolchain: stable-x86_64-pc-windows-gnu
-          target: x86_64-pc-windows-gnu
-          args: --release --out wheels --find-interpreter --features dynamic
-          sccache: 'true'
-
-      - name: Fix wheels with delvewheel
-        run: |
-          pip install delvewheel
-          Get-ChildItem ${{ github.workspace }}/wheels/*win_amd64.whl | ForEach-Object -Process {delvewheel repair $PSItem -w dist}
-
-      - name: Upload wheels
-        uses: actions/upload-artifact@v4
-        with:
-          name: wheels-windows-${{ matrix.target }}
-          path: dist
-
-  macos:
-    runs-on: ${{ matrix.platform.runner }}
-    strategy:
-      matrix:
-        platform:
-          - runner: macos-latest
-            target: x86_64
-          - runner: macos-14
-            target: aarch64
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: recursive
-
-      - uses: actions/setup-python@v5
-        with:
-          python-version: '>=3.9 <=3.13'
       
-      - name: Check dependencys
+      - name: Setup Libjxl (macOS)
+        if: runner.os == 'macOS'
         run: |
           brew install jpeg-xl
           echo DEP_JXL_LIB=$(brew --prefix jpeg-xl)'/lib' >> $GITHUB_ENV
           echo DEP_BROTLI_LIB=$(brew --prefix brotli)'/lib' >> $GITHUB_ENV
           echo DEP_HWY_LIB=$(brew --prefix highway)'/lib' >> $GITHUB_ENV
+      
+      - name: Setup Libjxl (Windows)
+        if: runner.os == 'Windows'
+        uses: msys2/setup-msys2@v2
+        with:
+          update: true
+          install: >-
+            mingw-w64-x86_64-toolchain
+            mingw-w64-x86_64-libjxl
 
       - name: Build wheels
-        uses: PyO3/maturin-action@v1
-        env: 
-          RUST_BACKTRACE: 1
-          MACOSX_DEPLOYMENT_TARGET: 12.7
-          DEP_JXL_LIB: ${{ env.DEP_JXL_LIB }}
-          DEP_BROTLI_LIB: ${{ env.DEP_BROTLI_LIB }}
-          DEP_HWY_LIB: ${{ env.DEP_HWY_LIB }}
-        with:
-          target: ${{ matrix.platform.target }}
-          args: --release --out dist --find-interpreter --features dynamic
-          sccache: 'true'
+        uses: pypa/[email protected]
+        env:
+          CIBW_BUILD_VERBOSITY: 1
+          CIBW_SKIP: '*-musllinux_i686'
+          CIBW_ARCHS_LINUX: ${{ matrix.target }}
+          CIBW_ENVIRONMENT_PASS_LINUX: CARGO_HOME, DEP_JXL_LIB, DEP_BROTLI_LIB, DEP_HWY_LIB
+          CIBW_BEFORE_BUILD_WINDOWS: echo "${{ runner.temp }}/msys64/mingw64/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+          CIBW_BUILD_FRONTEND: "${{ runner.os == 'Linux' && 'pip' || 'pip; args: --config-settings=build-args=\"--features=dynamic\"' }}"
 
       - name: Upload wheels
         uses: actions/upload-artifact@v4
         with:
-          name: wheels-macos-${{ matrix.platform.target }}
-          path: dist
+          name: wheels-${{ matrix.os }}
+          path: ./wheelhouse/*.whl
 
   sdist:
     runs-on: ubuntu-latest
@@ -179,13 +112,13 @@ jobs:
           path: dist
 
   release:
-    name: Release
+    name: Pre-Release
     runs-on: ubuntu-latest
     timeout-minutes: 10
     permissions:
       contents: write
-    if: "startsWith(github.ref, 'refs/tags/')"
-    needs: [linux, windows, macos, sdist]
+    if: ${{ github.event_name == 'release' }}
+    needs: [build_wheels, sdist]
     steps:
       - uses: actions/download-artifact@v4
         with:
@@ -195,18 +128,18 @@ jobs:
         with:
           files: |
             wheels-*/*.whl
-          prerelease: ${{ contains(github.ref, 'alpha') || contains(github.ref, 'beta') || contains(github.ref, 'dev') }}
+          prerelease: 
       - name: Publish to TestPyPI
-        if: ${{ contains(github.ref, 'alpha') || contains(github.ref, 'beta') || contains(github.ref, 'dev') }}
+        if: ${{ github.event.release.prereleased }}
         uses: PyO3/maturin-action@v1
         env:
           MATURIN_PYPI_TOKEN: ${{ secrets.TESTPYPI_API_TOKEN }}
           MATURIN_REPOSITORY_URL: https://test.pypi.org/legacy/ 
         with:
           command: upload
-          args: --non-interactive --skip-existing wheels-*/*
+          args: --non-interactive
       - name: Publish to PyPI
-        if: ${{ !contains(github.ref, 'alpha') && !contains(github.ref, 'beta') && !contains(github.ref, 'dev') }}
+        if: ${{ !github.event.release.prereleased }}
         uses: PyO3/maturin-action@v1
         env:
           MATURIN_PYPI_TOKEN: ${{ secrets.PYPI_API_TOKEN }}

README.md

@@ -15,16 +15,16 @@ pip install pillow-jxl-plugin
 ```
 
 ## Build from source
-Make sure `Rust` and [maturin](https://github.com/PyO3/maturin) installed, then run:
+Make sure `Rust` installed, then run:
 ```
 git clone https://github.com/Isotr0py/pillow-jpegxl-plugin
 cd pillow-jpegxl-plugin
 
-maturin build --release --features vendored
+pip install -e .
 ```
 If you have `libjxl` installed and want to use dynamic link, run:
 ```
-maturin build --release --features dynamic
+pip install -e . --config-settings=build-args="--features=dynamic"
 ```
 
 ## Plugin Usage

pyproject.toml

@@ -27,4 +27,4 @@ dependencies = [
 "Releases" = "https://github.com/Isotr0py/pillow-jpegxl-plugin/releases"
 
 [tool.maturin]
-features = ["pyo3/extension-module"]
+features = ["pyo3/extension-module", "vendored"]