Skip to content

Commit 520d542

Browse files
jorenhamjorenham
authored
Merge pull request #571 from numpy/ignore-commas
2 parents 6179c94 + 783d649 commit 520d542

Some content is hidden

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

79 files changed

+641
-2820
lines changed

‎pyproject.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,10 +190,11 @@ preview = true
190190

191191
[tool.ruff.format]
192192
line-ending = "lf"
193+
skip-magic-trailing-comma = true
193194

194195
[tool.ruff.lint]
195196
select = ["ALL"]
196-
ignore = ["CPY", "FIX002"]
197+
ignore = ["CPY", "FIX002", "COM812"]
197198

198199
[tool.ruff.lint.per-file-ignores]
199200
"*.pyi" = [
@@ -231,7 +232,7 @@ preview = true
231232
combine-as-imports = true
232233
extra-standard-library = ["_typeshed", "typing_extensions"]
233234
known-first-party = ["numpy", "numtype", "_numtype"]
234-
split-on-trailing-comma = true
235+
split-on-trailing-comma = false
235236

236237
[tool.ruff.lint.pydocstyle]
237238
convention = "numpy"

‎src/_numtype/__init__.pyi

Lines changed: 13 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -657,34 +657,22 @@ ToCharacter_3nd = TypeAliasType("ToCharacter_3nd", _ToArray2_3nd[_ToCharacter, _
657657
ToString_nd = TypeAliasType("ToString_nd", SequenceND[_CanStringArray[Shape, _NaT0]], type_params=(_NaT0,))
658658
ToString_0d = TypeAliasType("ToString_0d", _CanStringArray[Shape0, _NaT0], type_params=(_NaT0,))
659659
ToString_1ds = TypeAliasType(
660-
"ToString_1ds",
661-
_CanStringArray[Shape1, _NaT0] | Sequence[ToString_0d[_NaT0]],
662-
type_params=(_NaT0,),
660+
"ToString_1ds", _CanStringArray[Shape1, _NaT0] | Sequence[ToString_0d[_NaT0]], type_params=(_NaT0,)
663661
)
664662
ToString_2ds = TypeAliasType(
665-
"ToString_2ds",
666-
_CanStringArray[Shape2, _NaT0] | Sequence[ToString_1ds[_NaT0]],
667-
type_params=(_NaT0,),
663+
"ToString_2ds", _CanStringArray[Shape2, _NaT0] | Sequence[ToString_1ds[_NaT0]], type_params=(_NaT0,)
668664
)
669665
ToString_3ds = TypeAliasType(
670-
"ToString_3ds",
671-
_CanStringArray[Shape3, _NaT0] | Sequence[ToString_2ds[_NaT0]],
672-
type_params=(_NaT0,),
666+
"ToString_3ds", _CanStringArray[Shape3, _NaT0] | Sequence[ToString_2ds[_NaT0]], type_params=(_NaT0,)
673667
)
674668
ToString_1nd = TypeAliasType(
675-
"ToString_1nd",
676-
_CanStringArray[Shape1N, _NaT0] | Sequence[_CanStringArray[Shape0N, _NaT0]],
677-
type_params=(_NaT0,),
669+
"ToString_1nd", _CanStringArray[Shape1N, _NaT0] | Sequence[_CanStringArray[Shape0N, _NaT0]], type_params=(_NaT0,)
678670
)
679671
ToString_2nd = TypeAliasType(
680-
"ToString_2nd",
681-
_CanStringArray[Shape2N, _NaT0] | Sequence[ToString_1nd[_NaT0]],
682-
type_params=(_NaT0,),
672+
"ToString_2nd", _CanStringArray[Shape2N, _NaT0] | Sequence[ToString_1nd[_NaT0]], type_params=(_NaT0,)
683673
)
684674
ToString_3nd = TypeAliasType(
685-
"ToString_3nd",
686-
_CanStringArray[Shape3N, _NaT0] | Sequence[ToString_2nd[_NaT0]],
687-
type_params=(_NaT0,),
675+
"ToString_3nd", _CanStringArray[Shape3N, _NaT0] | Sequence[ToString_2nd[_NaT0]], type_params=(_NaT0,)
688676
)
689677

690678
ToObject_nd = TypeAliasType("ToObject_nd", _ToArray2_nd[np.object_, _PyObject])
@@ -978,43 +966,23 @@ CoStr_1nd = TypeAliasType("CoStr_1nd", _ToArray2_1nd[_ToCharacter, _PyCharacter]
978966
CoStr_2nd = TypeAliasType("CoStr_2nd", _ToArray2_2nd[_ToCharacter, _PyCharacter])
979967
CoStr_3nd = TypeAliasType("CoStr_3nd", _ToArray2_3nd[_ToCharacter, _PyCharacter])
980968

981-
CoString_nd = TypeAliasType(
982-
"CoString_nd",
983-
SequenceND[_CanCoStringArray[Shape, _NaT0] | JustStr],
984-
type_params=(_NaT0,),
985-
)
986-
CoString_0d = TypeAliasType(
987-
"CoString_0d",
988-
_CanCoStringArray[Shape0, _NaT0] | JustStr,
989-
type_params=(_NaT0,),
990-
)
991-
CoString_1ds = TypeAliasType(
992-
"CoString_1ds",
993-
_CanCoStringArray[Shape1, _NaT0] | Sequence[JustStr],
994-
type_params=(_NaT0,),
995-
)
969+
CoString_nd = TypeAliasType("CoString_nd", SequenceND[_CanCoStringArray[Shape, _NaT0] | JustStr], type_params=(_NaT0,))
970+
CoString_0d = TypeAliasType("CoString_0d", _CanCoStringArray[Shape0, _NaT0] | JustStr, type_params=(_NaT0,))
971+
CoString_1ds = TypeAliasType("CoString_1ds", _CanCoStringArray[Shape1, _NaT0] | Sequence[JustStr], type_params=(_NaT0,))
996972
CoString_2ds = TypeAliasType(
997-
"CoString_2ds",
998-
_CanCoStringArray[Shape2, _NaT0] | Sequence[CoString_1ds[_NaT0]],
999-
type_params=(_NaT0,),
973+
"CoString_2ds", _CanCoStringArray[Shape2, _NaT0] | Sequence[CoString_1ds[_NaT0]], type_params=(_NaT0,)
1000974
)
1001975
CoString_3ds = TypeAliasType(
1002-
"CoString_3ds",
1003-
_CanCoStringArray[Shape3, _NaT0] | Sequence[CoString_2ds[_NaT0]],
1004-
type_params=(_NaT0,),
976+
"CoString_3ds", _CanCoStringArray[Shape3, _NaT0] | Sequence[CoString_2ds[_NaT0]], type_params=(_NaT0,)
1005977
)
1006978
CoString_1nd = TypeAliasType(
1007979
"CoString_1nd",
1008980
_CanCoStringArray[Shape1N, _NaT0] | Sequence[_CanCoStringArray[Shape0N, _NaT0]],
1009981
type_params=(_NaT0,),
1010982
)
1011983
CoString_2nd = TypeAliasType(
1012-
"CoString_2nd",
1013-
_CanCoStringArray[Shape2N, _NaT0] | Sequence[CoString_1nd[_NaT0]],
1014-
type_params=(_NaT0,),
984+
"CoString_2nd", _CanCoStringArray[Shape2N, _NaT0] | Sequence[CoString_1nd[_NaT0]], type_params=(_NaT0,)
1015985
)
1016986
CoString_3nd = TypeAliasType(
1017-
"CoString_3nd",
1018-
_CanCoStringArray[Shape3N, _NaT0] | Sequence[CoString_2nd[_NaT0]],
1019-
type_params=(_NaT0,),
987+
"CoString_3nd", _CanCoStringArray[Shape3N, _NaT0] | Sequence[CoString_2nd[_NaT0]], type_params=(_NaT0,)
1020988
)

‎src/_numtype/_array.pyi

Lines changed: 6 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -59,33 +59,9 @@ MArray3D = TypeAliasType("MArray3D", np.ma.MaskedArray[Rank3, np.dtype[_ScalarT]
5959

6060
###
6161

62-
StringArray = TypeAliasType(
63-
"StringArray",
64-
np.ndarray[_RankT, np.dtypes.StringDType[_NaT]],
65-
type_params=(_RankT, _NaT),
66-
)
67-
StringArray0D = TypeAliasType(
68-
"StringArray0D",
69-
np.ndarray[Rank0, np.dtypes.StringDType[_NaT]],
70-
type_params=(_NaT,),
71-
)
72-
StringArray1D = TypeAliasType(
73-
"StringArray1D",
74-
np.ndarray[Rank1, np.dtypes.StringDType[_NaT]],
75-
type_params=(_NaT,),
76-
)
77-
StringArray2D = TypeAliasType(
78-
"StringArray2D",
79-
np.ndarray[Rank2, np.dtypes.StringDType[_NaT]],
80-
type_params=(_NaT,),
81-
)
82-
StringArray3D = TypeAliasType(
83-
"StringArray3D",
84-
np.ndarray[Rank3, np.dtypes.StringDType[_NaT]],
85-
type_params=(_NaT,),
86-
)
87-
StringArrayND = TypeAliasType(
88-
"StringArrayND",
89-
np.ndarray[Shape, np.dtypes.StringDType[_NaT]],
90-
type_params=(_NaT,),
91-
)
62+
StringArray = TypeAliasType("StringArray", np.ndarray[_RankT, np.dtypes.StringDType[_NaT]], type_params=(_RankT, _NaT))
63+
StringArray0D = TypeAliasType("StringArray0D", np.ndarray[Rank0, np.dtypes.StringDType[_NaT]], type_params=(_NaT,))
64+
StringArray1D = TypeAliasType("StringArray1D", np.ndarray[Rank1, np.dtypes.StringDType[_NaT]], type_params=(_NaT,))
65+
StringArray2D = TypeAliasType("StringArray2D", np.ndarray[Rank2, np.dtypes.StringDType[_NaT]], type_params=(_NaT,))
66+
StringArray3D = TypeAliasType("StringArray3D", np.ndarray[Rank3, np.dtypes.StringDType[_NaT]], type_params=(_NaT,))
67+
StringArrayND = TypeAliasType("StringArrayND", np.ndarray[Shape, np.dtypes.StringDType[_NaT]], type_params=(_NaT,))

‎src/_numtype/_dtype.pyi

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,14 +83,10 @@ class _HasDTypeOf(Protocol[_ScalarT_co]):
8383
def dtype(self) -> np.dtype[_ScalarT_co]: ...
8484

8585
_ToDType = TypeAliasType(
86-
"_ToDType",
87-
type[_ScalarT] | np.dtype[_ScalarT] | _HasDTypeOf[_ScalarT],
88-
type_params=(_ScalarT,),
86+
"_ToDType", type[_ScalarT] | np.dtype[_ScalarT] | _HasDTypeOf[_ScalarT], type_params=(_ScalarT,)
8987
)
9088
_ToDType2 = TypeAliasType(
91-
"_ToDType2",
92-
type[_ScalarT | _T] | np.dtype[_ScalarT] | _HasDTypeOf[_ScalarT],
93-
type_params=(_ScalarT, _T),
89+
"_ToDType2", type[_ScalarT | _T] | np.dtype[_ScalarT] | _HasDTypeOf[_ScalarT], type_params=(_ScalarT, _T)
9490
)
9591

9692
_C_i16: TypeAlias = ct.c_int16 | ct.c_short

‎src/_numtype/_nep50.pyi

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -131,20 +131,12 @@ class _LikeScalar(Protocol[_LikeT_co]):
131131
_SequenceND: TypeAlias = _LikeT | _NestedSequence[_LikeT]
132132

133133
Casts = TypeAliasType(
134-
"Casts",
135-
_SequenceND[_LikeNumeric[_CanNEP50[_ScalarOutT, Any, Any], _ShapeT]],
136-
type_params=(_ScalarOutT, _ShapeT),
134+
"Casts", _SequenceND[_LikeNumeric[_CanNEP50[_ScalarOutT, Any, Any], _ShapeT]], type_params=(_ScalarOutT, _ShapeT)
137135
)
138136
CastsArray = TypeAliasType(
139-
"CastsArray",
140-
_SequenceND[_LikeArray[_CanNEP50[_ScalarOutT, Any, Any], _ShapeT]],
141-
type_params=(_ScalarOutT, _ShapeT),
142-
)
143-
CastsScalar = TypeAliasType(
144-
"CastsScalar",
145-
_LikeScalar[_CanNEP50[_ScalarOutT, Any, Any]],
146-
type_params=(_ScalarOutT,),
137+
"CastsArray", _SequenceND[_LikeArray[_CanNEP50[_ScalarOutT, Any, Any], _ShapeT]], type_params=(_ScalarOutT, _ShapeT)
147138
)
139+
CastsScalar = TypeAliasType("CastsScalar", _LikeScalar[_CanNEP50[_ScalarOutT, Any, Any]], type_params=(_ScalarOutT,))
148140

149141
#
150142
_CastWith: TypeAlias = (
@@ -168,9 +160,7 @@ CastsWithArray = TypeAliasType(
168160
type_params=(_ScalarInT, _ScalarOutT, _ShapeT),
169161
)
170162
CastsWithScalar = TypeAliasType(
171-
"CastsWithScalar",
172-
_LikeScalar[_CastWith[_ScalarInT, _ScalarOutT]],
173-
type_params=(_ScalarInT, _ScalarOutT),
163+
"CastsWithScalar", _LikeScalar[_CastWith[_ScalarInT, _ScalarOutT]], type_params=(_ScalarInT, _ScalarOutT)
174164
)
175165

176166
#

‎src/_numtype/_rank.pyi

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -39,25 +39,13 @@ _RankLE: TypeAlias = _CanBroadcast[Any, _UpperT, _RankT] | Shape0 | Rank0 | Rank
3939
# TODO(jorenham): remove `| Rank` once python/mypy#19110 is fixed
4040
_RankGE: TypeAlias = _CanBroadcast[_LowerT, Any, _RankT] | _LowerT | Rank
4141

42-
HasRankLE = TypeAliasType(
43-
"HasRankLE",
44-
_HasInnerShape[_RankLE[_UpperT, _RankT]],
45-
type_params=(_UpperT, _RankT),
46-
)
47-
HasRankGE = TypeAliasType(
48-
"HasRankGE",
49-
_HasInnerShape[_RankGE[_LowerT, _RankT]],
50-
type_params=(_LowerT, _RankT),
51-
)
42+
HasRankLE = TypeAliasType("HasRankLE", _HasInnerShape[_RankLE[_UpperT, _RankT]], type_params=(_UpperT, _RankT))
43+
HasRankGE = TypeAliasType("HasRankGE", _HasInnerShape[_RankGE[_LowerT, _RankT]], type_params=(_LowerT, _RankT))
5244

5345
_ShapeT = TypeVar("_ShapeT", bound=Shape)
5446

5547
# for unwrapping potential rank types as shape tuples
56-
HasInnerShape = TypeAliasType(
57-
"HasInnerShape",
58-
_HasInnerShape[_HasOwnShape[Any, _ShapeT]],
59-
type_params=(_ShapeT,),
60-
)
48+
HasInnerShape = TypeAliasType("HasInnerShape", _HasInnerShape[_HasOwnShape[Any, _ShapeT]], type_params=(_ShapeT,))
6149

6250
###
6351

0 commit comments

Comments
 (0)