Merge pull request #706 from numpy/bump-deps

Author: jorenham

pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["uv_build>=0.8"]
+requires = ["uv_build>=0.8.17,<0.9"]
 build-backend = "uv_build"
 
 [tool.uv.build-backend]
@@ -9,7 +9,7 @@ source-exclude = ['\@test', ".ruff_cache", ".ruff.toml"]
 
 [project]
 name = "numtype"
-version = "2.3.2.0.dev0"
+version = "2.3.3.0.dev0"
 description = "Experimental Typing Stubs for NumPy"
 readme = "README.md"
 authors = [{ name = "Joren Hammudoglu", email = "jhammudoglu@gmail.com" }]
@@ -39,7 +39,7 @@ requires-python = ">=3.11"
 dependencies = []
 
 [project.optional-dependencies]
-numpy = ["numpy>=2.3.2,<2.4"]
+numpy = ["numpy>=2.3.3,<2.4"]
 
 [project.urls]
 Homepage = "https://numpy.org/"
@@ -50,12 +50,12 @@ Changelog = "https://github.com/numpy/numtype/releases"
 [dependency-groups]
 numpy = ["numtype[numpy]"]
 lint = [
-  "dprint-py>=0.50.1.4",
-  "ruff>=0.12.10",
+  "dprint-py>=0.50.2.0",
+  "ruff>=0.13.0",
 ]
 pytest = [
   { include-group = "numpy" },
-  "pytest>=8.4.1",
+  "pytest>=8.4.2",
   "typing_extensions>=4.15.0",
 ]
 list_and_test = [
@@ -70,22 +70,21 @@ types = [
 basedpyright = [
   { include-group = "numpy" },
   { include-group = "types" },
-  "basedpyright>=1.31.3",
+  "basedpyright==1.31.3", # trait broke divmod in 1.1.404
 ]
 mypy = [
   { include-group = "types" },
-  "mypy[faster-cache]>=1.17.1",
+  "mypy[faster-cache]>=1.18.1",
 ]
 typecheck = [
   { include-group = "basedpyright" },
   { include-group = "mypy" },
 ]
 docs = [
-  "mkdocs-material>=9.6.18",
-  "pydantic>=2.12.0a1; python_version >= '3.14'", # needed for mkdocs-awesome-nav
-  "mkdocs-awesome-nav>=3.1.2",
+  "mkdocs-material>=9.6.20",
+  "mkdocs-awesome-nav>=3.2.0",
   "markdown-callouts>=0.4.0",
-  "mkdocs-include-markdown-plugin>=7.1.6",
+  "mkdocs-include-markdown-plugin>=7.1.7",
   "mkdocs-minify-plugin>=0.8.0",
   "mkdocstrings[python]>=0.30.0",
   "pygments>=2.19.2",

src/numpy-stubs/@test/static/accept/array_constructors.pyi

@@ -280,19 +280,19 @@ assert_type(np.atleast_3d(A), _nt.Array[np.float64])
 assert_type(np.atleast_3d(A, A), tuple[_nt.Array[np.float64], _nt.Array[np.float64]])
 assert_type(np.atleast_3d(A, A, A), tuple[_nt.Array[np.float64], ...])
 
-assert_type(np.vstack([A, A]), _nt.Array[np.float64])  # type: ignore[assert-type]  # mypy fail
+assert_type(np.vstack([A, A]), _nt.Array[np.float64])
 assert_type(np.vstack([A, A], dtype=np.float32), _nt.Array[np.float32])
 assert_type(np.vstack([A, C]), _nt.Array)
 assert_type(np.vstack([C, C]), _nt.Array)
 
-assert_type(np.hstack([A, A]), _nt.Array[np.float64])  # type: ignore[assert-type]  # mypy fail
+assert_type(np.hstack([A, A]), _nt.Array[np.float64])
 assert_type(np.hstack([A, A], dtype=np.float32), _nt.Array[np.float32])
 
-assert_type(np.stack([A, A]), _nt.Array[np.float64])  # type: ignore[assert-type]  # mypy fail
+assert_type(np.stack([A, A]), _nt.Array[np.float64])
 assert_type(np.stack([A, A], dtype=np.float32), _nt.Array[np.float32])
 assert_type(np.stack([A, C]), _nt.Array)
 assert_type(np.stack([C, C]), _nt.Array)
-assert_type(np.stack([A, A], axis=0), _nt.Array[np.float64])  # type: ignore[assert-type]  # mypy fail
+assert_type(np.stack([A, A], axis=0), _nt.Array[np.float64])
 assert_type(np.stack([A, A], out=B), MyArray[np.float64])
 
 assert_type(np.block([[A, A], [A, A]]), _nt.Array)  # pyright: ignore[reportAssertTypeFailure]  # _nt.Array[np.float64]

src/numpy-stubs/@test/static/accept/numerictypes.pyi

@@ -1,11 +1,11 @@
-from typing import Literal, assert_type
+from typing import Any, Literal, assert_type
 
 import numpy as np
 
 assert_type(np.ScalarType[0], type[int])
 assert_type(np.ScalarType[3], type[bool])
 assert_type(np.ScalarType[8], type[np.csingle])
-assert_type(np.ScalarType[10], type[np.clongdouble])
+assert_type(np.ScalarType[10], type[np.clongdouble | Any])
 assert_type(np.bool_(object()), np.bool)
 
 assert_type(np.typecodes["Character"], Literal["c"])

src/numpy-stubs/@test/static/reject/ma.pyi

@@ -2,7 +2,7 @@ import numpy as np
 
 m: np.ma.MaskedArray[tuple[int], np.dtype[np.float64]]
 
-m.shape = (3, 1)  # type: ignore[assignment]
+m.shape = (3, 1)  # type: ignore[arg-type, assignment]
 m.dtype = np.bool  # type: ignore[assignment, misc]  # pyright: ignore[reportAttributeAccessIssue]
 
 np.amin(m, axis=1.0)  # type: ignore[call-overload] # pyright: ignore[reportArgumentType, reportCallIssue]

src/numpy-stubs/_core/numerictypes.pyi

@@ -1,7 +1,5 @@
 from builtins import bool as py_bool
-from typing import Any, Final, Literal as L, TypedDict, type_check_only
-
-import numpy as np
+from typing import Any, Final, Literal as L, TypeAlias, TypedDict, type_check_only
 
 # ruff: noqa: ICN003
 from numpy import (
@@ -154,41 +152,45 @@ class _TypeCodes(TypedDict):
 ###
 
 typecodes: Final[_TypeCodes] = ...
-ScalarType: Final[
-    tuple[
-        type[int],
-        type[float],
-        type[complex],
-        type[py_bool],
-        type[bytes],
-        type[str],
-        type[memoryview[Any]],
-        type[np.bool],
-        type[csingle],
-        type[cdouble],
-        type[clongdouble],
-        type[half],
-        type[single],
-        type[double],
-        type[longdouble],
-        type[byte],
-        type[short],
-        type[intc],
-        type[long],
-        type[longlong],
-        type[timedelta64],
-        type[datetime64],
-        type[object_],
-        type[bytes_],
-        type[str_],
-        type[ubyte],
-        type[ushort],
-        type[uintc],
-        type[ulong],
-        type[ulonglong],
-        type[void],
-    ]
-] = ...
+
+# pyright: reportRedeclaration=false
+# NOTE: The order of same-kind same-itemsize types are unstable, hence the `| Any` in some places.
+# See https://github.com/numpy/numpy/pull/29761 for details
+_ScalarTypeTuple: TypeAlias = tuple[
+    type[int],
+    type[float],
+    type[complex],
+    type[py_bool],
+    type[bytes],
+    type[str],
+    type[memoryview[Any]],
+    type[bool_[Any]],
+    type[complex64],
+    type[complex128 | Any],
+    type[clongdouble | Any],
+    type[float16],
+    type[float32],
+    type[float64 | Any],
+    type[longdouble | Any],
+    type[int8],
+    type[int16],
+    type[int32 | Any],
+    type[long | Any],
+    type[int64],
+    type[datetime64[Any] | Any],
+    type[timedelta64[Any] | Any],
+    type[object_],
+    type[bytes_],
+    type[str_],
+    type[uint8],
+    type[uint16],
+    type[uint32 | Any],
+    type[ulong | Any],
+    type[uint64],
+    type[void],
+]
+
+ScalarType: Final[_ScalarTypeTuple] = ...
 typeDict: Final = sctypeDict
 
 def isdtype(dtype: dtype | type, kind: DTypeLike | tuple[DTypeLike, ...]) -> py_bool: ...

tool/stubtest.py

@@ -2,8 +2,7 @@
 # requires-python = ">=3.11"
 # dependencies = [
 #     "numtype[numpy]",
-#     "mypy[faster-cache]>=1.17.1",  # keep in sync with pyproject.toml
-#
+#     "mypy[faster-cache] >=1.18.1, <1.19",  # keep in sync with pyproject.toml
 #     "PyInstaller",
 #     "hypothesis",
 #     "pytest",
@@ -66,7 +65,7 @@ def _allowlists() -> list[str]:
 
 
 def _stubtest_command() -> list[str]:
-    cmd = ["stubtest"]
+    cmd = ["stubtest", "--ignore-disjoint-bases"]
     args_extra = sys.argv[1:]
 
     if not any("--mypy-config-file" in arg for arg in args_extra):