Skip to content

Commit

Permalink
Add type parameters for types used in df.merge
Browse files Browse the repository at this point in the history
  • Loading branch information
JanEricNitschke committed Jun 28, 2024
1 parent ea8bdee commit 1d2ccbf
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion pandas-stubs/_typing.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ from pandas.io.formats.format import EngFormatter
Incomplete: TypeAlias = Any

ArrayLike: TypeAlias = ExtensionArray | np.ndarray[Any, Any]
AnyArrayLike: TypeAlias = Index | Series | np.ndarray
AnyArrayLike: TypeAlias = Index[Any] | Series[Any] | np.ndarray[Any, Any]
PythonScalar: TypeAlias = str | bool | complex
DatetimeLikeScalar = TypeVar("DatetimeLikeScalar", Period, Timestamp, Timedelta)
PandasScalar: TypeAlias = bytes | datetime.date | datetime.datetime | datetime.timedelta
Expand Down
2 changes: 1 addition & 1 deletion pandas-stubs/core/frame.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -1403,7 +1403,7 @@ class DataFrame(NDFrame, OpsMixin):
) -> DataFrame: ...
def merge(
self,
right: DataFrame | Series,
right: DataFrame | Series[Any],
how: MergeHow = ...,
on: IndexLabel | AnyArrayLike | None = ...,
left_on: IndexLabel | AnyArrayLike | None = ...,
Expand Down

0 comments on commit 1d2ccbf

Please sign in to comment.