Merge branch 'main' into typing-errors

Author: dstansby

.github/workflows/ci-osx.yaml

@@ -1,4 +1,4 @@
-name: Linux CI
+name: Tests
 
 on: [push, pull_request]
 
@@ -8,11 +8,13 @@ concurrency:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.platform }}
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.10", "3.11", "3.12"]
+        # macos-12 is an intel runner, macos-14 is a arm64 runner
+        platform: [ubuntu-latest, windows-latest, macos-12, macos-14]
 
     steps:
       - name: Checkout source
@@ -41,6 +43,13 @@ jobs:
           c-compiler cxx-compiler
           python=${{matrix.python-version}} wheel pip
 
+      - name: Install clang
+        shell: "bash -l {0}"
+        if: matrix.platform == 'macos-12'
+        run: |
+          conda activate env
+          conda install -y 'clang>=12.0.1,<17'
+
       - name: Show info about `env` environment
         shell: "bash -l {0}"
         run: |
@@ -51,7 +60,16 @@ jobs:
         run: |
           conda activate env
           export DISABLE_NUMCODECS_AVX2=""
-          python -m pip install -v -e .[test,test_extras,msgpack,zfpy,pcodec]
+          # TODO: put back zfpy import when it supports numpy 2.0
+          python -m pip install -v -e .[test,test_extras,msgpack,pcodec]
+
+      # This is used to test with zfpy, which does not yet support numpy 2.0
+      - name: Install older numpy and zfpy
+        if: matrix.python-version == '3.10'
+        shell: "bash -l {0}"
+        run: |
+          conda activate env
+          python -m pip install "zfpy>=1" "numpy<2"
 
       - name: List installed packages
         shell: "bash -l {0}"
@@ -71,11 +89,7 @@ jobs:
           conda activate env
           pytest -v
 
-      - uses: codecov/codecov-action@v3
+      - uses: codecov/codecov-action@v4
         with:
-          #token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos
-            #files: ./coverage1.xml,./coverage2.xml # optional
-            #flags: unittests # optional
-            #name: codecov-umbrella # optional
-            #fail_ci_if_error: true # optional (default = false)
-          verbose: true # optional (default = false)
+          token: ${{ secrets.CODECOV_TOKEN }}
+          verbose: true

.github/workflows/ci-windows.yaml

@@ -13,12 +13,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-12]
+        # macos-12 is an intel runner, macos-14 is a arm64 runner
+        os: [ubuntu-latest, windows-latest, macos-12, macos-14]
     env:
       CIBW_TEST_COMMAND: python -c "import numcodecs"
-      CIBW_SKIP: "pp* cp36-* *-musllinux_* *win32 *_i686 *_s390x"
-      CIBW_ARCHS_MACOS: 'x86_64 arm64'
-      CIBW_TEST_SKIP: '*-macosx_arm64'
+      CIBW_BUILD: "cp310-* cp311-* cp312-*"
+      CIBW_SKIP: "pp* *-musllinux_* *win32 *_i686 *_s390x"
       # note: CIBW_ENVIRONMENT is now set in pyproject.toml
 
     steps:
@@ -44,7 +44,7 @@ jobs:
       - uses: actions/setup-python@v5
         name: Install Python
         with:
-          python-version: '3.9'
+          python-version: '3.10'
 
       - name: Build sdist
         run: pipx run build --sdist

.github/workflows/ci-linux.yaml renamed to .github/workflows/ci.yaml

@@ -6,7 +6,7 @@ submodules:
 build:
   os: ubuntu-20.04
   tools:
-    python: "3.9"
+    python: "3.12"
 
 sphinx:
   configuration: docs/conf.py

.github/workflows/wheel.yaml

@@ -11,6 +11,10 @@ Release notes
 Unreleased
 ----------
 
+Maintenance
+~~~~~~~~~~~
+* The minimum supported Python version is now Python 3.10.
+
 Enhancements
 ~~~~~~~~~~~~
 
@@ -24,7 +28,7 @@ Fix
 
 * Fix skip of entry points backport tests
   By :user:`Elliott Sales de Andrade <QuLogic>`, :issue:`487`.
-* Fix Upgrade to Zstd 1.5.5 due to potential corruption. 
+* Fix Upgrade to Zstd 1.5.5 due to potential corruption.
   By :user:`Mark Kittisopikul <mkitti>`, :issue:`429`
 
 Maintenance

.readthedocs.yaml

@@ -17,12 +17,7 @@
 def run_entrypoints():
     entries.clear()
     eps = entry_points()
-    if hasattr(eps, 'select'):
-        # If entry_points() has a select method, use that. Python 3.10+
-        entries.update({e.name: e for e in eps.select(group="numcodecs.codecs")})
-    else:
-        # Otherwise, fallback to using get
-        entries.update({e.name: e for e in eps.get("numcodecs.codecs", [])})
+    entries.update({e.name: e for e in eps.select(group="numcodecs.codecs")})
 
 
 run_entrypoints()

docs/release.rst

@@ -14,9 +14,9 @@ A Python package providing buffer compression and transformation codecs \
 for use in data storage and communication applications."""
 readme =  "README.rst"
 dependencies = [
-    "numpy>=1.7,<2",
+    "numpy>=1.7",
 ]
-requires-python = ">=3.8"
+requires-python = ">=3.10"
 dynamic = [
   "version",
 ]