Merge branch 'main' into cython_pin

HGWright · web-flow · commit 5ee1477b0a54 · 2025-06-05T15:10:24.000+01:00
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@2025.02.0
+    uses: scitools/workflows/.github/workflows/refresh-lockfiles.yml@2025.05.1
     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@2025.02.0
+    uses: scitools/workflows/.github/workflows/ci-manifest.yml@2025.05.1
diff --git a/.github/workflows/ci-template-check.yml b/.github/workflows/ci-template-check.yml
@@ -0,0 +1,16 @@
+# Checks if a PR makes any changes that ought to be shared via templating.
+# See the called workflow in the scitools/workflows repo for more details.
+
+name: ci-template-check
+
+on:
+  pull_request_target:
+    branches:
+      - main
+
+jobs:
+  prompt-share:
+    uses: scitools/workflows/.github/workflows/ci-template-check.yml@2025.05.1
+    secrets: inherit
+    with:
+      pr_number: ${{ github.event.pull_request.number }}
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.22.0
+      uses: pypa/cibuildwheel@v2.23.3
       env:
         CIBW_SKIP: "cp39-* cp313-* pp* *-musllinux*"
         CIBW_ARCHS: ${{ matrix.arch }}
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -38,7 +38,7 @@ repos:
 
 
 -   repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.9.4"
+    rev: "v0.11.8"
     hooks:
     -   id: ruff
         types: [file, python]
@@ -56,7 +56,7 @@ repos:
 
 
 -   repo: https://github.com/pycqa/isort
-    rev: '6.0.0'
+    rev: '6.0.1'
     hooks:
     -   id: isort
         name: isort (cython)
@@ -70,19 +70,19 @@ repos:
       types: [file, python]
 
 -   repo: https://github.com/pre-commit/mirrors-mypy
-    rev: 'v1.14.1'
+    rev: 'v1.15.0'
     hooks:
     -   id: mypy
         exclude: 'noxfile\.py|docs/conf\.py'
 
 -   repo: https://github.com/abravalheri/validate-pyproject
     # More exhaustive than Ruff RUF200.
-    rev: "v0.23"
+    rev: "v0.24.1"
     hooks:
     - id: validate-pyproject
 
 -   repo: https://github.com/scientific-python/cookie
-    rev: 2025.01.22
+    rev: 2025.05.02
     hooks:
     - id: sp-repo-review
       additional_dependencies: ["repo-review[cli]"]
diff --git a/pyproject.toml b/pyproject.toml
@@ -2,9 +2,9 @@
 # Defined by PEP 518
 requires = [
   "Cython",
-  "oldest-supported-numpy",
-  "setuptools>=61",
-  "setuptools_scm[toml]>=7",
+  "numpy>=2",
+  "setuptools>=77.0.3",
+  "setuptools_scm[toml]>=8",
   "wheel",
 ]
 # Defined by PEP 517
@@ -17,7 +17,6 @@ authors = [
 classifiers = [
     "Development Status :: 5 - Production/Stable",
     "Intended Audience :: Science/Research",
-    "License :: OSI Approved :: BSD License",
     "Operating System :: POSIX",
     "Operating System :: POSIX :: Linux",
     "Operating System :: Unix",
@@ -44,7 +43,8 @@ keywords = [
     "python",
     "ocean-science",
 ]
-license = {text = "BSD-3-Clause"}
+license = "BSD-3-Clause"
+license-files = ["LICENSE"]
 name = "stratify"
 requires-python = ">=3.10"
 
@@ -53,7 +53,6 @@ Code = "https://github.com/SciTools-incubator/python-stratify"
 Issues = "https://github.com/SciTools-incubator/python-stratify/issues"
 
 [tool.setuptools]
-license-files = ["LICENSE"]
 zip-safe = false
 
 [tool.setuptools.dynamic]
diff --git a/requirements/locks/py310-linux-64.lock b/requirements/locks/py310-linux-64.lock
@@ -55,6 +55,7 @@ https://conda.anaconda.org/conda-forge/linux-64/libstdcxx-ng-15.1.0-h4852527_2.c
 https://conda.anaconda.org/conda-forge/linux-64/libuuid-2.38.1-h0b41bf4_0.conda#40b61aab5c7ba9ff276c41cfffe6b80b
 https://conda.anaconda.org/conda-forge/linux-64/libxcb-1.17.0-h8a09558_0.conda#92ed62436b625154323d40d5f2f11dd7
 https://conda.anaconda.org/conda-forge/linux-64/libxcrypt-4.4.36-hd590300_1.conda#5aa797f8787fe7a17d1b0821485b5adc
+https://conda.anaconda.org/conda-forge/linux-64/libxml2-2.13.7-h81593ed_1.conda#0619e8fc4c8025a908ea3a3422d3b775
 https://conda.anaconda.org/conda-forge/linux-64/lz4-c-1.10.0-h5888daf_1.conda#9de5350a85c4a20c685259b889aa6393
 https://conda.anaconda.org/conda-forge/linux-64/readline-8.2-h8c095d6_2.conda#283b96675859b20a825f8fa30f311446
 https://conda.anaconda.org/conda-forge/linux-64/s2n-1.5.21-h7ab7c64_0.conda#28b5a7895024a754249b2ad7de372faa
diff --git a/requirements/locks/py311-linux-64.lock b/requirements/locks/py311-linux-64.lock
@@ -55,6 +55,7 @@ https://conda.anaconda.org/conda-forge/linux-64/libstdcxx-ng-15.1.0-h4852527_2.c
 https://conda.anaconda.org/conda-forge/linux-64/libuuid-2.38.1-h0b41bf4_0.conda#40b61aab5c7ba9ff276c41cfffe6b80b
 https://conda.anaconda.org/conda-forge/linux-64/libxcb-1.17.0-h8a09558_0.conda#92ed62436b625154323d40d5f2f11dd7
 https://conda.anaconda.org/conda-forge/linux-64/libxcrypt-4.4.36-hd590300_1.conda#5aa797f8787fe7a17d1b0821485b5adc
+https://conda.anaconda.org/conda-forge/linux-64/libxml2-2.13.7-h81593ed_1.conda#0619e8fc4c8025a908ea3a3422d3b775
 https://conda.anaconda.org/conda-forge/linux-64/lz4-c-1.10.0-h5888daf_1.conda#9de5350a85c4a20c685259b889aa6393
 https://conda.anaconda.org/conda-forge/linux-64/readline-8.2-h8c095d6_2.conda#283b96675859b20a825f8fa30f311446
 https://conda.anaconda.org/conda-forge/linux-64/s2n-1.5.21-h7ab7c64_0.conda#28b5a7895024a754249b2ad7de372faa
diff --git a/requirements/locks/py312-linux-64.lock b/requirements/locks/py312-linux-64.lock
@@ -55,6 +55,7 @@ https://conda.anaconda.org/conda-forge/linux-64/libstdcxx-ng-15.1.0-h4852527_2.c
 https://conda.anaconda.org/conda-forge/linux-64/libuuid-2.38.1-h0b41bf4_0.conda#40b61aab5c7ba9ff276c41cfffe6b80b
 https://conda.anaconda.org/conda-forge/linux-64/libxcb-1.17.0-h8a09558_0.conda#92ed62436b625154323d40d5f2f11dd7
 https://conda.anaconda.org/conda-forge/linux-64/libxcrypt-4.4.36-hd590300_1.conda#5aa797f8787fe7a17d1b0821485b5adc
+https://conda.anaconda.org/conda-forge/linux-64/libxml2-2.13.7-h81593ed_1.conda#0619e8fc4c8025a908ea3a3422d3b775
 https://conda.anaconda.org/conda-forge/linux-64/lz4-c-1.10.0-h5888daf_1.conda#9de5350a85c4a20c685259b889aa6393
 https://conda.anaconda.org/conda-forge/linux-64/readline-8.2-h8c095d6_2.conda#283b96675859b20a825f8fa30f311446
 https://conda.anaconda.org/conda-forge/linux-64/s2n-1.5.21-h7ab7c64_0.conda#28b5a7895024a754249b2ad7de372faa
diff --git a/requirements/py310.yml b/requirements/py310.yml
@@ -7,8 +7,8 @@ dependencies:
   - python=3.10
 
 # Setup dependencies.
-  - setuptools
-  - setuptools-scm
+  - setuptools>=77.0.3
+  - setuptools-scm>=8
 
 # Core dependencies.
   - numpy==1.26.4
diff --git a/requirements/py311.yml b/requirements/py311.yml
@@ -7,8 +7,8 @@ dependencies:
   - python=3.11
 
 # Setup dependencies.
-  - setuptools
-  - setuptools-scm
+  - setuptools>=77.0.3
+  - setuptools-scm>=8
 
 # Core dependencies.
   - numpy==1.26.4
diff --git a/requirements/py312.yml b/requirements/py312.yml
@@ -7,8 +7,8 @@ dependencies:
   - python=3.12
 
 # Setup dependencies.
-  - setuptools
-  - setuptools-scm
+  - setuptools>=77.0.3
+  - setuptools-scm>=8
 
 # Core dependencies.
   - numpy==1.26.4
diff --git a/requirements/pypi-core.txt b/requirements/pypi-core.txt
@@ -1,3 +1,3 @@
 Cython
 dask[array]
-numpy==1.26.4
+numpy>=2
