Skip to content

Commit bb7dbd2

Browse files
jorenhamjorenham
authored
Merge pull request #510 from numpy/fix-nddarray-modular-binop-tests
2 parents ba8db50 + 04f4bec commit bb7dbd2

File tree

7 files changed

+1399
-211
lines changed

7 files changed

+1399
-211
lines changed

‎src/numpy-stubs/@test/generated/ndarray_floordiv.pyi‎

Lines changed: 653 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/numpy-stubs/@test/generated/ndarray_mod.pyi‎

Lines changed: 653 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/numpy-stubs/@test/static/accept/arithmetic.pyi‎

Lines changed: 0 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ i8: np.int64
1010

1111
M8: np.datetime64
1212
M8_none: np.datetime64[None]
13-
M8_date: np.datetime64[dt.date]
14-
M8_time: np.datetime64[dt.datetime]
15-
M8_int: np.datetime64[int]
1613
date: dt.date
1714
time: dt.datetime
1815

@@ -22,100 +19,8 @@ m8_int: np.timedelta64[int]
2219
m8_delta: np.timedelta64[dt.timedelta]
2320
delta: dt.timedelta
2421

25-
AR_b: npt.NDArray[np.bool]
26-
AR_u: npt.NDArray[np.uint32]
27-
AR_i: npt.NDArray[np.int64]
28-
AR_f: npt.NDArray[np.float64]
29-
AR_m: npt.NDArray[np.timedelta64]
30-
AR_O: npt.NDArray[np.object_]
3122
AR_Any: npt.NDArray[Any]
3223

33-
AR_LIKE_b: list[bool]
34-
AR_LIKE_u: list[np.uint32]
35-
AR_LIKE_i: list[int]
36-
AR_LIKE_f: list[float]
37-
AR_LIKE_m: list[np.timedelta64]
38-
AR_LIKE_M: list[np.datetime64]
39-
AR_LIKE_O: list[np.object_]
40-
41-
# Array floor division
42-
43-
assert_type(AR_b // AR_LIKE_b, npt.NDArray[np.int8])
44-
assert_type(AR_b // AR_LIKE_u, npt.NDArray[np.uint32])
45-
assert_type(AR_b // AR_LIKE_i, npt.NDArray[np.signedinteger])
46-
assert_type(AR_b // AR_LIKE_f, npt.NDArray[np.float64])
47-
assert_type(AR_b // AR_LIKE_O, npt.NDArray[np.object_])
48-
49-
assert_type(AR_LIKE_b // AR_b, npt.NDArray[np.int8])
50-
assert_type(AR_LIKE_u // AR_b, npt.NDArray[np.uint32])
51-
assert_type(AR_LIKE_i // AR_b, npt.NDArray[np.signedinteger])
52-
assert_type(AR_LIKE_f // AR_b, npt.NDArray[np.float64])
53-
assert_type(AR_LIKE_O // AR_b, npt.NDArray[np.object_])
54-
55-
assert_type(AR_u // AR_LIKE_b, npt.NDArray[np.uint32])
56-
assert_type(AR_u // AR_LIKE_u, npt.NDArray[np.unsignedinteger])
57-
assert_type(AR_u // AR_LIKE_i, npt.NDArray[np.signedinteger])
58-
assert_type(AR_u // AR_LIKE_f, npt.NDArray[np.float64])
59-
assert_type(AR_u // AR_LIKE_O, npt.NDArray[np.object_])
60-
61-
assert_type(AR_LIKE_b // AR_u, npt.NDArray[np.uint32])
62-
assert_type(AR_LIKE_u // AR_u, npt.NDArray[np.unsignedinteger])
63-
assert_type(AR_LIKE_i // AR_u, npt.NDArray[np.signedinteger])
64-
assert_type(AR_LIKE_f // AR_u, npt.NDArray[np.float64])
65-
assert_type(AR_LIKE_m // AR_u, npt.NDArray[np.timedelta64])
66-
assert_type(AR_LIKE_O // AR_u, npt.NDArray[np.object_])
67-
68-
assert_type(AR_i // AR_LIKE_b, npt.NDArray[np.int64])
69-
assert_type(AR_i // AR_LIKE_u, npt.NDArray[np.signedinteger])
70-
assert_type(AR_i // AR_LIKE_i, npt.NDArray[np.signedinteger])
71-
assert_type(AR_i // AR_LIKE_f, npt.NDArray[np.float64])
72-
assert_type(AR_i // AR_LIKE_O, npt.NDArray[np.object_])
73-
74-
assert_type(AR_LIKE_b // AR_i, npt.NDArray[np.int64])
75-
assert_type(AR_LIKE_u // AR_i, npt.NDArray[np.signedinteger])
76-
assert_type(AR_LIKE_i // AR_i, npt.NDArray[np.signedinteger])
77-
assert_type(AR_LIKE_f // AR_i, npt.NDArray[np.float64])
78-
assert_type(AR_LIKE_m // AR_i, npt.NDArray[np.timedelta64])
79-
assert_type(AR_LIKE_O // AR_i, npt.NDArray[np.object_])
80-
81-
assert_type(AR_f // AR_LIKE_b, npt.NDArray[np.float64])
82-
assert_type(AR_f // AR_LIKE_u, npt.NDArray[np.float64])
83-
assert_type(AR_f // AR_LIKE_i, npt.NDArray[np.float64])
84-
assert_type(AR_f // AR_LIKE_f, npt.NDArray[np.float64])
85-
assert_type(AR_f // AR_LIKE_O, npt.NDArray[np.object_])
86-
87-
assert_type(AR_LIKE_b // AR_f, npt.NDArray[np.float64])
88-
assert_type(AR_LIKE_u // AR_f, npt.NDArray[np.float64])
89-
assert_type(AR_LIKE_i // AR_f, npt.NDArray[np.float64])
90-
assert_type(AR_LIKE_f // AR_f, npt.NDArray[np.float64])
91-
assert_type(AR_LIKE_m // AR_f, npt.NDArray[np.timedelta64])
92-
assert_type(AR_LIKE_O // AR_f, npt.NDArray[np.object_])
93-
94-
assert_type(AR_m // AR_LIKE_u, npt.NDArray[np.timedelta64])
95-
assert_type(AR_m // AR_LIKE_i, npt.NDArray[np.timedelta64])
96-
assert_type(AR_m // AR_LIKE_f, npt.NDArray[np.timedelta64])
97-
assert_type(AR_m // AR_LIKE_m, npt.NDArray[np.int64])
98-
assert_type(AR_m // AR_LIKE_O, npt.NDArray[np.object_])
99-
100-
assert_type(AR_LIKE_m // AR_m, npt.NDArray[np.int64])
101-
assert_type(AR_LIKE_O // AR_m, npt.NDArray[np.object_])
102-
103-
assert_type(AR_O // AR_LIKE_b, npt.NDArray[np.object_])
104-
assert_type(AR_O // AR_LIKE_u, npt.NDArray[np.object_])
105-
assert_type(AR_O // AR_LIKE_i, npt.NDArray[np.object_])
106-
assert_type(AR_O // AR_LIKE_f, npt.NDArray[np.object_])
107-
assert_type(AR_O // AR_LIKE_m, npt.NDArray[np.object_])
108-
assert_type(AR_O // AR_LIKE_M, npt.NDArray[np.object_])
109-
assert_type(AR_O // AR_LIKE_O, npt.NDArray[np.object_])
110-
111-
assert_type(AR_LIKE_b // AR_O, npt.NDArray[np.object_])
112-
assert_type(AR_LIKE_u // AR_O, npt.NDArray[np.object_])
113-
assert_type(AR_LIKE_i // AR_O, npt.NDArray[np.object_])
114-
assert_type(AR_LIKE_f // AR_O, npt.NDArray[np.object_])
115-
assert_type(AR_LIKE_m // AR_O, npt.NDArray[np.object_])
116-
assert_type(AR_LIKE_M // AR_O, npt.NDArray[np.object_])
117-
assert_type(AR_LIKE_O // AR_O, npt.NDArray[np.object_])
118-
11924
# Time structures
12025

12126
assert_type(m8 // m8, np.int64)

‎src/numpy-stubs/@test/static/reject/arithmetic.pyi‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,18 +51,18 @@ AR_M // AR_LIKE_c # type: ignore[operator] # pyright: ignore[reportOperatorIss
5151
AR_M // AR_LIKE_m # type: ignore[operator] # pyright: ignore[reportOperatorIssue]
5252
AR_M // AR_LIKE_M # type: ignore[operator] # pyright: ignore[reportOperatorIssue]
5353

54-
AR_b // AR_LIKE_M # type: ignore[type-var] # pyright: ignore[reportOperatorIssue]
54+
AR_b // AR_LIKE_M # type: ignore[operator] # pyright: ignore[reportOperatorIssue]
5555
AR_u // AR_LIKE_M # type: ignore[operator] # pyright: ignore[reportOperatorIssue]
5656
AR_i // AR_LIKE_M # type: ignore[operator] # pyright: ignore[reportOperatorIssue]
5757
AR_f // AR_LIKE_M # type: ignore[operator] # pyright: ignore[reportOperatorIssue]
5858
AR_c // AR_LIKE_M # type: ignore[operator] # pyright: ignore[reportOperatorIssue]
5959
AR_m // AR_LIKE_M # type: ignore[operator] # pyright: ignore[reportOperatorIssue]
6060
AR_M // AR_LIKE_M # type: ignore[operator] # pyright: ignore[reportOperatorIssue]
6161

62-
_3 = AR_m // AR_LIKE_b # type: ignore[var-annotated]
62+
AR_m // AR_LIKE_b # type: ignore[operator] # pyright: ignore[reportOperatorIssue]
6363
AR_m // AR_LIKE_c # type: ignore[operator] # pyright: ignore[reportOperatorIssue]
6464

65-
AR_b // AR_LIKE_m # type: ignore[type-var] # pyright: ignore[reportOperatorIssue]
65+
AR_b // AR_LIKE_m # type: ignore[operator] # pyright: ignore[reportOperatorIssue]
6666
AR_u // AR_LIKE_m # type: ignore[operator] # pyright: ignore[reportOperatorIssue]
6767
AR_i // AR_LIKE_m # type: ignore[operator] # pyright: ignore[reportOperatorIssue]
6868
AR_f // AR_LIKE_m # type: ignore[operator] # pyright: ignore[reportOperatorIssue]

0 commit comments

Comments
 (0)