Skip to content

Commit 470c458

Browse files
MarcoGorelliMarcoGorelli
authored
TYP: Improve consistency of (masked) array typing aliases (numpy#28863)
1 parent 9af251c commit 470c458

File tree

3 files changed

+105
-105
lines changed

3 files changed

+105
-105
lines changed

‎numpy/_typing/_add_docstring.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ def _parse_docstrings() -> str:
137137
>>> import numpy.typing as npt
138138
139139
>>> print(npt.NDArray)
140-
numpy.ndarray[tuple[int, ...], numpy.dtype[+_ScalarT_co]]
140+
numpy.ndarray[tuple[int, ...], numpy.dtype[~_ScalarT]]
141141
142142
>>> print(npt.NDArray[np.float64])
143143
numpy.ndarray[tuple[int, ...], numpy.dtype[numpy.float64]]

‎numpy/_typing/_array_like.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
_DTypeT = TypeVar("_DTypeT", bound=dtype[Any])
2424
_DTypeT_co = TypeVar("_DTypeT_co", covariant=True, bound=dtype[Any])
2525

26-
NDArray: TypeAlias = np.ndarray[_Shape, dtype[_ScalarT_co]]
26+
NDArray: TypeAlias = np.ndarray[_Shape, dtype[_ScalarT]]
2727

2828
# The `_SupportsArray` protocol only cares about the default dtype
2929
# (i.e. `dtype=None` or no `dtype` parameter at all) of the to-be returned

‎numpy/typing/tests/data/reveal/ma.pyi‎

Lines changed: 103 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,29 @@ import numpy as np
55
from numpy import dtype, generic
66
from numpy._typing import NDArray, _Shape
77

8-
_ScalarT_co = TypeVar("_ScalarT_co", bound=generic, covariant=True)
9-
MaskedNDArray: TypeAlias = np.ma.MaskedArray[_Shape, dtype[_ScalarT_co]]
8+
_ScalarT = TypeVar("_ScalarT", bound=generic)
9+
MaskedArray: TypeAlias = np.ma.MaskedArray[_Shape, dtype[_ScalarT]]
1010

11-
class MaskedNDArraySubclass(MaskedNDArray[np.complex128]): ...
11+
class MaskedArraySubclass(MaskedArray[np.complex128]): ...
1212

1313
AR_b: NDArray[np.bool]
1414
AR_f4: NDArray[np.float32]
1515
AR_dt64: NDArray[np.datetime64]
1616
AR_td64: NDArray[np.timedelta64]
1717
AR_o: NDArray[np.timedelta64]
1818

19-
MAR_b: MaskedNDArray[np.bool]
20-
MAR_f4: MaskedNDArray[np.float32]
21-
MAR_f8: MaskedNDArray[np.float64]
22-
MAR_i8: MaskedNDArray[np.int64]
23-
MAR_dt64: MaskedNDArray[np.datetime64]
24-
MAR_td64: MaskedNDArray[np.timedelta64]
25-
MAR_o: MaskedNDArray[np.object_]
26-
MAR_s: MaskedNDArray[np.str_]
27-
MAR_byte: MaskedNDArray[np.bytes_]
28-
MAR_V: MaskedNDArray[np.void]
19+
MAR_b: MaskedArray[np.bool]
20+
MAR_f4: MaskedArray[np.float32]
21+
MAR_f8: MaskedArray[np.float64]
22+
MAR_i8: MaskedArray[np.int64]
23+
MAR_dt64: MaskedArray[np.datetime64]
24+
MAR_td64: MaskedArray[np.timedelta64]
25+
MAR_o: MaskedArray[np.object_]
26+
MAR_s: MaskedArray[np.str_]
27+
MAR_byte: MaskedArray[np.bytes_]
28+
MAR_V: MaskedArray[np.void]
2929

30-
MAR_subclass: MaskedNDArraySubclass
30+
MAR_subclass: MaskedArraySubclass
3131

3232
MAR_1d: np.ma.MaskedArray[tuple[int], np.dtype]
3333
MAR_2d_f4: np.ma.MaskedArray[tuple[int, int], np.dtype[np.float32]]
@@ -49,127 +49,127 @@ assert_type(np.ma.min(MAR_b, axis=0), Any)
4949
assert_type(np.ma.min(MAR_f4, axis=0), Any)
5050
assert_type(np.ma.min(MAR_b, keepdims=True), Any)
5151
assert_type(np.ma.min(MAR_f4, keepdims=True), Any)
52-
assert_type(np.ma.min(MAR_f4, out=MAR_subclass), MaskedNDArraySubclass)
53-
assert_type(np.ma.min(MAR_f4, 0, MAR_subclass), MaskedNDArraySubclass)
54-
assert_type(np.ma.min(MAR_f4, None, MAR_subclass), MaskedNDArraySubclass)
52+
assert_type(np.ma.min(MAR_f4, out=MAR_subclass), MaskedArraySubclass)
53+
assert_type(np.ma.min(MAR_f4, 0, MAR_subclass), MaskedArraySubclass)
54+
assert_type(np.ma.min(MAR_f4, None, MAR_subclass), MaskedArraySubclass)
5555

5656
assert_type(MAR_b.min(), np.bool)
5757
assert_type(MAR_f4.min(), np.float32)
5858
assert_type(MAR_b.min(axis=0), Any)
5959
assert_type(MAR_f4.min(axis=0), Any)
6060
assert_type(MAR_b.min(keepdims=True), Any)
6161
assert_type(MAR_f4.min(keepdims=True), Any)
62-
assert_type(MAR_f4.min(out=MAR_subclass), MaskedNDArraySubclass)
63-
assert_type(MAR_f4.min(0, MAR_subclass), MaskedNDArraySubclass)
64-
assert_type(MAR_f4.min(None, MAR_subclass), MaskedNDArraySubclass)
62+
assert_type(MAR_f4.min(out=MAR_subclass), MaskedArraySubclass)
63+
assert_type(MAR_f4.min(0, MAR_subclass), MaskedArraySubclass)
64+
assert_type(MAR_f4.min(None, MAR_subclass), MaskedArraySubclass)
6565

6666
assert_type(np.ma.max(MAR_b), np.bool)
6767
assert_type(np.ma.max(MAR_f4), np.float32)
6868
assert_type(np.ma.max(MAR_b, axis=0), Any)
6969
assert_type(np.ma.max(MAR_f4, axis=0), Any)
7070
assert_type(np.ma.max(MAR_b, keepdims=True), Any)
7171
assert_type(np.ma.max(MAR_f4, keepdims=True), Any)
72-
assert_type(np.ma.max(MAR_f4, out=MAR_subclass), MaskedNDArraySubclass)
73-
assert_type(np.ma.max(MAR_f4, 0, MAR_subclass), MaskedNDArraySubclass)
74-
assert_type(np.ma.max(MAR_f4, None, MAR_subclass), MaskedNDArraySubclass)
72+
assert_type(np.ma.max(MAR_f4, out=MAR_subclass), MaskedArraySubclass)
73+
assert_type(np.ma.max(MAR_f4, 0, MAR_subclass), MaskedArraySubclass)
74+
assert_type(np.ma.max(MAR_f4, None, MAR_subclass), MaskedArraySubclass)
7575

7676
assert_type(MAR_b.max(), np.bool)
7777
assert_type(MAR_f4.max(), np.float32)
7878
assert_type(MAR_b.max(axis=0), Any)
7979
assert_type(MAR_f4.max(axis=0), Any)
8080
assert_type(MAR_b.max(keepdims=True), Any)
8181
assert_type(MAR_f4.max(keepdims=True), Any)
82-
assert_type(MAR_f4.max(out=MAR_subclass), MaskedNDArraySubclass)
83-
assert_type(MAR_f4.max(0, MAR_subclass), MaskedNDArraySubclass)
84-
assert_type(MAR_f4.max(None, MAR_subclass), MaskedNDArraySubclass)
82+
assert_type(MAR_f4.max(out=MAR_subclass), MaskedArraySubclass)
83+
assert_type(MAR_f4.max(0, MAR_subclass), MaskedArraySubclass)
84+
assert_type(MAR_f4.max(None, MAR_subclass), MaskedArraySubclass)
8585

8686
assert_type(np.ma.ptp(MAR_b), np.bool)
8787
assert_type(np.ma.ptp(MAR_f4), np.float32)
8888
assert_type(np.ma.ptp(MAR_b, axis=0), Any)
8989
assert_type(np.ma.ptp(MAR_f4, axis=0), Any)
9090
assert_type(np.ma.ptp(MAR_b, keepdims=True), Any)
9191
assert_type(np.ma.ptp(MAR_f4, keepdims=True), Any)
92-
assert_type(np.ma.ptp(MAR_f4, out=MAR_subclass), MaskedNDArraySubclass)
93-
assert_type(np.ma.ptp(MAR_f4, 0, MAR_subclass), MaskedNDArraySubclass)
94-
assert_type(np.ma.ptp(MAR_f4, None, MAR_subclass), MaskedNDArraySubclass)
92+
assert_type(np.ma.ptp(MAR_f4, out=MAR_subclass), MaskedArraySubclass)
93+
assert_type(np.ma.ptp(MAR_f4, 0, MAR_subclass), MaskedArraySubclass)
94+
assert_type(np.ma.ptp(MAR_f4, None, MAR_subclass), MaskedArraySubclass)
9595

9696
assert_type(MAR_b.ptp(), np.bool)
9797
assert_type(MAR_f4.ptp(), np.float32)
9898
assert_type(MAR_b.ptp(axis=0), Any)
9999
assert_type(MAR_f4.ptp(axis=0), Any)
100100
assert_type(MAR_b.ptp(keepdims=True), Any)
101101
assert_type(MAR_f4.ptp(keepdims=True), Any)
102-
assert_type(MAR_f4.ptp(out=MAR_subclass), MaskedNDArraySubclass)
103-
assert_type(MAR_f4.ptp(0, MAR_subclass), MaskedNDArraySubclass)
104-
assert_type(MAR_f4.ptp(None, MAR_subclass), MaskedNDArraySubclass)
102+
assert_type(MAR_f4.ptp(out=MAR_subclass), MaskedArraySubclass)
103+
assert_type(MAR_f4.ptp(0, MAR_subclass), MaskedArraySubclass)
104+
assert_type(MAR_f4.ptp(None, MAR_subclass), MaskedArraySubclass)
105105

106106
assert_type(MAR_b.argmin(), np.intp)
107107
assert_type(MAR_f4.argmin(), np.intp)
108108
assert_type(MAR_f4.argmax(fill_value=6.28318, keepdims=False), np.intp)
109109
assert_type(MAR_b.argmin(axis=0), Any)
110110
assert_type(MAR_f4.argmin(axis=0), Any)
111111
assert_type(MAR_b.argmin(keepdims=True), Any)
112-
assert_type(MAR_f4.argmin(out=MAR_subclass), MaskedNDArraySubclass)
113-
assert_type(MAR_f4.argmin(None, None, out=MAR_subclass), MaskedNDArraySubclass)
112+
assert_type(MAR_f4.argmin(out=MAR_subclass), MaskedArraySubclass)
113+
assert_type(MAR_f4.argmin(None, None, out=MAR_subclass), MaskedArraySubclass)
114114

115115
assert_type(np.ma.argmin(MAR_b), np.intp)
116116
assert_type(np.ma.argmin(MAR_f4), np.intp)
117117
assert_type(np.ma.argmin(MAR_f4, fill_value=6.28318, keepdims=False), np.intp)
118118
assert_type(np.ma.argmin(MAR_b, axis=0), Any)
119119
assert_type(np.ma.argmin(MAR_f4, axis=0), Any)
120120
assert_type(np.ma.argmin(MAR_b, keepdims=True), Any)
121-
assert_type(np.ma.argmin(MAR_f4, out=MAR_subclass), MaskedNDArraySubclass)
122-
assert_type(np.ma.argmin(MAR_f4, None, None, out=MAR_subclass), MaskedNDArraySubclass)
121+
assert_type(np.ma.argmin(MAR_f4, out=MAR_subclass), MaskedArraySubclass)
122+
assert_type(np.ma.argmin(MAR_f4, None, None, out=MAR_subclass), MaskedArraySubclass)
123123

124124
assert_type(MAR_b.argmax(), np.intp)
125125
assert_type(MAR_f4.argmax(), np.intp)
126126
assert_type(MAR_f4.argmax(fill_value=6.28318, keepdims=False), np.intp)
127127
assert_type(MAR_b.argmax(axis=0), Any)
128128
assert_type(MAR_f4.argmax(axis=0), Any)
129129
assert_type(MAR_b.argmax(keepdims=True), Any)
130-
assert_type(MAR_f4.argmax(out=MAR_subclass), MaskedNDArraySubclass)
131-
assert_type(MAR_f4.argmax(None, None, out=MAR_subclass), MaskedNDArraySubclass)
130+
assert_type(MAR_f4.argmax(out=MAR_subclass), MaskedArraySubclass)
131+
assert_type(MAR_f4.argmax(None, None, out=MAR_subclass), MaskedArraySubclass)
132132

133133
assert_type(np.ma.argmax(MAR_b), np.intp)
134134
assert_type(np.ma.argmax(MAR_f4), np.intp)
135135
assert_type(np.ma.argmax(MAR_f4, fill_value=6.28318, keepdims=False), np.intp)
136136
assert_type(np.ma.argmax(MAR_b, axis=0), Any)
137137
assert_type(np.ma.argmax(MAR_f4, axis=0), Any)
138138
assert_type(np.ma.argmax(MAR_b, keepdims=True), Any)
139-
assert_type(np.ma.argmax(MAR_f4, out=MAR_subclass), MaskedNDArraySubclass)
140-
assert_type(np.ma.argmax(MAR_f4, None, None, out=MAR_subclass), MaskedNDArraySubclass)
139+
assert_type(np.ma.argmax(MAR_f4, out=MAR_subclass), MaskedArraySubclass)
140+
assert_type(np.ma.argmax(MAR_f4, None, None, out=MAR_subclass), MaskedArraySubclass)
141141

142142
assert_type(MAR_f4.sort(), None)
143143
assert_type(MAR_f4.sort(axis=0, kind='quicksort', order='K', endwith=False, fill_value=42., stable=False), None)
144144

145-
assert_type(np.ma.sort(MAR_f4), MaskedNDArray[np.float32])
146-
assert_type(np.ma.sort(MAR_subclass), MaskedNDArraySubclass)
145+
assert_type(np.ma.sort(MAR_f4), MaskedArray[np.float32])
146+
assert_type(np.ma.sort(MAR_subclass), MaskedArraySubclass)
147147
assert_type(np.ma.sort([[0, 1], [2, 3]]), NDArray[Any])
148148
assert_type(np.ma.sort(AR_f4), NDArray[np.float32])
149149

150150
assert_type(MAR_f8.take(0), np.float64)
151151
assert_type(MAR_1d.take(0), Any)
152-
assert_type(MAR_f8.take([0]), MaskedNDArray[np.float64])
153-
assert_type(MAR_f8.take(0, out=MAR_subclass), MaskedNDArraySubclass)
154-
assert_type(MAR_f8.take([0], out=MAR_subclass), MaskedNDArraySubclass)
152+
assert_type(MAR_f8.take([0]), MaskedArray[np.float64])
153+
assert_type(MAR_f8.take(0, out=MAR_subclass), MaskedArraySubclass)
154+
assert_type(MAR_f8.take([0], out=MAR_subclass), MaskedArraySubclass)
155155

156156
assert_type(np.ma.take(f, 0), Any)
157157
assert_type(np.ma.take(f4, 0), np.float32)
158158
assert_type(np.ma.take(MAR_f8, 0), np.float64)
159159
assert_type(np.ma.take(AR_f4, 0), np.float32)
160160
assert_type(np.ma.take(MAR_1d, 0), Any)
161-
assert_type(np.ma.take(MAR_f8, [0]), MaskedNDArray[np.float64])
162-
assert_type(np.ma.take(AR_f4, [0]), MaskedNDArray[np.float32])
163-
assert_type(np.ma.take(MAR_f8, 0, out=MAR_subclass), MaskedNDArraySubclass)
164-
assert_type(np.ma.take(MAR_f8, [0], out=MAR_subclass), MaskedNDArraySubclass)
165-
assert_type(np.ma.take([1], [0]), MaskedNDArray[Any])
166-
assert_type(np.ma.take(np.eye(2), 1, axis=0), MaskedNDArray[np.float64])
161+
assert_type(np.ma.take(MAR_f8, [0]), MaskedArray[np.float64])
162+
assert_type(np.ma.take(AR_f4, [0]), MaskedArray[np.float32])
163+
assert_type(np.ma.take(MAR_f8, 0, out=MAR_subclass), MaskedArraySubclass)
164+
assert_type(np.ma.take(MAR_f8, [0], out=MAR_subclass), MaskedArraySubclass)
165+
assert_type(np.ma.take([1], [0]), MaskedArray[Any])
166+
assert_type(np.ma.take(np.eye(2), 1, axis=0), MaskedArray[np.float64])
167167

168168
assert_type(MAR_f4.partition(1), None)
169169
assert_type(MAR_V.partition(1, axis=0, kind='introselect', order='K'), None)
170170

171-
assert_type(MAR_f4.argpartition(1), MaskedNDArray[np.intp])
172-
assert_type(MAR_1d.argpartition(1, axis=0, kind='introselect', order='K'), MaskedNDArray[np.intp])
171+
assert_type(MAR_f4.argpartition(1), MaskedArray[np.intp])
172+
assert_type(MAR_1d.argpartition(1, axis=0, kind='introselect', order='K'), MaskedArray[np.intp])
173173

174174
assert_type(np.ma.ndim(f4), int)
175175
assert_type(np.ma.ndim(MAR_b), int)
@@ -185,55 +185,55 @@ assert_type(MAR_f4.ids(), tuple[int, int])
185185

186186
assert_type(MAR_f4.iscontiguous(), bool)
187187

188-
assert_type(MAR_f4 >= 3, MaskedNDArray[np.bool])
189-
assert_type(MAR_i8 >= AR_td64, MaskedNDArray[np.bool])
190-
assert_type(MAR_b >= AR_td64, MaskedNDArray[np.bool])
191-
assert_type(MAR_td64 >= AR_td64, MaskedNDArray[np.bool])
192-
assert_type(MAR_dt64 >= AR_dt64, MaskedNDArray[np.bool])
193-
assert_type(MAR_o >= AR_o, MaskedNDArray[np.bool])
194-
assert_type(MAR_1d >= 0, MaskedNDArray[np.bool])
195-
assert_type(MAR_s >= MAR_s, MaskedNDArray[np.bool])
196-
assert_type(MAR_byte >= MAR_byte, MaskedNDArray[np.bool])
197-
198-
assert_type(MAR_f4 > 3, MaskedNDArray[np.bool])
199-
assert_type(MAR_i8 > AR_td64, MaskedNDArray[np.bool])
200-
assert_type(MAR_b > AR_td64, MaskedNDArray[np.bool])
201-
assert_type(MAR_td64 > AR_td64, MaskedNDArray[np.bool])
202-
assert_type(MAR_dt64 > AR_dt64, MaskedNDArray[np.bool])
203-
assert_type(MAR_o > AR_o, MaskedNDArray[np.bool])
204-
assert_type(MAR_1d > 0, MaskedNDArray[np.bool])
205-
assert_type(MAR_s > MAR_s, MaskedNDArray[np.bool])
206-
assert_type(MAR_byte > MAR_byte, MaskedNDArray[np.bool])
207-
208-
assert_type(MAR_f4 <= 3, MaskedNDArray[np.bool])
209-
assert_type(MAR_i8 <= AR_td64, MaskedNDArray[np.bool])
210-
assert_type(MAR_b <= AR_td64, MaskedNDArray[np.bool])
211-
assert_type(MAR_td64 <= AR_td64, MaskedNDArray[np.bool])
212-
assert_type(MAR_dt64 <= AR_dt64, MaskedNDArray[np.bool])
213-
assert_type(MAR_o <= AR_o, MaskedNDArray[np.bool])
214-
assert_type(MAR_1d <= 0, MaskedNDArray[np.bool])
215-
assert_type(MAR_s <= MAR_s, MaskedNDArray[np.bool])
216-
assert_type(MAR_byte <= MAR_byte, MaskedNDArray[np.bool])
217-
218-
assert_type(MAR_f4 < 3, MaskedNDArray[np.bool])
219-
assert_type(MAR_i8 < AR_td64, MaskedNDArray[np.bool])
220-
assert_type(MAR_b < AR_td64, MaskedNDArray[np.bool])
221-
assert_type(MAR_td64 < AR_td64, MaskedNDArray[np.bool])
222-
assert_type(MAR_dt64 < AR_dt64, MaskedNDArray[np.bool])
223-
assert_type(MAR_o < AR_o, MaskedNDArray[np.bool])
224-
assert_type(MAR_1d < 0, MaskedNDArray[np.bool])
225-
assert_type(MAR_s < MAR_s, MaskedNDArray[np.bool])
226-
assert_type(MAR_byte < MAR_byte, MaskedNDArray[np.bool])
227-
228-
assert_type(MAR_f4 <= 3, MaskedNDArray[np.bool])
229-
assert_type(MAR_i8 <= AR_td64, MaskedNDArray[np.bool])
230-
assert_type(MAR_b <= AR_td64, MaskedNDArray[np.bool])
231-
assert_type(MAR_td64 <= AR_td64, MaskedNDArray[np.bool])
232-
assert_type(MAR_dt64 <= AR_dt64, MaskedNDArray[np.bool])
233-
assert_type(MAR_o <= AR_o, MaskedNDArray[np.bool])
234-
assert_type(MAR_1d <= 0, MaskedNDArray[np.bool])
235-
assert_type(MAR_s <= MAR_s, MaskedNDArray[np.bool])
236-
assert_type(MAR_byte <= MAR_byte, MaskedNDArray[np.bool])
188+
assert_type(MAR_f4 >= 3, MaskedArray[np.bool])
189+
assert_type(MAR_i8 >= AR_td64, MaskedArray[np.bool])
190+
assert_type(MAR_b >= AR_td64, MaskedArray[np.bool])
191+
assert_type(MAR_td64 >= AR_td64, MaskedArray[np.bool])
192+
assert_type(MAR_dt64 >= AR_dt64, MaskedArray[np.bool])
193+
assert_type(MAR_o >= AR_o, MaskedArray[np.bool])
194+
assert_type(MAR_1d >= 0, MaskedArray[np.bool])
195+
assert_type(MAR_s >= MAR_s, MaskedArray[np.bool])
196+
assert_type(MAR_byte >= MAR_byte, MaskedArray[np.bool])
197+
198+
assert_type(MAR_f4 > 3, MaskedArray[np.bool])
199+
assert_type(MAR_i8 > AR_td64, MaskedArray[np.bool])
200+
assert_type(MAR_b > AR_td64, MaskedArray[np.bool])
201+
assert_type(MAR_td64 > AR_td64, MaskedArray[np.bool])
202+
assert_type(MAR_dt64 > AR_dt64, MaskedArray[np.bool])
203+
assert_type(MAR_o > AR_o, MaskedArray[np.bool])
204+
assert_type(MAR_1d > 0, MaskedArray[np.bool])
205+
assert_type(MAR_s > MAR_s, MaskedArray[np.bool])
206+
assert_type(MAR_byte > MAR_byte, MaskedArray[np.bool])
207+
208+
assert_type(MAR_f4 <= 3, MaskedArray[np.bool])
209+
assert_type(MAR_i8 <= AR_td64, MaskedArray[np.bool])
210+
assert_type(MAR_b <= AR_td64, MaskedArray[np.bool])
211+
assert_type(MAR_td64 <= AR_td64, MaskedArray[np.bool])
212+
assert_type(MAR_dt64 <= AR_dt64, MaskedArray[np.bool])
213+
assert_type(MAR_o <= AR_o, MaskedArray[np.bool])
214+
assert_type(MAR_1d <= 0, MaskedArray[np.bool])
215+
assert_type(MAR_s <= MAR_s, MaskedArray[np.bool])
216+
assert_type(MAR_byte <= MAR_byte, MaskedArray[np.bool])
217+
218+
assert_type(MAR_f4 < 3, MaskedArray[np.bool])
219+
assert_type(MAR_i8 < AR_td64, MaskedArray[np.bool])
220+
assert_type(MAR_b < AR_td64, MaskedArray[np.bool])
221+
assert_type(MAR_td64 < AR_td64, MaskedArray[np.bool])
222+
assert_type(MAR_dt64 < AR_dt64, MaskedArray[np.bool])
223+
assert_type(MAR_o < AR_o, MaskedArray[np.bool])
224+
assert_type(MAR_1d < 0, MaskedArray[np.bool])
225+
assert_type(MAR_s < MAR_s, MaskedArray[np.bool])
226+
assert_type(MAR_byte < MAR_byte, MaskedArray[np.bool])
227+
228+
assert_type(MAR_f4 <= 3, MaskedArray[np.bool])
229+
assert_type(MAR_i8 <= AR_td64, MaskedArray[np.bool])
230+
assert_type(MAR_b <= AR_td64, MaskedArray[np.bool])
231+
assert_type(MAR_td64 <= AR_td64, MaskedArray[np.bool])
232+
assert_type(MAR_dt64 <= AR_dt64, MaskedArray[np.bool])
233+
assert_type(MAR_o <= AR_o, MaskedArray[np.bool])
234+
assert_type(MAR_1d <= 0, MaskedArray[np.bool])
235+
assert_type(MAR_s <= MAR_s, MaskedArray[np.bool])
236+
assert_type(MAR_byte <= MAR_byte, MaskedArray[np.bool])
237237

238238
assert_type(MAR_byte.count(), int)
239239
assert_type(MAR_f4.count(axis=None), int)
@@ -279,7 +279,7 @@ assert_type(np.ma.filled(MAR_1d), np.ndarray[tuple[int], np.dtype]) # type: ign
279279
assert_type(MAR_b.repeat(3), np.ma.MaskedArray[tuple[int], np.dtype[np.bool]])
280280
assert_type(MAR_2d_f4.repeat(MAR_i8), np.ma.MaskedArray[tuple[int], np.dtype[np.float32]])
281281
assert_type(MAR_2d_f4.repeat(MAR_i8, axis=None), np.ma.MaskedArray[tuple[int], np.dtype[np.float32]])
282-
assert_type(MAR_2d_f4.repeat(MAR_i8, axis=0), MaskedNDArray[np.float32])
282+
assert_type(MAR_2d_f4.repeat(MAR_i8, axis=0), MaskedArray[np.float32])
283283

284284
assert_type(np.ma.allequal(AR_f4, MAR_f4), bool)
285285
assert_type(np.ma.allequal(AR_f4, MAR_f4, fill_value=False), bool)

0 commit comments

Comments
 (0)