Trying to fix PyPI manylinux builds

Author: IvanIsCoding

.github/workflows/release_pypi.yml

@@ -21,29 +21,17 @@ jobs:
       matrix:
         build:
           - {
-              NAME: linux-x64-glibc,
+              NAME: linux-x64,
               OS: ubuntu-24.04,
               TOOLCHAIN: stable,
               TARGET: x86_64-unknown-linux-gnu,
             }
           - {
-              NAME: linux-x64-musl,
-              OS: ubuntu-24.04,
-              TOOLCHAIN: stable,
-              TARGET: x86_64-unknown-linux-musl,
-            }
-          - {
-              NAME: linux-arm64-glibc,
+              NAME: linux-arm64,
               OS: ubuntu-24.04-arm,
               TOOLCHAIN: stable,
               TARGET: aarch64-unknown-linux-gnu,
             }
-          - {
-              NAME: linux-arm64-musl,
-              OS: ubuntu-24.04-arm,
-              TOOLCHAIN: stable,
-              TARGET: aarch64-unknown-linux-musl,
-            }
           - {
               NAME: win32-x64-msvc,
               OS: windows-2025,
@@ -60,15 +48,6 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Install dependencies
-        shell: bash
-        run: |
-          if [[ "${{ matrix.build.NAME }}" = *"-musl" ]]; then
-            sudo apt-get update
-            sudo apt-get install -y --no-install-recommends \
-              --allow-unauthenticated musl-tools
-          fi
-
       - name: Install Rust ${{ matrix.build.TOOLCHAIN }}
         uses: dtolnay/rust-toolchain@stable
         with:
@@ -80,22 +59,29 @@ jobs:
         with:
           version: "0.9.22"
 
-      - name: Build Python wheels (linux x86-64 with sdist)
-        if: matrix.build.TARGET == 'x86_64-unknown-linux-gnu'
-        working-directory: pypi
+      - name: Install Python 3.12
+        run: uv python install 3.12
+
+      - name: Build Python wheels (Linux with cibuildwheel)
+        if: runner.os == 'Linux'
         run: |
-          uv build --wheel --sdist --out-dir dist
+          uv run cibuildwheel --output-dir pypi/dist
 
-      - name: Build Python wheels (other platforms)
-        if: matrix.build.TARGET != 'x86_64-unknown-linux-gnu'
+      - name: Build Python wheels (Windows/macOS)
+        if: runner.os != 'Linux'
         working-directory: pypi
         run: |
           uv build --wheel --out-dir dist
 
-      - name: Install uv
-        uses: astral-sh/setup-uv@v7
-        with:
-          version: "0.9.22"
+      - name: Publish wheels to PyPI
+        run: uv publish --trusted-publishing always pypi/dist/*.whl
 
-      - name: Publish to PyPI
-        run: uv publish --trusted-publishing always pypi/dist/*
+      - name: Build source distribution
+        if: matrix.build.TARGET == 'x86_64-unknown-linux-gnu'
+        working-directory: pypi
+        run: |
+          uv build --sdist --out-dir dist
+
+      - name: Publish source distribution to PyPI
+        if: matrix.build.TARGET == 'x86_64-unknown-linux-gnu'
+        run: uv publish --trusted-publishing always pypi/dist/*.tar.gz

Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 name = "celq"
 description = "A CEL command-line query tool for JSON data"
-version = "0.1.1-alpha.8"
+version = "0.1.1-alpha.9"
 edition = "2024"
 rust-version = "1.90"
 authors = ["Ivan Carvalho <ivancarvalho@gatech.edu>"]

Cargo.toml

@@ -4,7 +4,7 @@ requires-python = ">=3.10"
 description = "A CEL command-line query tool for JSON data"
 readme = {file = "README.md", content-type = "text/markdown"}
 license-files = ["LICENSE-MIT", "LICENSE-APACHE"]
-version = "0.1.1a8"
+version = "0.1.1a9"
 classifiers=[
     "Intended Audience :: Developers",
     "Programming Language :: Rust",
@@ -41,5 +41,6 @@ locked = true
 
 [dependency-groups]
 dev = [
-    "maturin>=1.9,<2",
+    "cibuildwheel==3.3.1 ; python_full_version >= '3.12'",
+    "maturin>=1.9,<2 ; python_full_version >= '3.12'",
 ]