Skip to content

Commit e1b5f7e

Browse files
AniketsyAniketsy
authored
♻️ replace np.bool_ with np.bool (#1634)
1 parent fa7bd22 commit e1b5f7e

127 files changed

Lines changed: 711 additions & 717 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎scipy-stubs/_lib/_elementwise_iterative_method.pyi‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def _loop[ResT: _RichResult[Any], ShapeT: tuple[int, ...], FloatT: npc.floating]
4747
dtype: npc.inexact,
4848
pre_func_eval: Callable[[ResT], onp.Array[ShapeT, FloatT]],
4949
post_func_eval: Callable[[onp.Array[ShapeT, FloatT], onp.Array[ShapeT, npc.floating], ResT], Unused],
50-
check_termination: Callable[[ResT], onp.Array[ShapeT, np.bool_]],
50+
check_termination: Callable[[ResT], onp.Array[ShapeT, np.bool]],
5151
post_termination_check: Callable[[ResT], Unused],
5252
customize_result: Callable[[ResT, tuple[int, ...]], tuple[int, ...]],
5353
res_work_pairs: Iterable[tuple[str, str]],
@@ -61,7 +61,7 @@ def _check_termination[WorkT: Mapping[str, Any], ShapeT: tuple[int, ...], FloatT
6161
res: Mapping[str, onp.Array[ShapeT, FloatT]],
6262
res_work_pairs: Iterable[tuple[str, str]],
6363
active: onp.Array[ShapeT, npc.integer],
64-
check_termination: Callable[[WorkT], onp.Array[ShapeT, np.bool_]],
64+
check_termination: Callable[[WorkT], onp.Array[ShapeT, np.bool]],
6565
preserve_shape: bool | None,
6666
xp: ModuleType,
6767
) -> onp.Array1D[np.intp]: ...
@@ -72,7 +72,7 @@ def _update_active[ShapeT: tuple[int, ...], FloatT: npc.floating](
7272
res: Mapping[str, onp.Array[ShapeT, FloatT]],
7373
res_work_pairs: Iterable[tuple[str, str]],
7474
active: onp.Array[ShapeT, npc.integer],
75-
mask: onp.Array[ShapeT, np.bool_] | None,
75+
mask: onp.Array[ShapeT, np.bool] | None,
7676
preserve_shape: bool | None,
7777
xp: ModuleType,
7878
) -> None: ...

‎scipy-stubs/cluster/vq/_vq_impl.pyi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class ClusterError(Exception): ...
2525

2626
#
2727
@overload
28-
def whiten(obs: onp.ArrayND[np.bool_ | npc.integer], check_finite: bool | None = None) -> onp.Array2D[np.float64]: ...
28+
def whiten(obs: onp.ArrayND[np.bool | npc.integer], check_finite: bool | None = None) -> onp.Array2D[np.float64]: ...
2929
@overload
3030
def whiten(obs: onp.ArrayND[_InexactT], check_finite: bool | None = None) -> onp.Array2D[_InexactT]: ...
3131

‎scipy-stubs/differentiate/_differentiate.pyi‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class _Tolerances(TypedDict, total=False):
2727

2828
@type_check_only
2929
class _DerivativeResult0D(_RichResult, Generic[_FloatT_co]):
30-
success: np.bool_
30+
success: np.bool
3131
status: np.int32
3232
nfev: np.int32
3333
nit: np.int32
@@ -37,7 +37,7 @@ class _DerivativeResult0D(_RichResult, Generic[_FloatT_co]):
3737

3838
@type_check_only
3939
class _DerivativeResultND(_RichResult, Generic[_FloatT_co, _ShapeT_co]):
40-
success: onp.Array[_ShapeT_co, np.bool_]
40+
success: onp.Array[_ShapeT_co, np.bool]
4141
status: onp.Array[_ShapeT_co, np.int32]
4242
nfev: onp.Array[_ShapeT_co, np.int32]
4343
nit: onp.Array[_ShapeT_co, np.int32]
@@ -52,14 +52,14 @@ class _JacobianResult(_RichResult, Generic[_FloatT_co, _ShapeT_co]):
5252
error: onp.Array[_ShapeT_co, _FloatT_co]
5353
nit: onp.Array[_ShapeT_co, np.int32]
5454
nfev: onp.Array[_ShapeT_co, np.int32]
55-
success: onp.Array[_ShapeT_co, np.bool_]
55+
success: onp.Array[_ShapeT_co, np.bool]
5656

5757
@type_check_only
5858
class _HessianResult(_RichResult, Generic[_FloatT_co, _ShapeT2_co]):
5959
status: onp.Array[_ShapeT2_co, np.int32]
6060
error: onp.Array[_ShapeT2_co, _FloatT_co]
6161
nfev: onp.Array[_ShapeT2_co, np.int32]
62-
success: onp.Array[_ShapeT2_co, np.bool_]
62+
success: onp.Array[_ShapeT2_co, np.bool]
6363
ddf: onp.Array[_ShapeT2_co, _FloatT_co]
6464

6565
###

‎scipy-stubs/fft/_basic.pyi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ _ShapeT = TypeVar("_ShapeT", bound=tuple[int, ...])
1313
_Norm: TypeAlias = Literal["backward", "ortho", "forward"]
1414
_Unused: TypeAlias = Never # not used by scipy
1515

16-
_CoInteger: TypeAlias = npc.integer | np.bool_
16+
_CoInteger: TypeAlias = npc.integer | np.bool
1717

1818
_AsFloat32: TypeAlias = onp.CanArray[_ShapeT, np.dtype[npc.floating32]]
1919
_AsFloat64: TypeAlias = onp.CanArray[_ShapeT, np.dtype[npc.floating64 | _CoInteger]]

‎scipy-stubs/fft/_helper.pyi‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ def rfftfreq(n: int, d: float = 1.0, *, xp: ModuleType, device: object | None =
3535
@overload
3636
def fftshift(x: onp.ArrayND[_ScalarT, _ShapeT], axes: AnyShape | None = None) -> onp.ArrayND[_ScalarT, _ShapeT]: ...
3737
@overload
38-
def fftshift(x: onp.ToJustBoolND, axes: AnyShape | None = None) -> onp.ArrayND[np.bool_]: ...
38+
def fftshift(x: onp.ToJustBoolND, axes: AnyShape | None = None) -> onp.ArrayND[np.bool]: ...
3939
@overload
4040
def fftshift(x: onp.ToJustInt64_ND, axes: AnyShape | None = None) -> onp.ArrayND[np.int64]: ...
4141
@overload
@@ -51,7 +51,7 @@ def fftshift(x: onp.ToComplexND, axes: AnyShape | None = None) -> onp.ArrayND[An
5151
@overload
5252
def ifftshift(x: onp.ArrayND[_ScalarT, _ShapeT], axes: AnyShape | None = None) -> onp.ArrayND[_ScalarT, _ShapeT]: ...
5353
@overload
54-
def ifftshift(x: onp.ToJustBoolND, axes: AnyShape | None = None) -> onp.ArrayND[np.bool_]: ...
54+
def ifftshift(x: onp.ToJustBoolND, axes: AnyShape | None = None) -> onp.ArrayND[np.bool]: ...
5555
@overload
5656
def ifftshift(x: onp.ToJustInt64_ND, axes: AnyShape | None = None) -> onp.ArrayND[np.int64]: ...
5757
@overload

‎scipy-stubs/integrate/_ivp/common.pyi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ _FloatingT = TypeVar("_FloatingT", bound=npc.floating)
1414
_ToFloatT = TypeVar("_ToFloatT", bound=onp.ToFloat)
1515
_InterpT_co = TypeVar("_InterpT_co", bound=DenseOutput[npc.inexact], default=DenseOutput[Any], covariant=True)
1616

17-
_ToFloat64: TypeAlias = np.float16 | np.float32 | np.float64 | npc.integer | np.bool_
17+
_ToFloat64: TypeAlias = np.float16 | np.float32 | np.float64 | npc.integer | np.bool
1818

1919
###
2020

‎scipy-stubs/integrate/_quad_vec.pyi‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ class _Bunch(Generic[_InexactT_co, _ShapeT_co]): # undocumented
9191
#
9292
@overload # 0d +integer
9393
def quad_vec(
94-
f: _Fun[npc.integer | np.bool_],
94+
f: _Fun[npc.integer | np.bool],
9595
a: float,
9696
b: float,
9797
epsabs: float = 1e-200,
@@ -108,7 +108,7 @@ def quad_vec(
108108
) -> tuple[np.float64, float]: ...
109109
@overload # 0d +integer, full_output=True
110110
def quad_vec(
111-
f: _Fun[npc.integer | np.bool_],
111+
f: _Fun[npc.integer | np.bool],
112112
a: float,
113113
b: float,
114114
epsabs: float = 1e-200,
@@ -125,7 +125,7 @@ def quad_vec(
125125
) -> tuple[np.float64, float, _Bunch[np.float64, tuple[int]]]: ...
126126
@overload # Nd +integer
127127
def quad_vec(
128-
f: _Fun[onp.ArrayND[npc.integer | np.bool_]],
128+
f: _Fun[onp.ArrayND[npc.integer | np.bool]],
129129
a: float,
130130
b: float,
131131
epsabs: float = 1e-200,
@@ -142,7 +142,7 @@ def quad_vec(
142142
) -> tuple[onp.Array1D[np.float64], float]: ...
143143
@overload # 1d +integer, full_output=True
144144
def quad_vec(
145-
f: _Fun[onp.ArrayND[npc.integer | np.bool_]],
145+
f: _Fun[onp.ArrayND[npc.integer | np.bool]],
146146
a: float,
147147
b: float,
148148
epsabs: float = 1e-200,

‎scipy-stubs/integrate/_quadrature.pyi‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ class QMCQuadResult(NamedTuple):
3232
#
3333
@overload # ?d +complex (mypy & pyright workaround)
3434
def trapezoid(
35-
y: onp.Array[_JustAnyShape, npc.number | np.bool_], x: onp.ToFloatND | None = None, dx: float = 1.0, axis: int = -1
35+
y: onp.Array[_JustAnyShape, npc.number | np.bool], x: onp.ToFloatND | None = None, dx: float = 1.0, axis: int = -1
3636
) -> Any: ...
3737
@overload # 1d T:inexact
3838
def trapezoid(y: onp.Array1D[_InexactT], x: onp.ToFloat1D | None = None, dx: float = 1.0, axis: int = -1) -> _InexactT: ...
3939
@overload # 1d +int
4040
def trapezoid(
41-
y: onp.ToArrayStrict1D[float, npc.integer | np.bool_], x: onp.ToFloat1D | None = None, dx: float = 1.0, axis: int = -1
41+
y: onp.ToArrayStrict1D[float, npc.integer | np.bool], x: onp.ToFloat1D | None = None, dx: float = 1.0, axis: int = -1
4242
) -> np.float64: ...
4343
@overload # 1d ~complex
4444
def trapezoid(
@@ -50,7 +50,7 @@ def trapezoid(
5050
) -> onp.Array1D[_InexactT]: ...
5151
@overload # 2d +int
5252
def trapezoid(
53-
y: onp.ToArrayStrict2D[float, npc.integer | np.bool_], x: onp.ToFloatND | None = None, dx: float = 1.0, axis: int = -1
53+
y: onp.ToArrayStrict2D[float, npc.integer | np.bool], x: onp.ToFloatND | None = None, dx: float = 1.0, axis: int = -1
5454
) -> onp.Array1D[np.float64]: ...
5555
@overload # 2d ~complex
5656
def trapezoid(
@@ -62,7 +62,7 @@ def trapezoid(
6262
) -> onp.ArrayND[_InexactT] | Any: ...
6363
@overload # Nd +int
6464
def trapezoid(
65-
y: onp.ToArrayND[float, npc.integer | np.bool_], x: onp.ToFloatND | None = None, dx: float = 1.0, axis: int = -1
65+
y: onp.ToArrayND[float, npc.integer | np.bool], x: onp.ToFloatND | None = None, dx: float = 1.0, axis: int = -1
6666
) -> onp.ArrayND[np.float64] | Any: ...
6767
@overload # Nd ~complex
6868
def trapezoid(
@@ -80,7 +80,7 @@ def trapezoid(
8080
# NOTE: unlike `trapezoid`, this will upcast scalars below 64-bits precision in case of scalar output
8181
@overload # ?d +complex (mypy & pyright workaround)
8282
def simpson(
83-
y: onp.Array[_JustAnyShape, npc.number | np.bool_], x: onp.ToFloatND | None = None, *, dx: float = 1.0, axis: int = -1
83+
y: onp.Array[_JustAnyShape, npc.number | np.bool], x: onp.ToFloatND | None = None, *, dx: float = 1.0, axis: int = -1
8484
) -> Any: ...
8585
@overload # 1d +f64
8686
def simpson(y: onp.ToFloat64Strict1D, x: onp.ToFloatND | None = None, *, dx: float = 1.0, axis: int = -1) -> np.float64: ...
@@ -100,7 +100,7 @@ def simpson(
100100
) -> onp.Array1D[_InexactT]: ...
101101
@overload # 2d +int
102102
def simpson(
103-
y: onp.ToArrayStrict2D[float, npc.integer | np.bool_], x: onp.ToFloatND | None = None, *, dx: float = 1.0, axis: int = -1
103+
y: onp.ToArrayStrict2D[float, npc.integer | np.bool], x: onp.ToFloatND | None = None, *, dx: float = 1.0, axis: int = -1
104104
) -> onp.Array1D[np.float64]: ...
105105
@overload # 2d ~complex
106106
def simpson(
@@ -112,7 +112,7 @@ def simpson(
112112
) -> onp.ArrayND[_InexactT] | Any: ...
113113
@overload # Nd +int
114114
def simpson(
115-
y: onp.ToArrayND[float, npc.integer | np.bool_], x: onp.ToFloatND | None = None, *, dx: float = 1.0, axis: int = -1
115+
y: onp.ToArrayND[float, npc.integer | np.bool], x: onp.ToFloatND | None = None, *, dx: float = 1.0, axis: int = -1
116116
) -> onp.ArrayND[np.float64] | Any: ...
117117
@overload # Nd ~complex
118118
def simpson(
@@ -129,7 +129,7 @@ def simpson(
129129

130130
# NOTE: like `simpson`, but this will also upcast scalars below 64-bits precision in case of array output
131131
@overload # ?d +complex (mypy & pyright workaround)
132-
def romb(y: onp.Array[_JustAnyShape, npc.number | np.bool_], dx: float = 1.0, axis: int = -1, show: bool = False) -> Any: ...
132+
def romb(y: onp.Array[_JustAnyShape, npc.number | np.bool], dx: float = 1.0, axis: int = -1, show: bool = False) -> Any: ...
133133
@overload # 1d +f64
134134
def romb(y: onp.ToFloat64Strict1D, dx: float = 1.0, axis: int = -1) -> np.float64: ...
135135
@overload # 1d ~complex
@@ -164,23 +164,23 @@ def romb(y: onp.ToComplexND, dx: float = 1.0, axis: int = -1, show: bool = False
164164
# keep in sync with `cumulative_simpson`
165165
@overload # +int, shape known
166166
def cumulative_trapezoid(
167-
y: onp.ArrayND[npc.integer | np.bool_, _ShapeT],
167+
y: onp.ArrayND[npc.integer | np.bool, _ShapeT],
168168
x: onp.ToFloatND | None = None,
169169
dx: float = 1.0,
170170
axis: int = -1,
171171
initial: Literal[0] | None = None,
172172
) -> onp.ArrayND[np.float64, _ShapeT]: ...
173173
@overload # +float, shape 1d
174174
def cumulative_trapezoid(
175-
y: onp.ToArrayStrict1D[float, npc.integer | np.bool_],
175+
y: onp.ToArrayStrict1D[float, npc.integer | np.bool],
176176
x: onp.ToFloatND | None = None,
177177
dx: float = 1.0,
178178
axis: int = -1,
179179
initial: Literal[0] | None = None,
180180
) -> onp.Array1D[np.float64]: ...
181181
@overload # +float, shape 2d
182182
def cumulative_trapezoid(
183-
y: onp.ToArrayStrict2D[float, npc.integer | np.bool_],
183+
y: onp.ToArrayStrict2D[float, npc.integer | np.bool],
184184
x: onp.ToFloatND | None = None,
185185
dx: float = 1.0,
186186
axis: int = -1,
@@ -230,7 +230,7 @@ def cumulative_trapezoid(
230230
# keep in sync with `cumulative_trapezoid`
231231
@overload # +int, shape known
232232
def cumulative_simpson(
233-
y: onp.ArrayND[npc.integer | np.bool_, _ShapeT],
233+
y: onp.ArrayND[npc.integer | np.bool, _ShapeT],
234234
*,
235235
x: onp.ToFloatND | None = None,
236236
dx: float = 1.0,
@@ -239,7 +239,7 @@ def cumulative_simpson(
239239
) -> onp.ArrayND[np.float64, _ShapeT]: ...
240240
@overload # +float, shape 1d
241241
def cumulative_simpson(
242-
y: onp.ToArrayStrict1D[float, npc.integer | np.bool_],
242+
y: onp.ToArrayStrict1D[float, npc.integer | np.bool],
243243
*,
244244
x: onp.ToFloatND | None = None,
245245
dx: float = 1.0,
@@ -248,7 +248,7 @@ def cumulative_simpson(
248248
) -> onp.Array1D[np.float64]: ...
249249
@overload # +float, shape 2d
250250
def cumulative_simpson(
251-
y: onp.ToArrayStrict2D[float, npc.integer | np.bool_],
251+
y: onp.ToArrayStrict2D[float, npc.integer | np.bool],
252252
*,
253253
x: onp.ToFloatND | None = None,
254254
dx: float = 1.0,

‎scipy-stubs/integrate/_tanhsinh.pyi‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,16 @@ class _TanhSinhResult(
3636
nfev: _StatusT_co
3737
maxlevel: _MaxLevelT_co
3838

39-
type _TanhSinhResult0[ScalarT: np.generic] = _TanhSinhResult[ScalarT, np.bool_, np.int32, np.int64]
39+
type _TanhSinhResult0[ScalarT: np.generic] = _TanhSinhResult[ScalarT, np.bool, np.int32, np.int64]
4040
type _TanhSinhResultN[ScalarT: np.generic] = _TanhSinhResult[
4141
onp.ArrayND[ScalarT],
42-
onp.ArrayND[np.bool_],
42+
onp.ArrayND[np.bool],
4343
onp.ArrayND[np.int32],
4444
onp.ArrayND[np.int64],
4545
] # fmt: skip
4646
type _TanhSinhResultN_[ScalarT: np.generic] = _TanhSinhResult[
4747
onp.ArrayND[ScalarT] | Any,
48-
onp.ArrayND[np.bool_] | Any,
48+
onp.ArrayND[np.bool] | Any,
4949
onp.ArrayND[np.int32] | Any,
5050
onp.ArrayND[np.int64] | Any,
5151
] # fmt: skip
@@ -56,18 +56,18 @@ class _Tolerances(TypedDict, total=False):
5656
atol: float
5757

5858
@type_check_only
59-
class _NSumResult0(_RichResult[np.bool_ | np.int32 | np.float64]):
59+
class _NSumResult0(_RichResult[np.bool | np.int32 | np.float64]):
6060
sum: Final[np.float64]
6161
error: Final[np.float64]
62-
success: Final[np.bool_]
62+
success: Final[np.bool]
6363
status: Final[np.int32]
6464
nfev: Final[np.int32]
6565

6666
@type_check_only
67-
class _NSumResultN(_RichResult[onp.ArrayND[np.bool_] | onp.ArrayND[np.int32] | onp.ArrayND[np.float64]]):
67+
class _NSumResultN(_RichResult[onp.ArrayND[np.bool] | onp.ArrayND[np.int32] | onp.ArrayND[np.float64]]):
6868
sum: Final[onp.ArrayND[np.float64]]
6969
error: Final[onp.ArrayND[np.float64]]
70-
success: Final[onp.ArrayND[np.bool_]]
70+
success: Final[onp.ArrayND[np.bool]]
7171
status: Final[onp.ArrayND[np.int32]]
7272
nfev: Final[onp.ArrayND[np.int32]]
7373

‎scipy-stubs/interpolate/_bary_rational.pyi‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,8 @@ class AAA(_BarycentricRational[_ScalarT_co, tuple[int]], Generic[_ScalarT_co]):
127127
def __init__(
128128
self: AAA[np.float64],
129129
/,
130-
x: onp.ToArray1D[float, npc.floating64 | npc.floating16 | npc.integer | np.bool_],
131-
y: onp.ToArray1D[float, npc.floating64 | npc.floating16 | npc.integer | np.bool_],
130+
x: onp.ToArray1D[float, npc.floating64 | npc.floating16 | npc.integer | np.bool],
131+
y: onp.ToArray1D[float, npc.floating64 | npc.floating16 | npc.integer | np.bool],
132132
*,
133133
rtol: float | None = None,
134134
max_terms: int = 100,
@@ -204,8 +204,8 @@ class FloaterHormannInterpolator(_BarycentricRational[_ScalarT_co, _ShapeT_co],
204204
def __init__(
205205
self: FloaterHormannInterpolator[np.float64, tuple[int]],
206206
/,
207-
points: onp.ToArray1D[float, npc.floating64 | npc.floating16 | npc.integer | np.bool_],
208-
values: onp.ToArrayStrict1D[float, npc.floating64 | npc.floating16 | npc.integer | np.bool_],
207+
points: onp.ToArray1D[float, npc.floating64 | npc.floating16 | npc.integer | np.bool],
208+
values: onp.ToArrayStrict1D[float, npc.floating64 | npc.floating16 | npc.integer | np.bool],
209209
*,
210210
d: int = 3,
211211
axis: int = 0,

0 commit comments

Comments
 (0)