Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions pandas-stubs/core/frame.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,10 @@ from pandas.core.reshape.pivot import (
_PivotTableIndexTypes,
_PivotTableValuesTypes,
)
from pandas.core.series import Series
from pandas.core.series import (
Series,
UnknownSeries,
)
from pandas.core.window import (
Expanding,
ExponentialMovingWindow,
Expand Down Expand Up @@ -2008,7 +2011,7 @@ class DataFrame(NDFrame, OpsMixin, _GetItemHack):
| Callable[[DataFrame], DataFrame]
| Callable[[Any], _bool]
),
other: Scalar | Series[S1] | DataFrame | Callable | NAType | None = ...,
other: Scalar | UnknownSeries | DataFrame | Callable | NAType | None = ...,
*,
inplace: Literal[True],
axis: Axis | None = ...,
Expand All @@ -2024,7 +2027,7 @@ class DataFrame(NDFrame, OpsMixin, _GetItemHack):
| Callable[[DataFrame], DataFrame]
| Callable[[Any], _bool]
),
other: Scalar | Series[S1] | DataFrame | Callable | NAType | None = ...,
other: Scalar | UnknownSeries | DataFrame | Callable | NAType | None = ...,
*,
inplace: Literal[False] = ...,
axis: Axis | None = ...,
Expand Down
7 changes: 4 additions & 3 deletions pandas-stubs/core/generic.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ import numpy as np
from pandas import Index
import pandas.core.indexing as indexing
from pandas.core.resample import DatetimeIndexResampler
from pandas.core.series import Series
from pandas.core.series import (
UnknownSeries,
)
import sqlalchemy.engine
from typing_extensions import (
Concatenate,
Expand All @@ -28,7 +30,6 @@ from typing_extensions import (

from pandas._libs.lib import NoDefault
from pandas._typing import (
S1,
Axis,
CompressionOptions,
CSVQuoting,
Expand Down Expand Up @@ -81,7 +82,7 @@ class NDFrame(indexing.IndexingMixin):
def ndim(self) -> int: ...
@property
def size(self) -> int: ...
def equals(self, other: Series[S1]) -> _bool: ...
def equals(self, other: UnknownSeries) -> _bool: ...
def __neg__(self) -> Self: ...
def __pos__(self) -> Self: ...
def __nonzero__(self) -> None: ...
Expand Down