diff --git a/pandas-stubs/_typing.pyi b/pandas-stubs/_typing.pyi index fbbd9cdc9..f82cc64b8 100644 --- a/pandas-stubs/_typing.pyi +++ b/pandas-stubs/_typing.pyi @@ -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 diff --git a/pandas-stubs/core/frame.pyi b/pandas-stubs/core/frame.pyi index 04314d144..600ebc767 100644 --- a/pandas-stubs/core/frame.pyi +++ b/pandas-stubs/core/frame.pyi @@ -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 = ...,