Merge pull request numpy#26210 from mtsokol/bool_-typing

API: Readd `np.bool_` typing stub

Author: rgommers

numpy/__init__.pyi

@@ -2817,6 +2817,8 @@ class bool(generic):
     __gt__: _ComparisonOp[_NumberLike_co, _ArrayLikeNumber_co]
     __ge__: _ComparisonOp[_NumberLike_co, _ArrayLikeNumber_co]
 
+bool_ = bool
+
 class object_(generic):
     def __init__(self, value: object = ..., /) -> None: ...
     @property

numpy/_core/tests/_natype.py

@@ -15,7 +15,7 @@ def method(self, other):
         if (
             other is pd_NA
             or isinstance(other, (str, bytes))
-            or isinstance(other, (numbers.Number, np.bool_))
+            or isinstance(other, (numbers.Number, np.bool))
             or util.is_array(other)
             and not other.shape
         ):
@@ -119,7 +119,7 @@ def __reduce__(self):
     def __pow__(self, other):
         if other is pd_NA:
             return pd_NA
-        elif isinstance(other, (numbers.Number, np.bool_)):
+        elif isinstance(other, (numbers.Number, np.bool)):
             if other == 0:
                 # returning positive is correct for +/- 0.
                 return type(other)(1)
@@ -133,7 +133,7 @@ def __pow__(self, other):
     def __rpow__(self, other):
         if other is pd_NA:
             return pd_NA
-        elif isinstance(other, (numbers.Number, np.bool_)):
+        elif isinstance(other, (numbers.Number, np.bool)):
             if other == 1:
                 return other
             else:
@@ -170,7 +170,7 @@ def __xor__(self, other):
     __rxor__ = __xor__
 
     __array_priority__ = 1000
-    _HANDLED_TYPES = (np.ndarray, numbers.Number, str, np.bool_)
+    _HANDLED_TYPES = (np.ndarray, numbers.Number, str, np.bool)
 
     def __array_ufunc__(self, ufunc, method, *inputs, **kwargs):
         types = self._HANDLED_TYPES + (NAType,)

numpy/_core/tests/test_multiarray.py

@@ -1890,8 +1890,8 @@ def test_any_where(self):
             ["i8", "U10", "object", "datetime64[ms]"])
     def test_any_and_all_result_dtype(self, dtype):
         arr = np.ones(3, dtype=dtype)
-        assert arr.any().dtype == np.bool_
-        assert arr.all().dtype == np.bool_
+        assert arr.any().dtype == np.bool
+        assert arr.all().dtype == np.bool
 
     def test_any_and_all_object_dtype(self):
         # (seberg) Not sure we should even allow dtype here, but it is.

numpy/_core/tests/test_stringdtype.py

@@ -356,7 +356,7 @@ def test_isnan(dtype, string_list):
         # isnan is only true when na_object is a NaN
         assert_array_equal(
             np.isnan(sarr),
-            np.array([0] * len(string_list) + [1], dtype=np.bool_),
+            np.array([0] * len(string_list) + [1], dtype=np.bool),
         )
     else:
         assert not np.any(np.isnan(sarr))

numpy/lib/tests/test_function_base.py

@@ -254,8 +254,8 @@ def test_nd(self):
 @pytest.mark.parametrize("dtype", ["i8", "U10", "object", "datetime64[ms]"])
 def test_any_and_all_result_dtype(dtype):
     arr = np.ones(3, dtype=dtype)
-    assert np.any(arr).dtype == np.bool_
-    assert np.all(arr).dtype == np.bool_
+    assert np.any(arr).dtype == np.bool
+    assert np.all(arr).dtype == np.bool
 
 
 class TestCopy:

numpy/typing/tests/data/pass/scalars.py

@@ -5,6 +5,7 @@
 import numpy as np
 
 b =  np.bool()
+b_ = np.bool_()
 u8 = np.uint64()
 i8 = np.int64()
 f8 = np.float64()
@@ -121,7 +122,7 @@ def __float__(self) -> float:
 u8 = np.uint64()
 f8 = np.float64()
 c16 = np.complex128()
-b_ = np.bool()
+b = np.bool()
 td = np.timedelta64()
 U = np.str_("1")
 S = np.bytes_("1")
@@ -130,7 +131,7 @@ def __float__(self) -> float:
 int(i8)
 int(u8)
 int(f8)
-int(b_)
+int(b)
 int(td)
 int(U)
 int(S)

numpy/typing/tests/data/reveal/numerictypes.pyi

@@ -48,6 +48,7 @@ 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.bool_, type[np.bool])
 
 assert_type(np.typecodes["Character"], Literal["c"])
 assert_type(np.typecodes["Complex"], Literal["FDG"])

numpy/typing/tests/data/reveal/scalars.pyi

@@ -50,6 +50,7 @@ assert_type(V[["field1", "field2"]], np.void)
 V[0] = 5
 
 # Aliases
+assert_type(np.bool_(), np.bool)
 assert_type(np.byte(), np.byte)
 assert_type(np.short(), np.short)
 assert_type(np.intc(), np.intc)