Merge pull request #373 from Blosc/new-wheels-actions

Updated config file for github

Author: FrancescAlted

.github/workflows/cibuildwheels.yml

@@ -14,39 +14,50 @@ env:
   # Skip testing on aarch64 for now, as it is emulated on GitHub Actions and takes too long
   # Now that github provides native arm64 runners, we can enable tests again
   # CIBW_TEST_SKIP: "*linux*aarch64*"
+  # Skip PyPy wheels for now (numexpr needs some adjustments first)
+  # musllinux takes too long to build, and it's not worth it for now
+  CIBW_SKIP: "pp* *musllinux* *-win32"
 
 jobs:
 
   build_wheels:
-    name: Build wheels on ${{ matrix.os }} for ${{ matrix.arch }} - ${{ matrix.p_ver }}
-    runs-on: ${{ matrix.os }}
+    name: Build wheels on ${{ matrix.os }} for ${{ matrix.arch }}
+    runs-on: ${{ matrix.runs-on || matrix.os }}
     permissions:
       contents: write
     env:
       CIBW_BUILD: ${{ matrix.cibw_build }}
       CIBW_ARCHS_LINUX: ${{ matrix.arch }}
       CIBW_ARCHS_MACOS: "x86_64 arm64"
     strategy:
+      fail-fast: false
       matrix:
-        os: [ubuntu-latest, ubuntu-24.04-arm, windows-latest, macos-latest]
-        arch: [x86_64, aarch64]
-        # aarch64 is emulated, and it is giving issues with cibuildwheel
-        # Just build for x86_64 for now (Mac arm64 is already covered by cibuildwheel)
-        # arch: [x86_64]
-        cibw_build: ["cp3{11,12,13}-*"]
-        p_ver: ["3.11-3.13"]
-        exclude:
-          - os: windows-latest
-            arch: aarch64
-          # cibuild is already in charge to build aarch64 (see CIBW_ARCHS_MACOS)
-          - os: macos-latest
-            arch: aarch64
-          # Mutually exclude aarch64 and x86_64 for ubuntu-24.04-arm and ubuntu-latest
-          - os: ubuntu-24.04-arm
-            arch: x86_64
+        include:
+          # Linux x86_64 builds
           - os: ubuntu-latest
+            arch: x86_64
+            cibw_pattern: "cp3{11,12,13}-manylinux*"
+            artifact_name: "linux-x86_64"
+
+          # Linux ARM64 builds (native runners)
+          - os: ubuntu-24.04-arm
             arch: aarch64
+            cibw_pattern: "cp3{11,12,13}-manylinux*"
+            artifact_name: "linux-aarch64"
+            # Don't use native runners for now (looks like wait times are too long)
+            #runs-on: ["ubuntu-latest", "arm64"]
+
+          # Windows builds
+          - os: windows-latest
+            arch: x86_64
+            cibw_pattern: "cp3{11,12,13}-win64"
+            artifact_name: "windows-x86_64"
 
+          # macOS builds (universal2)
+          - os: macos-latest
+            arch: x86_64
+            cibw_pattern: "cp3{11,12,13}-macosx*"
+            artifact_name: "macos-universal2"
     steps:
       - name: Checkout repo
         uses: actions/checkout@v4
@@ -58,9 +69,9 @@ jobs:
           python-version: '3.x'
 
       # For some reason, this is still needed, even when using new arm64 runners
-      - name: Set up QEMU
-        if: ${{ matrix.arch == 'aarch64' }}
-        uses: docker/setup-qemu-action@v3
+#      - name: Set up QEMU
+#        if: ${{ matrix.arch == 'aarch64' }}
+#        uses: docker/setup-qemu-action@v3
 
       - name: Install Ninja
         id: ninja
@@ -74,64 +85,47 @@ jobs:
       - name: Build wheels
         uses: pypa/[email protected]
 
-      - name: Upload wheels
-        uses: actions/upload-artifact@v4
-        with:
-          name: wheels-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.p_ver }}
-          path: ./wheelhouse/*.whl
-
-  build_sdist:
-    name: Build sdist
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: [3.12]
-        os: [ubuntu-latest]
-        arch: [auto]
-        exclude:
-          - os: [ubuntu-latest]
-            # We don't support 32-bit platforms in python-blosc2
-            arch: x86
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/setup-python@v5
-        name: Setup Python ${{ matrix.python-version }}
-        with:
-          python-version: ${{ matrix.python-version }}
-
-      - name: Build sdist
-        run: pipx run build --sdist --outdir ./wheelhouse
-
-      - name: Upload sdist package
-        uses: actions/upload-artifact@v4
-        with:
-          name: wheels-source
-          path: wheelhouse/*.tar.gz
+      - name: Make sdist
+        if: ${{ matrix.os == 'ubuntu-latest' }}
+        run: |
+          python -m pip install build
+          python -m build --sdist --outdir wheelhouse .
 
       - name: Build building extension from sdist package
+        if: ${{ matrix.os == 'ubuntu-latest' }}
         run: |
           cd ./wheelhouse
           tar -xzf blosc2-*.tar.gz
           cd ./blosc2-*/
+          python -m venv sdist_test_env
+          source sdist_test_env/bin/activate
           pip install pip --upgrade
           pip install --break-system-packages -e .[test]
 
       - name: Test sdist package with pytest
+        if: ${{ matrix.os == 'ubuntu-latest' }}
+        timeout-minutes: 10
         run: |
           cd ./wheelhouse/blosc2-*/
-          pytest
+          source sdist_test_env/bin/activate
+          python -m pytest tests/test_open.py tests/test_vlmeta.py tests/ndarray/test_evaluate.py
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.artifact_name }}
+          path: |
+            ./wheelhouse/*.whl
+            ./wheelhouse/*.tar.gz
+
 
   upload_pypi:
-    needs: [ build_wheels, build_sdist ]  # last but not least
+    needs: [ build_wheels]
     runs-on: ubuntu-latest
     # Only upload wheels when tagging (typically a release)
     if: startsWith(github.event.ref, 'refs/tags')
     steps:
       - uses: actions/download-artifact@v4
         with:
-          name: wheels-*
           path: ./wheelhouse
           merge-multiple: true  # Merge all the wheels artifacts into one directory