Skip to content

Commit fb4a298

Browse files
Add type parameters for types used in df.merge
1 parent 54a763c commit fb4a298

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

pandas-stubs/_typing.pyi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ from pandas.io.formats.format import EngFormatter
5454
Incomplete: TypeAlias = Any
5555

5656
ArrayLike: TypeAlias = ExtensionArray | np.ndarray
57-
AnyArrayLike: TypeAlias = Index | Series | np.ndarray
57+
AnyArrayLike: TypeAlias = Index[Any] | Series[Any] | np.ndarray[Any, Any]
5858
PythonScalar: TypeAlias = str | bool | complex
5959
DatetimeLikeScalar = TypeVar("DatetimeLikeScalar", Period, Timestamp, Timedelta)
6060
PandasScalar: TypeAlias = bytes | datetime.date | datetime.datetime | datetime.timedelta

pandas-stubs/core/frame.pyi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1403,7 +1403,7 @@ class DataFrame(NDFrame, OpsMixin):
14031403
) -> DataFrame: ...
14041404
def merge(
14051405
self,
1406-
right: DataFrame | Series,
1406+
right: DataFrame | Series[Any],
14071407
how: MergeHow = ...,
14081408
on: IndexLabel | AnyArrayLike | None = ...,
14091409
left_on: IndexLabel | AnyArrayLike | None = ...,

0 commit comments

Comments
 (0)