Skip to content

Commit 6ceee91

Browse files
jorenhamjorenham
committed
🎨 refactor from _numtype import in @test 
1 parent 899756c commit 6ceee91

2 files changed

Lines changed: 49 additions & 50 deletions

File tree

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

Lines changed: 46 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,97 +1,96 @@
11
from typing import Any
22
from typing_extensions import assert_type
33

4+
import _numtype as _nt
45
import numpy as np
5-
import numpy.typing as npt
6-
from _numtype import Array1D
76
from numpy.lib._arraysetops_impl import UniqueAllResult, UniqueCountsResult, UniqueInverseResult
87

9-
AR_b: npt.NDArray[np.bool]
10-
AR_i_: npt.NDArray[np.intp]
11-
AR_f8: npt.NDArray[np.float64]
12-
AR_M: npt.NDArray[np.datetime64]
13-
AR_O: npt.NDArray[np.object_]
8+
AR_b: _nt.Array[np.bool]
9+
AR_i_: _nt.Array[np.intp]
10+
AR_f8: _nt.Array[np.float64]
11+
AR_M: _nt.Array[np.datetime64]
12+
AR_O: _nt.Array[np.object_]
1413
AR_LIKE_i_: list[int]
1514

1615
###
1716

18-
assert_type(np.intersect1d(AR_i_, AR_i_), Array1D[np.intp])
19-
assert_type(np.intersect1d(AR_f8, AR_i_), Array1D[np.float64])
20-
assert_type(np.intersect1d(AR_M, AR_M, assume_unique=True), Array1D[np.datetime64])
17+
assert_type(np.intersect1d(AR_i_, AR_i_), _nt.Array1D[np.intp])
18+
assert_type(np.intersect1d(AR_f8, AR_i_), _nt.Array1D[np.float64])
19+
assert_type(np.intersect1d(AR_M, AR_M, assume_unique=True), _nt.Array1D[np.datetime64])
2120
assert_type(
2221
np.intersect1d(AR_f8, AR_f8, return_indices=True),
23-
tuple[Array1D[np.float64], Array1D[np.intp], Array1D[np.intp]],
22+
tuple[_nt.Array1D[np.float64], _nt.Array1D[np.intp], _nt.Array1D[np.intp]],
2423
)
2524

26-
assert_type(np.union1d(AR_i_, AR_i_), Array1D[np.intp])
27-
assert_type(np.union1d(AR_f8, AR_i_), Array1D[np.float64])
28-
assert_type(np.union1d(AR_M, AR_M), Array1D[np.datetime64])
25+
assert_type(np.union1d(AR_i_, AR_i_), _nt.Array1D[np.intp])
26+
assert_type(np.union1d(AR_f8, AR_i_), _nt.Array1D[np.float64])
27+
assert_type(np.union1d(AR_M, AR_M), _nt.Array1D[np.datetime64])
2928

30-
assert_type(np.ediff1d(AR_b), Array1D[np.int8])
31-
assert_type(np.ediff1d(AR_M), Array1D[np.timedelta64])
32-
assert_type(np.ediff1d(AR_O), Array1D[np.object_])
33-
assert_type(np.ediff1d(AR_i_, to_end=[1, 2, 3]), Array1D[np.intp])
34-
assert_type(np.ediff1d(AR_LIKE_i_, to_begin=[0, 1]), Array1D[np.intp])
29+
assert_type(np.ediff1d(AR_b), _nt.Array1D[np.int8])
30+
assert_type(np.ediff1d(AR_M), _nt.Array1D[np.timedelta64])
31+
assert_type(np.ediff1d(AR_O), _nt.Array1D[np.object_])
32+
assert_type(np.ediff1d(AR_i_, to_end=[1, 2, 3]), _nt.Array1D[np.intp])
33+
assert_type(np.ediff1d(AR_LIKE_i_, to_begin=[0, 1]), _nt.Array1D[np.intp])
3534

36-
assert_type(np.setxor1d(AR_i_, AR_i_), Array1D[np.intp])
37-
assert_type(np.setxor1d(AR_f8, AR_i_), Array1D[np.float64])
38-
assert_type(np.setxor1d(AR_M, AR_M, assume_unique=True), Array1D[np.datetime64])
35+
assert_type(np.setxor1d(AR_i_, AR_i_), _nt.Array1D[np.intp])
36+
assert_type(np.setxor1d(AR_f8, AR_i_), _nt.Array1D[np.float64])
37+
assert_type(np.setxor1d(AR_M, AR_M, assume_unique=True), _nt.Array1D[np.datetime64])
3938

40-
assert_type(np.setdiff1d(AR_i_, AR_i_), Array1D[np.intp])
41-
assert_type(np.setdiff1d(AR_f8, AR_i_), Array1D[np.float64])
42-
assert_type(np.setdiff1d(AR_M, AR_M, assume_unique=True), Array1D[np.datetime64])
39+
assert_type(np.setdiff1d(AR_i_, AR_i_), _nt.Array1D[np.intp])
40+
assert_type(np.setdiff1d(AR_f8, AR_i_), _nt.Array1D[np.float64])
41+
assert_type(np.setdiff1d(AR_M, AR_M, assume_unique=True), _nt.Array1D[np.datetime64])
4342

44-
assert_type(np.isin(AR_i_, AR_i_), npt.NDArray[np.bool])
45-
assert_type(np.isin(AR_f8, AR_i_), npt.NDArray[np.bool])
46-
assert_type(np.isin(AR_M, AR_M, assume_unique=True), npt.NDArray[np.bool])
47-
assert_type(np.isin(AR_f8, AR_LIKE_i_, invert=True), npt.NDArray[np.bool])
43+
assert_type(np.isin(AR_i_, AR_i_), _nt.Array[np.bool])
44+
assert_type(np.isin(AR_f8, AR_i_), _nt.Array[np.bool])
45+
assert_type(np.isin(AR_M, AR_M, assume_unique=True), _nt.Array[np.bool])
46+
assert_type(np.isin(AR_f8, AR_LIKE_i_, invert=True), _nt.Array[np.bool])
4847

49-
assert_type(np.unique(AR_f8), npt.NDArray[np.float64])
50-
assert_type(np.unique(AR_f8, return_index=True), tuple[npt.NDArray[np.float64], npt.NDArray[np.intp]])
51-
assert_type(np.unique(AR_f8, return_inverse=True), tuple[npt.NDArray[np.float64], npt.NDArray[np.intp]])
52-
assert_type(np.unique(AR_f8, return_counts=True), tuple[npt.NDArray[np.float64], npt.NDArray[np.intp]])
53-
assert_type(np.unique(AR_LIKE_i_, axis=0), npt.NDArray[Any])
54-
assert_type(np.unique(AR_LIKE_i_, return_index=True), tuple[npt.NDArray[Any], npt.NDArray[np.intp]])
55-
assert_type(np.unique(AR_LIKE_i_, return_inverse=True), tuple[npt.NDArray[Any], npt.NDArray[np.intp]])
56-
assert_type(np.unique(AR_LIKE_i_, return_counts=True), tuple[npt.NDArray[Any], npt.NDArray[np.intp]])
48+
assert_type(np.unique(AR_f8), _nt.Array[np.float64])
49+
assert_type(np.unique(AR_f8, return_index=True), tuple[_nt.Array[np.float64], _nt.Array[np.intp]])
50+
assert_type(np.unique(AR_f8, return_inverse=True), tuple[_nt.Array[np.float64], _nt.Array[np.intp]])
51+
assert_type(np.unique(AR_f8, return_counts=True), tuple[_nt.Array[np.float64], _nt.Array[np.intp]])
52+
assert_type(np.unique(AR_LIKE_i_, axis=0), _nt.Array[Any])
53+
assert_type(np.unique(AR_LIKE_i_, return_index=True), tuple[_nt.Array[Any], _nt.Array[np.intp]])
54+
assert_type(np.unique(AR_LIKE_i_, return_inverse=True), tuple[_nt.Array[Any], _nt.Array[np.intp]])
55+
assert_type(np.unique(AR_LIKE_i_, return_counts=True), tuple[_nt.Array[Any], _nt.Array[np.intp]])
5756
assert_type(
5857
np.unique(AR_f8, return_index=True, return_inverse=True),
59-
tuple[npt.NDArray[np.float64], npt.NDArray[np.intp], npt.NDArray[np.intp]],
58+
tuple[_nt.Array[np.float64], _nt.Array[np.intp], _nt.Array[np.intp]],
6059
)
6160
assert_type(
6261
np.unique(AR_LIKE_i_, return_index=True, return_inverse=True),
63-
tuple[npt.NDArray[Any], npt.NDArray[np.intp], npt.NDArray[np.intp]],
62+
tuple[_nt.Array[Any], _nt.Array[np.intp], _nt.Array[np.intp]],
6463
)
6564
assert_type(
6665
np.unique(AR_f8, return_index=True, return_counts=True),
67-
tuple[npt.NDArray[np.float64], npt.NDArray[np.intp], npt.NDArray[np.intp]],
66+
tuple[_nt.Array[np.float64], _nt.Array[np.intp], _nt.Array[np.intp]],
6867
)
6968
assert_type(
7069
np.unique(AR_LIKE_i_, return_index=True, return_counts=True),
71-
tuple[npt.NDArray[Any], npt.NDArray[np.intp], npt.NDArray[np.intp]],
70+
tuple[_nt.Array[Any], _nt.Array[np.intp], _nt.Array[np.intp]],
7271
)
7372
assert_type(
7473
np.unique(AR_f8, return_inverse=True, return_counts=True),
75-
tuple[npt.NDArray[np.float64], npt.NDArray[np.intp], npt.NDArray[np.intp]],
74+
tuple[_nt.Array[np.float64], _nt.Array[np.intp], _nt.Array[np.intp]],
7675
)
7776
assert_type(
7877
np.unique(AR_LIKE_i_, return_inverse=True, return_counts=True),
79-
tuple[npt.NDArray[Any], npt.NDArray[np.intp], npt.NDArray[np.intp]],
78+
tuple[_nt.Array[Any], _nt.Array[np.intp], _nt.Array[np.intp]],
8079
)
8180
assert_type(
8281
np.unique(AR_f8, return_index=True, return_inverse=True, return_counts=True),
83-
tuple[npt.NDArray[np.float64], npt.NDArray[np.intp], npt.NDArray[np.intp], npt.NDArray[np.intp]],
82+
tuple[_nt.Array[np.float64], _nt.Array[np.intp], _nt.Array[np.intp], _nt.Array[np.intp]],
8483
)
8584
assert_type(
8685
np.unique(AR_LIKE_i_, return_index=True, return_inverse=True, return_counts=True),
87-
tuple[npt.NDArray[Any], npt.NDArray[np.intp], npt.NDArray[np.intp], npt.NDArray[np.intp]],
86+
tuple[_nt.Array[Any], _nt.Array[np.intp], _nt.Array[np.intp], _nt.Array[np.intp]],
8887
)
8988

9089
assert_type(np.unique_all(AR_f8), UniqueAllResult[np.float64])
9190
assert_type(np.unique_counts(AR_f8), UniqueCountsResult[np.float64])
9291
assert_type(np.unique_inverse(AR_f8), UniqueInverseResult[np.float64])
93-
assert_type(np.unique_values(AR_f8), Array1D[np.float64])
92+
assert_type(np.unique_values(AR_f8), _nt.Array1D[np.float64])
9493
assert_type(np.unique_all(AR_LIKE_i_), UniqueAllResult[np.intp])
9594
assert_type(np.unique_counts(AR_LIKE_i_), UniqueCountsResult[np.intp])
9695
assert_type(np.unique_inverse(AR_LIKE_i_), UniqueInverseResult[np.intp])
97-
assert_type(np.unique_values(AR_LIKE_i_), Array1D[np.intp])
96+
assert_type(np.unique_values(AR_LIKE_i_), _nt.Array1D[np.intp])

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
from typing import Any, Literal, TypeAlias
22
from typing_extensions import TypeVar, assert_type
33

4+
import _numtype as _nt
45
import numpy as np
56
import numpy.typing as npt
6-
from _numtype import Array, AtLeast2D
77
from numpy.linalg._linalg import EigResult, EighResult, QRResult, SVDResult, SlogdetResult
88

99
_ScalarT = TypeVar("_ScalarT", bound=np.generic)
10-
_Array_2d: TypeAlias = Array[_ScalarT, tuple[int, int]]
11-
_Array_2nd: TypeAlias = Array[_ScalarT, AtLeast2D]
10+
_Array_2d: TypeAlias = _nt.Array[_ScalarT, tuple[int, int]]
11+
_Array_2nd: TypeAlias = _nt.Array[_ScalarT, _nt.AtLeast2D]
1212

1313
###
1414

0 commit comments

Comments
 (0)