Merge branch 'main' into mkitti-i386-test-pcodec

Author: d-v-b

.github/workflows/ci-i386.yml

@@ -66,15 +66,6 @@ jobs:
           uv pip install -v -e .[test,test_extras,msgpack,crc32c,pcodec,zfpy]
         shell: alpine.sh {0}
 
-
-      - name: Install zarr-python
-        # Since zarr v3 requires numpy >= 1.25, on Python 3.11 leave it out
-        # so we can have some tests of our minimum version of numpy (1.24)
-        if: matrix.python-version != '3.11'
-        run: uv add zarr>=3
-        shell: alpine.sh {0}
-
-
       - name: List installed packages
         run: uv pip list
         shell: alpine.sh {0}

.github/workflows/ci.yaml

@@ -52,12 +52,6 @@ jobs:
           export DISABLE_NUMCODECS_AVX2=""
           python -m pip install -v -e .[test,test_extras,msgpack,crc32c,pcodec,zfpy]
 
-      - name: Install zarr-python
-        # Since zarr v3 requires numpy >= 1.25, on Python 3.11 leave it out
-        # so we can have some tests of our minimum version of numpy (1.24)
-        if: matrix.python-version != '3.11'
-        run: python -m pip install zarr>=3
-
       - name: List installed packages
         run: python -m pip list
 
@@ -75,6 +69,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
+      matrix:
+        zarr-version: ["312", "313"]
 
     defaults:
       run:
@@ -93,10 +89,10 @@ jobs:
           pixi-version: v0.49.0
           cache: false
 
-      - name: List deps
+      - name: List installed packages
         shell: "bash -l {0}"
-        run: pixi run -e default hatch run test:list-deps
+        run: pixi run ls-deps-${{matrix.zarr-version}}
 
-      - name: Run tests
+      - name: Run tests with Zarr ${{ matrix.zarr-version }}
         shell: "bash -l {0}"
-        run: pixi run -e default hatch run test:test-zarr
+        run: pixi run test-zarr-${{ matrix.zarr-version }}

.github/workflows/wheel.yaml

@@ -23,16 +23,17 @@ jobs:
         os: [ubuntu-latest, ubuntu-22.04-arm, windows-latest, macos-13, macos-14]
     env:
       CIBW_TEST_COMMAND: python -c "import numcodecs"
-      CIBW_BUILD: "cp311-* cp312-* cp313-*"
-      CIBW_SKIP: "pp* *-musllinux_* *win32 *_i686 *_s390x"
+      CIBW_BUILD: "cp311-* cp312-* cp313-* cp314-*"
+      CIBW_SKIP: "*-musllinux_* *win32 *_i686 *_s390x"
       # note: CIBW_ENVIRONMENT is now set in pyproject.toml
 
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: true
+          fetch-depth: 0  # required for version resolution for nightly wheels
 
-      - uses: pypa/cibuildwheel@v2.23.2
+      - uses: pypa/cibuildwheel@v3.1.0
 
       - uses: actions/upload-artifact@v4
         with:
@@ -46,6 +47,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: true
+          fetch-depth: 0
 
       - uses: actions/setup-python@v5
         name: Install Python
@@ -67,11 +69,11 @@ jobs:
     needs: [build_wheels, build_sdist]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v6
         with:
           name: sdist
           path: dist
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v6
         with:
           pattern: wheels-*
           path: dist
@@ -87,11 +89,11 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/v')
     steps:
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v6
         with:
           name: sdist
           path: dist
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v6
         with:
           pattern: wheels-*
           path: dist
@@ -108,7 +110,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
     steps:
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v6
         with:
           pattern: wheels-*
           path: dist

.pre-commit-config.yaml

@@ -30,4 +30,4 @@ repos:
       hooks:
       -   id: mypy
           args: [--config-file, pyproject.toml]
-          additional_dependencies: [numpy, pytest, crc32c, zfpy, 'zarr>=3']
+          additional_dependencies: [numpy, pytest, crc32c, zfpy, 'zarr>=3.1.3']