Merge pull request #29283 from charris/backport-29248

charris · web-flow · commit fba39dd6e250 · 2025-06-27T11:19:22.000-06:00
TYP: Work around a mypy issue with bool arrays (#29248)
diff --git a/environment.yml b/environment.yml
@@ -25,7 +25,7 @@ dependencies:
   - hypothesis
   # For type annotations
   - typing_extensions>=4.5.0
-  - mypy=1.15.0
+  - mypy=1.16.1
   - orjson  # makes mypy faster
   # For building docs
   - sphinx>=4.5.0
diff --git a/numpy/__init__.pyi b/numpy/__init__.pyi
@@ -3814,14 +3814,14 @@ class bool(generic[_BoolItemT_co], Generic[_BoolItemT_co]):
     @property
     def imag(self) -> np.bool[L[False]]: ...
 
-    @overload
-    def __init__(self: np.bool[L[False]], /) -> None: ...
+    @overload  # mypy bug workaround: https://github.com/numpy/numpy/issues/29245
+    def __init__(self: np.bool[builtins.bool], value: Never, /) -> None: ...
     @overload
     def __init__(self: np.bool[L[False]], value: _Falsy = ..., /) -> None: ...
     @overload
     def __init__(self: np.bool[L[True]], value: _Truthy, /) -> None: ...
     @overload
-    def __init__(self, value: object, /) -> None: ...
+    def __init__(self: np.bool[builtins.bool], value: object, /) -> None: ...
 
     def __bool__(self, /) -> _BoolItemT_co: ...
     @overload
diff --git a/numpy/typing/tests/data/reveal/array_constructors.pyi b/numpy/typing/tests/data/reveal/array_constructors.pyi
@@ -39,6 +39,8 @@ assert_type(np.array(B, subok=True), SubClass[np.float64])
 assert_type(np.array(B, subok=True, ndmin=0), SubClass[np.float64])
 assert_type(np.array(B, subok=True, ndmin=1), SubClass[np.float64])
 assert_type(np.array(D), npt.NDArray[np.float64 | np.int64])
+# https://github.com/numpy/numpy/issues/29245
+assert_type(np.array([], dtype=np.bool), npt.NDArray[np.bool])
 
 assert_type(np.zeros([1, 5, 6]), npt.NDArray[np.float64])
 assert_type(np.zeros([1, 5, 6], dtype=np.int64), npt.NDArray[np.int64])
diff --git a/numpy/typing/tests/data/reveal/ma.pyi b/numpy/typing/tests/data/reveal/ma.pyi
@@ -343,8 +343,7 @@ assert_type(MAR_b.swapaxes(0, 1), MaskedArray[np.bool])
 assert_type(MAR_2d_f4.swapaxes(1, 0), MaskedArray[np.float32])
 
 assert_type(np.ma.nomask, np.bool[Literal[False]])
-# https://github.com/python/mypy/issues/18974
-assert_type(np.ma.MaskType, type[np.bool])  # type: ignore[assert-type]
+assert_type(np.ma.MaskType, type[np.bool])
 
 assert_type(MAR_1d.__setmask__([True, False]), None)
 assert_type(MAR_1d.__setmask__(np.False_), None)
diff --git a/requirements/test_requirements.txt b/requirements/test_requirements.txt
@@ -13,7 +13,7 @@ pytest-timeout
 # For testing types. Notes on the restrictions:
 # - Mypy relies on C API features not present in PyPy
 # NOTE: Keep mypy in sync with environment.yml
-mypy==1.15.0; platform_python_implementation != "PyPy"
+mypy==1.16.1; platform_python_implementation != "PyPy"
 typing_extensions>=4.5.0
 # for optional f2py encoding detection
 charset-normalizer
