Skip to content

TYP: freq and na_value #47729

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
Jul 18, 2022
Merged

TYP: freq and na_value #47729

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4c1ca95
TYP: freq and na_value
twoertwein Jul 15, 2022
13e487f
_simple_new
twoertwein Jul 15, 2022
5af32f8
Merge remote-tracking branch 'upstream/main' into freq_na
twoertwein Jul 15, 2022
e86b053
Merge branch 'main' into freq_na
twoertwein Jul 18, 2022
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
7 changes: 5 additions & 2 deletions pandas/core/arrays/datetimes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,10 @@ def _validate_dtype(cls, values, dtype):
# error: Signature of "_simple_new" incompatible with supertype "NDArrayBacked"
@classmethod
def _simple_new( # type: ignore[override]
cls, values: np.ndarray, freq: BaseOffset | None = None, dtype=DT64NS_DTYPE
cls,
values: np.ndarray,
freq: str | BaseOffset | lib.NoDefault | None = None,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jbrockmendel should the caller ensure the freq is not a string when calling _simple_new?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should be BaseOffset | None

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you, I changed it!

dtype=DT64NS_DTYPE,
) -> DatetimeArray:
assert isinstance(values, np.ndarray)
assert dtype.kind == "M"
Expand All @@ -291,7 +294,7 @@ def _from_sequence_not_strict(
dtype=None,
copy: bool = False,
tz=None,
freq=lib.no_default,
freq: str | BaseOffset | lib.NoDefault | None = lib.no_default,
dayfirst: bool = False,
yearfirst: bool = False,
ambiguous="raise",
Expand Down
2 changes: 1 addition & 1 deletion pandas/core/frame.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1746,7 +1746,7 @@ def to_numpy(
self,
dtype: npt.DTypeLike | None = None,
copy: bool = False,
na_value=lib.no_default,
na_value: object = lib.no_default,
) -> np.ndarray:
"""
Convert the DataFrame to a NumPy array.
Expand Down
3 changes: 2 additions & 1 deletion pandas/core/indexes/datetimes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
lib,
)
from pandas._libs.tslibs import (
BaseOffset,
Resolution,
periods_per_day,
timezones,
Expand Down Expand Up @@ -312,7 +313,7 @@ def isocalendar(self) -> DataFrame:
def __new__(
cls,
data=None,
freq=lib.no_default,
freq: str | BaseOffset | lib.NoDefault = lib.no_default,
tz=None,
normalize: bool = False,
closed=None,
Expand Down
2 changes: 1 addition & 1 deletion pandas/core/internals/array_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1132,7 +1132,7 @@ def as_array(
self,
dtype=None,
copy: bool = False,
na_value=lib.no_default,
na_value: object = lib.no_default,
) -> np.ndarray:
"""
Convert the blockmanager data into an numpy array.
Expand Down