Skip to content

GH1065 timestamp freq argument and DataFrame/Series.mask #1066

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Dec 1, 2024
Merged

GH1065 timestamp freq argument and DataFrame/Series.mask #1066

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8dd513a
GH1065 Timestamp freq argument removal
loicdiridollou Dec 1, 2024
189f840
GH1065 Add details to type of other in mask
loicdiridollou Dec 1, 2024
8bd0ac6
GH1065 Revert json
loicdiridollou Dec 1, 2024
9b24c32
GH1065 Realign Timestamp args with pandas
loicdiridollou Dec 1, 2024
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
11 changes: 3 additions & 8 deletions pandas-stubs/_libs/tslibs/timestamps.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,21 +59,18 @@ class Timestamp(datetime):
def __new__(
cls,
ts_input: np.integer | float | str | _date | datetime | np.datetime64 = ...,
# Freq is deprecated but is left in to allow code like Timestamp(2000,1,1)
# Removing it would make the other arguments position only
freq: int | str | BaseOffset | None = ...,
tz: str | _tzinfo | int | None = ...,
unit: str | int | None = ...,
year: int | None = ...,
month: int | None = ...,
day: int | None = ...,
hour: int | None = ...,
minute: int | None = ...,
second: int | None = ...,
microsecond: int | None = ...,
nanosecond: int | None = ...,
tzinfo: _tzinfo | None = ...,
*,
nanosecond: int | None = ...,
tz: str | _tzinfo | int | None = ...,
unit: str | int | None = ...,
fold: Literal[0, 1] | None = ...,
) -> Self: ...
# GH 46171
Expand Down Expand Up @@ -119,8 +116,6 @@ class Timestamp(datetime):
def fromordinal(
cls,
ordinal: int,
# freq produces a FutureWarning about being deprecated in a future version
freq: None = ...,
tz: _tzinfo | str | None = ...,
) -> Self: ...
@classmethod
Expand Down
2 changes: 1 addition & 1 deletion pandas-stubs/core/frame.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1955,7 +1955,7 @@ class DataFrame(NDFrame, OpsMixin):
| Callable[[DataFrame], DataFrame]
| Callable[[Any], _bool]
),
other=...,
other: Scalar | Series[S1] | DataFrame | Callable | NAType | None = ...,
*,
inplace: _bool = ...,
axis: Axis | None = ...,
Expand Down