Skip to content

Commit 2448b5f

Browse files
loicdiridollouloicdiridollou
authored
GH1484 Upgrade ty (#1509)
* GH1484 Upgrade ty * GH1484 Fix formatting * GH1484 Update PR
1 parent 852ef64 commit 2448b5f

File tree

17 files changed

+86
-68
lines changed

17 files changed

+86
-68
lines changed

‎pandas-stubs/_libs/missing.pyi‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ class NAType:
117117
@overload
118118
def __eq__(self, other: Index, /) -> BooleanArray: ...
119119
@overload
120-
def __eq__( # pyright: ignore[reportIncompatibleMethodOverride]
120+
def __eq__( # pyright: ignore[reportIncompatibleMethodOverride] # ty: ignore[invalid-method-override]
121121
self, other: Scalar, /
122122
) -> NAType: ...
123123
@overload # type: ignore[override]
@@ -127,7 +127,7 @@ class NAType:
127127
@overload
128128
def __ne__(self, other: Index, /) -> BooleanArray: ...
129129
@overload
130-
def __ne__( # pyright: ignore[reportIncompatibleMethodOverride]
130+
def __ne__( # pyright: ignore[reportIncompatibleMethodOverride] # ty: ignore[invalid-method-override]
131131
self, other: Scalar, /
132132
) -> NAType: ...
133133
@overload

‎pandas-stubs/_libs/tslibs/timedeltas.pyi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ class Timedelta(timedelta):
259259
self, other: np_ndarray[ShapeT, np.integer | np.floating]
260260
) -> np_ndarray[ShapeT, np.timedelta64]: ...
261261
@overload
262-
def __truediv__(
262+
def __truediv__( # ty: ignore[invalid-method-override]
263263
self, other: np_ndarray[ShapeT, np.timedelta64]
264264
) -> np_ndarray[ShapeT, np.floating]: ...
265265
@overload

‎pandas-stubs/_libs/tslibs/timestamps.pyi‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,9 @@ class Timestamp(datetime, SupportsIndex):
180180
self, other: np_ndarray[ShapeT, np.datetime64]
181181
) -> np_ndarray[ShapeT, np.bool]: ...
182182
@overload
183-
def __le__(self, other: Series[Timestamp]) -> Series[bool]: ...
183+
def __le__( # ty: ignore[invalid-method-override]
184+
self, other: Series[Timestamp]
185+
) -> Series[bool]: ...
184186
@overload # type: ignore[override]
185187
def __lt__(self, other: datetime | np.datetime64 | Self) -> bool: ...
186188
@overload
@@ -190,7 +192,9 @@ class Timestamp(datetime, SupportsIndex):
190192
self, other: np_ndarray[ShapeT, np.datetime64]
191193
) -> np_ndarray[ShapeT, np.bool]: ...
192194
@overload
193-
def __lt__(self, other: Series[Timestamp]) -> Series[bool]: ...
195+
def __lt__( # ty: ignore[invalid-method-override]
196+
self, other: Series[Timestamp]
197+
) -> Series[bool]: ...
194198
@overload # type: ignore[override]
195199
def __ge__(self, other: datetime | np.datetime64 | Self) -> bool: ...
196200
@overload
@@ -200,7 +204,9 @@ class Timestamp(datetime, SupportsIndex):
200204
self, other: np_ndarray[ShapeT, np.datetime64]
201205
) -> np_ndarray[ShapeT, np.bool]: ...
202206
@overload
203-
def __ge__(self, other: Series[Timestamp]) -> Series[bool]: ...
207+
def __ge__( # ty: ignore[invalid-method-override]
208+
self, other: Series[Timestamp]
209+
) -> Series[bool]: ...
204210
@overload # type: ignore[override]
205211
def __gt__(self, other: datetime | np.datetime64 | Self) -> bool: ...
206212
@overload
@@ -210,7 +216,9 @@ class Timestamp(datetime, SupportsIndex):
210216
self, other: np_ndarray[ShapeT, np.datetime64]
211217
) -> np_ndarray[ShapeT, np.bool]: ...
212218
@overload
213-
def __gt__(self, other: Series[Timestamp]) -> Series[bool]: ...
219+
def __gt__( # ty: ignore[invalid-method-override]
220+
self, other: Series[Timestamp]
221+
) -> Series[bool]: ...
214222
# error: Signature of "__add__" incompatible with supertype "date"/"datetime"
215223
@overload # type: ignore[override]
216224
def __add__(
@@ -236,7 +244,7 @@ class Timestamp(datetime, SupportsIndex):
236244
@overload
237245
def __sub__(self, other: TimedeltaIndex) -> DatetimeIndex: ...
238246
@overload
239-
def __sub__(
247+
def __sub__( # ty: ignore[invalid-method-override]
240248
self, other: np_ndarray[ShapeT, np.timedelta64]
241249
) -> np_ndarray[ShapeT, np.datetime64]: ...
242250
@overload

‎pandas-stubs/core/arrays/categorical.pyi‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,11 @@ class Categorical(ExtensionArray):
111111
def take(
112112
self, indexer: TakeIndexer, *, allow_fill: bool = ..., fill_value=...
113113
) -> Categorical: ...
114-
def __contains__(self, key) -> bool: ...
114+
def __contains__(self, item) -> bool: ...
115115
@overload
116116
def __getitem__(self, key: ScalarIndexer) -> Any: ...
117117
@overload
118-
def __getitem__(
118+
def __getitem__( # ty: ignore[invalid-method-override]
119119
self,
120120
key: SequenceIndexer | PositionalIndexerTuple,
121121
) -> Self: ...

‎pandas-stubs/core/arrays/datetimelike.pyi‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,9 @@ class DatetimeLikeArrayMixin(ExtensionOpsMixin, ExtensionArray):
7373
@overload
7474
def __getitem__(self, key: ScalarIndexer) -> DTScalarOrNaT: ...
7575
@overload
76-
def __getitem__(
76+
def __getitem__( # ty: ignore[invalid-method-override]
7777
self,
78-
key: SequenceIndexer | PositionalIndexerTuple,
78+
item: SequenceIndexer | PositionalIndexerTuple,
7979
) -> Self: ...
8080
def __setitem__( # type: ignore[override] # pyright: ignore[reportIncompatibleMethodOverride]
8181
self, key: int | Sequence[int] | Sequence[bool] | slice, value

‎pandas-stubs/core/arrays/interval.pyi‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ class IntervalArray(IntervalMixin, ExtensionArray):
6161
self, dtype: NpDtype | None = None, copy: bool | None = None
6262
) -> np_1darray: ...
6363
@overload
64-
def __getitem__(self, key: ScalarIndexer) -> IntervalOrNA: ...
64+
def __getitem__(self, item: ScalarIndexer) -> IntervalOrNA: ...
6565
@overload
66-
def __getitem__(self, key: SequenceIndexer) -> Self: ...
66+
def __getitem__(self, item: SequenceIndexer) -> Self: ...
6767
def __setitem__(self, key, value) -> None: ...
6868
def __eq__(self, other): ...
6969
def __ne__(self, other): ...

‎pandas-stubs/core/arrays/sparse/array.pyi‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ class SparseArray(ExtensionArray, ExtensionOpsMixin):
6363
@overload
6464
def __getitem__(self, key: ScalarIndexer) -> Any: ...
6565
@overload
66-
def __getitem__(
66+
def __getitem__( # ty: ignore[invalid-method-override]
6767
self,
68-
key: SequenceIndexer | tuple[int | ellipsis, ...],
68+
item: SequenceIndexer | tuple[int | ellipsis, ...],
6969
) -> Self: ...
7070
def copy(self): ...
7171
def map(self, mapper): ...

‎pandas-stubs/core/frame.pyi‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -182,17 +182,17 @@ _T_MUTABLE_MAPPING_co = TypeVar(
182182

183183
class _iLocIndexerFrame(_iLocIndexer, Generic[_T]):
184184
@overload
185-
def __getitem__(self, idx: tuple[int, int]) -> Scalar: ...
185+
def __getitem__(self, key: tuple[int, int]) -> Scalar: ...
186186
@overload
187-
def __getitem__(self, idx: IndexingInt) -> Series: ...
187+
def __getitem__(self, key: IndexingInt) -> Series: ...
188188
@overload
189-
def __getitem__(self, idx: tuple[IndexType | MaskType, int]) -> Series: ...
189+
def __getitem__(self, key: tuple[IndexType | MaskType, int]) -> Series: ...
190190
@overload
191-
def __getitem__(self, idx: tuple[int, IndexType | MaskType]) -> Series: ...
191+
def __getitem__(self, key: tuple[int, IndexType | MaskType]) -> Series: ...
192192
@overload
193193
def __getitem__(
194194
self,
195-
idx: (
195+
key: (
196196
IndexType
197197
| MaskType
198198
| tuple[IndexType | MaskType, IndexType | MaskType]
@@ -203,7 +203,7 @@ class _iLocIndexerFrame(_iLocIndexer, Generic[_T]):
203203
# Keep in sync with `DataFrame.__setitem__`
204204
def __setitem__(
205205
self,
206-
idx: (
206+
key: (
207207
int
208208
| IndexType
209209
| tuple[int, int]
@@ -262,7 +262,7 @@ class _LocIndexerFrame(_LocIndexer, Generic[_T]):
262262
@overload
263263
def __getitem__(
264264
self,
265-
idx: (
265+
key: (
266266
IndexType
267267
| MaskType
268268
| Callable[[DataFrame], IndexType | MaskType | Sequence[Hashable]]
@@ -283,7 +283,7 @@ class _LocIndexerFrame(_LocIndexer, Generic[_T]):
283283
@overload
284284
def __setitem__(
285285
self,
286-
idx: (
286+
key: (
287287
MaskType | StrLike | _IndexSliceTuple | list[ScalarT] | IndexingInt | slice
288288
),
289289
value: (
@@ -302,7 +302,7 @@ class _LocIndexerFrame(_LocIndexer, Generic[_T]):
302302
@overload
303303
def __setitem__(
304304
self,
305-
idx: tuple[_IndexSliceTuple, Hashable],
305+
key: tuple[_IndexSliceTuple, Hashable],
306306
value: (
307307
Scalar
308308
| NAType
@@ -317,17 +317,17 @@ class _LocIndexerFrame(_LocIndexer, Generic[_T]):
317317
) -> None: ...
318318

319319
class _iAtIndexerFrame(_iAtIndexer):
320-
def __getitem__(self, idx: tuple[int, int]) -> Scalar: ...
320+
def __getitem__(self, key: tuple[int, int]) -> Scalar: ...
321321
def __setitem__(
322322
self,
323-
idx: tuple[int, int],
323+
key: tuple[int, int],
324324
value: Scalar | NAType | NaTType | None,
325325
) -> None: ...
326326

327327
class _AtIndexerFrame(_AtIndexer):
328328
def __getitem__(
329329
self,
330-
idx: tuple[
330+
key: tuple[
331331
int
332332
| StrLike
333333
| Timestamp
@@ -338,7 +338,7 @@ class _AtIndexerFrame(_AtIndexer):
338338
) -> Scalar: ...
339339
def __setitem__(
340340
self,
341-
idx: (
341+
key: (
342342
MaskType | StrLike | _IndexSliceTuple | list[ScalarT] | IndexingInt | slice
343343
),
344344
value: (

‎pandas-stubs/core/groupby/generic.pyi‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ class SeriesGroupBy(GroupBy[Series[S2]], Generic[S2, ByT]):
205205
# Overrides that provide more precise return types over the GroupBy class
206206
@final # type: ignore[misc]
207207
# pyrefly: ignore # bad-override
208-
def __iter__( # pyright: ignore[reportIncompatibleMethodOverride]
208+
def __iter__( # pyright: ignore[reportIncompatibleMethodOverride] # ty: ignore[override-of-final-method]
209209
self,
210210
) -> Iterator[tuple[ByT, Series[S2]]]: ...
211211

@@ -244,7 +244,7 @@ class DataFrameGroupBy(GroupBy[DataFrame], Generic[ByT, _TT]):
244244
**kwargs: P.kwargs,
245245
) -> DataFrame: ...
246246
@overload
247-
def apply(
247+
def apply( # ty: ignore[invalid-method-override]
248248
self,
249249
func: DFCallable3[P],
250250
/,
@@ -297,7 +297,7 @@ class DataFrameGroupBy(GroupBy[DataFrame], Generic[ByT, _TT]):
297297
@overload
298298
def __getitem__(self, key: Scalar) -> SeriesGroupBy[Any, ByT]: ... # type: ignore[overload-overlap] # pyright: ignore[reportOverlappingOverload]
299299
@overload
300-
def __getitem__( # pyright: ignore[reportIncompatibleMethodOverride]
300+
def __getitem__( # pyright: ignore[reportIncompatibleMethodOverride] # ty: ignore[invalid-method-override]
301301
self, key: Iterable[Hashable]
302302
) -> DataFrameGroupBy[ByT, _TT]: ...
303303
def nunique(self, dropna: bool = True) -> DataFrame: ...
@@ -449,11 +449,13 @@ class DataFrameGroupBy(GroupBy[DataFrame], Generic[ByT, _TT]):
449449
) -> Series: ... # Series[Axes] but this is not allowed
450450
@property
451451
def dtypes(self) -> Series: ...
452-
def __getattr__(self, name: str) -> SeriesGroupBy[Any, ByT]: ...
452+
def __getattr__(
453+
self, name: str
454+
) -> SeriesGroupBy[Any, ByT]: ... # ty: ignore[invalid-method-override]
453455
# Overrides that provide more precise return types over the GroupBy class
454456
@final # type: ignore[misc]
455457
# pyrefly: ignore # bad-override
456-
def __iter__( # pyright: ignore[reportIncompatibleMethodOverride]
458+
def __iter__( # pyright: ignore[reportIncompatibleMethodOverride] # ty: ignore[override-of-final-method]
457459
self,
458460
) -> Iterator[tuple[ByT, DataFrame]]: ...
459461
@overload

‎pandas-stubs/core/indexes/datetimes.pyi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class DatetimeIndex(
7373
self, other: datetime | np.datetime64 | np_ndarray_dt | Self
7474
) -> TimedeltaIndex: ...
7575
@overload
76-
def __sub__( # pyright: ignore[reportIncompatibleMethodOverride]
76+
def __sub__( # pyright: ignore[reportIncompatibleMethodOverride] # ty: ignore[invalid-method-override]
7777
self, other: timedelta | np.timedelta64 | np_ndarray_td | BaseOffset
7878
) -> Self: ...
7979
def __truediv__( # type: ignore[override] # pyrefly: ignore[bad-override]

0 commit comments

Comments
 (0)