Merge branch 'main' into fix_ci

SciTools · Sep 4, 2024 · fd9ac06 · fd9ac06
2 parents 6750636 + 7b5d1aa
commit fd9ac06
Show file tree

Hide file tree

Showing 14 changed files with 258 additions and 210 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -7,8 +7,12 @@ updates:
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
-      # Check for updates to GitHub Actions every weekday
-      interval: "daily"
+      # Check later in the week - the upstream dependabot check in `workflows` runs deliberately early in the week.
+      #  Therefore allowing time for the `workflows` update to be merged-and-released first.
+      interval: "weekly"
+      day: "thursday"
+      time: "01:00"
+      timezone: "Europe/London"
     groups:
       dependencies:
         patterns:

diff --git a/.github/workflows/ci-locks.yml b/.github/workflows/ci-locks.yml
@@ -18,5 +18,5 @@ concurrency:
 
 jobs:
   refresh_lockfiles:
-    uses: scitools/workflows/.github/workflows/refresh-lockfiles.yml@2024.06.0
+    uses: scitools/workflows/.github/workflows/refresh-lockfiles.yml@2024.07.4
     secrets: inherit
diff --git a/.github/workflows/ci-manifest.yml b/.github/workflows/ci-manifest.yml
@@ -25,4 +25,4 @@ concurrency:
 jobs:
   manifest:
     name: "check-manifest"
-    uses: scitools/workflows/.github/workflows/ci-manifest.yml@2024.06.0
+    uses: scitools/workflows/.github/workflows/ci-manifest.yml@2024.07.4
diff --git a/.github/workflows/ci-wheels.yml b/.github/workflows/ci-wheels.yml
@@ -48,7 +48,7 @@ jobs:
         fetch-depth: 0
 
     - name: "build ${{ matrix.os }} (${{ matrix.arch }}) wheels"
-      uses: pypa/cibuildwheel@v2.18.1
+      uses: pypa/cibuildwheel@v2.19.2
       env:
         CIBW_SKIP: "cp39-* cp313-* pp* *-musllinux*"
         CIBW_ARCHS: ${{ matrix.arch }}

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,5 +1,9 @@
 # See https://pre-commit.com for more information
 # See https://pre-commit.com/hooks.html for more hooks
+
+ci:
+  autoupdate_commit_msg: "chore: update pre-commit hooks"
+
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
     rev: 'v4.6.0'
@@ -16,14 +20,14 @@ repos:
     -   id: debug-statements
         # Don't commit to master branch.
     -   id: no-commit-to-branch
--   repo: https://github.com/psf/black
-    rev: '24.4.2'
+-   repo: https://github.com/psf/black-pre-commit-mirror
+    rev: '24.8.0'
     hooks:
     -   id: black
         types: [file, python]
         args: [--config=./pyproject.toml, .]
 -   repo: https://github.com/PyCQA/flake8
-    rev: '7.0.0'
+    rev: '7.1.1'
     hooks:
         # Run flake8.
     -   id: flake8

diff --git a/requirements/locks/py310-linux-64.lock b/requirements/locks/py310-linux-64.lock
diff --git a/requirements/locks/py311-linux-64.lock b/requirements/locks/py311-linux-64.lock
diff --git a/requirements/locks/py39-linux-64.lock b/requirements/locks/py39-linux-64.lock
diff --git a/requirements/py310.yml b/requirements/py310.yml
@@ -11,7 +11,7 @@ dependencies:
   - setuptools-scm
 
 # Core dependencies.
-  - numpy>=1.21
+  - numpy==1.26.4
   - cython
 
 # Optional dependencies.

diff --git a/requirements/py311.yml b/requirements/py311.yml
@@ -11,7 +11,7 @@ dependencies:
   - setuptools-scm
 
 # Core dependencies.
-  - numpy>=1.21
+  - numpy==1.26.4
   - cython
 
 # Optional dependencies.

diff --git a/requirements/py39.yml b/requirements/py39.yml
@@ -11,7 +11,7 @@ dependencies:
   - setuptools-scm
 
 # Core dependencies.
-  - numpy>=1.21
+  - numpy==1.26.4
   - cython
 
 # Optional dependencies.

diff --git a/requirements/pypi-core.txt b/requirements/pypi-core.txt
@@ -1,3 +1,3 @@
 Cython
 dask[array]
-numpy>=1.21
+numpy==1.26.4
diff --git a/src/stratify/_conservative.pyx b/src/stratify/_conservative.pyx
@@ -1,6 +1,8 @@
 import numpy as np
 cimport numpy as np
 
+# Must be called to use the C-API with Numpy.
+np.import_array()
 
 cdef calculate_weights(np.ndarray[np.float64_t, ndim=2] src_point,
                        np.ndarray[np.float64_t, ndim=2] tgt_point):

diff --git a/src/stratify/_vinterp.pyx b/src/stratify/_vinterp.pyx
@@ -10,6 +10,8 @@ import numpy as np
 cimport cython
 cimport numpy as np
 
+# Must be called to use the C-API with Numpy.
+np.import_array()
 
 cdef extern from "numpy/npy_math.h" nogil:
     bint isnan "npy_isnan"(long double)