Merge pull request #601 from numpy/fix-ci-py314

jorenham · web-flow · commit 287bde7c53a9 · 2025-08-06T18:40:17.000+02:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -55,19 +55,21 @@ jobs:
       - name: format-ignores
         run: uv run tool/format_ignores.py --check
 
+  # NOTE: Static typing only differs between `python<3.12` and otherwise,
+  # so there's no need to run the type-checkers on all Python versions.
+
   basedpyright:
     runs-on: ubuntu-latest
     timeout-minutes: 5
     strategy:
       fail-fast: false
       matrix:
-        py: ["3.11", "3.12", "3.13", "3.14"]
+        py: ["3.11", "3.13"]
     steps:
       - uses: actions/checkout@v4.2.2
 
       - uses: astral-sh/setup-uv@v6.4.3
         with:
-          enable-cache: true
           python-version: ${{ matrix.py }}
 
       - name: basedpyright
@@ -79,7 +81,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        py: ["3.11", "3.12", "3.13", "3.14"]
+        py: ["3.11", "3.13"]
     steps:
       - uses: actions/checkout@v4.2.2
 
@@ -90,6 +92,8 @@ jobs:
       - name: mypy
         run: uv run --no-editable mypy --no-incremental --cache-dir=/dev/null .
 
+  # NOTE: Stubtest does runtime inspections, so we consider all Python versions.
+
   stubtest:
     runs-on: ${{ matrix.os }}
     timeout-minutes: 5
diff --git a/pyproject.toml b/pyproject.toml
@@ -75,6 +75,7 @@ typecheck = [
 ]
 docs = [
     "mkdocs-material>=9.6.16",
+    "pydantic>=2.12.0a1; python_version >= '3.14'", # needed for mkdocs-awesome-nav
     "mkdocs-awesome-nav>=3.1.2",
     "markdown-callouts>=0.4.0",
     "mkdocs-include-markdown-plugin>=7.1.6",
diff --git a/tool/allowlists/py311.txt b/tool/allowlists/py311.txt
@@ -1,4 +1,4 @@
-# python < 3.12
+# python 3.11.*
 
 # distutils is deprecated and does not exist on python>=3.12
 numpy\.distutils\.command\.\w+
diff --git a/tool/allowlists/py312.txt b/tool/allowlists/py312.txt
@@ -1,4 +1,4 @@
-# python >= 3.12
+# python 3.12.*
 
 numpy\.distutils
 numpy\.f2py\._backends\._distutils
diff --git a/tool/allowlists/py313.txt b/tool/allowlists/py313.txt
@@ -0,0 +1,4 @@
+# python 3.13.*
+
+numpy\.distutils
+numpy\.f2py\._backends\._distutils
diff --git a/tool/allowlists/py314.txt b/tool/allowlists/py314.txt
@@ -0,0 +1,5 @@
+# python 3.14.*
+
+numpy\.distutils
+numpy\.f2py\._backends\._distutils
+numpy\._core\._type_aliases\.__conditional_annotations__
diff --git a/tool/stubtest.py b/tool/stubtest.py
@@ -44,10 +44,7 @@
     __root_site = None
 ROOT_SITE_DIR = __root_site
 
-ALLOWLISTS = [
-    "common.txt",
-    ("ge" if sys.version_info >= (3, 12) else "lt") + "-py312.txt",
-]
+ALLOWLISTS = ["common.txt", f"py3{sys.version_info.minor}.txt"]
 
 
 def __check_simd() -> None:
diff --git a/tool/stubtest.py.lock b/tool/stubtest.py.lock
diff --git a/tool/ufunc.py.lock b/tool/ufunc.py.lock
diff --git a/uv.lock b/uv.lock

Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,7 @@ typecheck = [`
`75`	`75`	`]`
`76`	`76`	`docs = [`
`77`	`77`	`"mkdocs-material>=9.6.16",`
	`78`	`+ "pydantic>=2.12.0a1; python_version >= '3.14'", # needed for mkdocs-awesome-nav`
`78`	`79`	`"mkdocs-awesome-nav>=3.1.2",`
`79`	`80`	`"markdown-callouts>=0.4.0",`
`80`	`81`	`"mkdocs-include-markdown-plugin>=7.1.6",`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# python < 3.12`
	`1`	`+# python 3.11.*`
`2`	`2`
`3`	`3`	`# distutils is deprecated and does not exist on python>=3.12`
`4`	`4`	`numpy\.distutils\.command\.\w+`