Skip to content

fix enum typing from _lib #62145

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
+81 −40
Open

fix enum typing from _lib #62145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b112975
fix enum typing from _lib
Dr-Irv Aug 19, 2025
a1c195d
remove added ignore
Dr-Irv Aug 19, 2025
8df3e11
for stubtest, handle enums
Dr-Irv Aug 25, 2025
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
77 changes: 40 additions & 37 deletions pandas/_libs/tslibs/dtypes.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,33 +28,35 @@ class PeriodDtypeBase:
def _td64_unit(self) -> str: ...

class FreqGroup(Enum):
FR_ANN: int
FR_QTR: int
FR_MTH: int
FR_WK: int
FR_BUS: int
FR_DAY: int
FR_HR: int
FR_MIN: int
FR_SEC: int
FR_MS: int
FR_US: int
FR_NS: int
FR_UND: int
_value_: int
FR_ANN = ...
FR_QTR = ...
FR_MTH = ...
FR_WK = ...
FR_BUS = ...
FR_DAY = ...
FR_HR = ...
FR_MIN = ...
FR_SEC = ...
FR_MS = ...
FR_US = ...
FR_NS = ...
FR_UND = ...
@staticmethod
def from_period_dtype_code(code: int) -> FreqGroup: ...

class Resolution(Enum):
RESO_NS: int
RESO_US: int
RESO_MS: int
RESO_SEC: int
RESO_MIN: int
RESO_HR: int
RESO_DAY: int
RESO_MTH: int
RESO_QTR: int
RESO_YR: int
_value_: int
RESO_NS = ...
RESO_US = ...
RESO_MS = ...
RESO_SEC = ...
RESO_MIN = ...
RESO_HR = ...
RESO_DAY = ...
RESO_MTH = ...
RESO_QTR = ...
RESO_YR = ...
def __lt__(self, other: Resolution) -> bool: ...
def __ge__(self, other: Resolution) -> bool: ...
@property
Expand All @@ -67,17 +69,18 @@ class Resolution(Enum):
def attr_abbrev(self) -> str: ...

class NpyDatetimeUnit(Enum):
NPY_FR_Y: int
NPY_FR_M: int
NPY_FR_W: int
NPY_FR_D: int
NPY_FR_h: int
NPY_FR_m: int
NPY_FR_s: int
NPY_FR_ms: int
NPY_FR_us: int
NPY_FR_ns: int
NPY_FR_ps: int
NPY_FR_fs: int
NPY_FR_as: int
NPY_FR_GENERIC: int
_value_: int
NPY_FR_Y = ...
NPY_FR_M = ...
NPY_FR_W = ...
NPY_FR_D = ...
NPY_FR_h = ...
NPY_FR_m = ...
NPY_FR_s = ...
NPY_FR_ms = ...
NPY_FR_us = ...
NPY_FR_ns = ...
NPY_FR_ps = ...
NPY_FR_fs = ...
NPY_FR_as = ...
NPY_FR_GENERIC = ...
4 changes: 2 additions & 2 deletions pandas/core/arrays/period.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1435,11 +1435,11 @@ def _range_from_fields(
if quarter is not None:
if freq is None:
freq = to_offset("Q", is_period=True)
base = FreqGroup.FR_QTR.value
base = cast(int, FreqGroup.FR_QTR.value)
Copy link

Choose a reason for hiding this comment

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

Note that this is a mypy bug and is no longer necessary on mypy master (python/mypy#19352), so the next release will cause [redundant-cast] here and below

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes. I made the changes in this PR to address the future mypy, but we need the code to work now with the current mypy and so that the changes made in the dev version of mypy work with pandas.

else:
freq = to_offset(freq, is_period=True)
base = libperiod.freq_to_dtype_code(freq)
if base != FreqGroup.FR_QTR.value:
if base != cast(int, FreqGroup.FR_QTR.value):
raise AssertionError("base must equal FR_QTR")

freqstr = freq.freqstr
Expand Down
2 changes: 1 addition & 1 deletion pandas/core/tools/datetimes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,7 +528,7 @@ def _to_datetime_with_unit(arg, unit, name, utc: bool, errors: str) -> Index:
utc=utc,
errors=errors,
unit_for_numerics=unit,
creso=NpyDatetimeUnit.NPY_FR_ns.value,
creso=cast(int, NpyDatetimeUnit.NPY_FR_ns.value),
)

result = DatetimeIndex(arr, name=name)
Expand Down
38 changes: 38 additions & 0 deletions scripts/run_stubtest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,44 @@
"pandas._libs.tslibs.offsets.BusinessHour.rollforward ",
# type alias
"pandas._libs.tslibs.timedeltas.UnitChoices",
# enum types in cython vs PYI
"pandas._libs.tslibs.dtypes.FreqGroup.FR_ANN",
Copy link

Choose a reason for hiding this comment

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

Even better, that same PR made all these entries redundant as well - current stubtest on mypy master does not report them as incompatible.

"pandas._libs.tslibs.dtypes.FreqGroup.FR_BUS",
"pandas._libs.tslibs.dtypes.FreqGroup.FR_DAY",
"pandas._libs.tslibs.dtypes.FreqGroup.FR_HR",
"pandas._libs.tslibs.dtypes.FreqGroup.FR_MIN",
"pandas._libs.tslibs.dtypes.FreqGroup.FR_MS",
"pandas._libs.tslibs.dtypes.FreqGroup.FR_MTH",
"pandas._libs.tslibs.dtypes.FreqGroup.FR_NS",
"pandas._libs.tslibs.dtypes.FreqGroup.FR_QTR",
"pandas._libs.tslibs.dtypes.FreqGroup.FR_SEC",
"pandas._libs.tslibs.dtypes.FreqGroup.FR_UND",
"pandas._libs.tslibs.dtypes.FreqGroup.FR_US",
"pandas._libs.tslibs.dtypes.FreqGroup.FR_WK",
"pandas._libs.tslibs.dtypes.NpyDatetimeUnit.NPY_FR_D",
"pandas._libs.tslibs.dtypes.NpyDatetimeUnit.NPY_FR_GENERIC",
"pandas._libs.tslibs.dtypes.NpyDatetimeUnit.NPY_FR_M",
"pandas._libs.tslibs.dtypes.NpyDatetimeUnit.NPY_FR_W",
"pandas._libs.tslibs.dtypes.NpyDatetimeUnit.NPY_FR_Y",
"pandas._libs.tslibs.dtypes.NpyDatetimeUnit.NPY_FR_as",
"pandas._libs.tslibs.dtypes.NpyDatetimeUnit.NPY_FR_fs",
"pandas._libs.tslibs.dtypes.NpyDatetimeUnit.NPY_FR_h",
"pandas._libs.tslibs.dtypes.NpyDatetimeUnit.NPY_FR_m",
"pandas._libs.tslibs.dtypes.NpyDatetimeUnit.NPY_FR_ms",
"pandas._libs.tslibs.dtypes.NpyDatetimeUnit.NPY_FR_ns",
"pandas._libs.tslibs.dtypes.NpyDatetimeUnit.NPY_FR_ps",
"pandas._libs.tslibs.dtypes.NpyDatetimeUnit.NPY_FR_s",
"pandas._libs.tslibs.dtypes.NpyDatetimeUnit.NPY_FR_us",
"pandas._libs.tslibs.dtypes.Resolution.RESO_DAY",
"pandas._libs.tslibs.dtypes.Resolution.RESO_HR",
"pandas._libs.tslibs.dtypes.Resolution.RESO_MIN",
"pandas._libs.tslibs.dtypes.Resolution.RESO_MS",
"pandas._libs.tslibs.dtypes.Resolution.RESO_MTH",
"pandas._libs.tslibs.dtypes.Resolution.RESO_NS",
"pandas._libs.tslibs.dtypes.Resolution.RESO_QTR",
"pandas._libs.tslibs.dtypes.Resolution.RESO_SEC",
"pandas._libs.tslibs.dtypes.Resolution.RESO_US",
"pandas._libs.tslibs.dtypes.Resolution.RESO_YR",
]

if __name__ == "__main__":
Expand Down
Loading