Skip to content

BUG: Fix inconsistency with DateOffset near DST #61870

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.

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
Open
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: 5 additions & 4 deletions pandas/_libs/tslibs/offsets.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ from cpython.datetime cimport (

import warnings

from dateutil.relativedelta import relativedelta

import_datetime()

import numpy as np
Expand Down Expand Up @@ -283,8 +285,9 @@ _relativedelta_kwds = {"years", "months", "weeks", "days", "year", "month",

cdef _determine_offset(kwds):
if not kwds:
# GH 45643/45890: (historically) defaults to 1 day
return timedelta(days=1), False
# GH 45643, 45890: (historically) defaults to 1 day
# GH 61870: changed from timedelta to relativedelta
return relativedelta(days=1), True

if "millisecond" in kwds:
raise NotImplementedError(
Expand Down Expand Up @@ -325,8 +328,6 @@ cdef _determine_offset(kwds):
kwds_no_nanos["microseconds"] = kwds_no_nanos.get("microseconds", 0) + micro

if all(k in kwds_use_relativedelta for k in kwds_no_nanos):
from dateutil.relativedelta import relativedelta

return relativedelta(**kwds_no_nanos), True

raise ValueError(
Expand Down
13 changes: 11 additions & 2 deletions pandas/tests/tseries/offsets/test_offsets.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
timedelta,
)

from dateutil.relativedelta import relativedelta
import numpy as np
import pytest

Expand Down Expand Up @@ -1095,9 +1096,9 @@ def test_dateoffset_misc():

@pytest.mark.parametrize("n", [-1, 1, 3])
def test_construct_int_arg_no_kwargs_assumed_days(n):
# GH 45890, 45643
# GH 45643, 45890, 61870
offset = DateOffset(n)
assert offset._offset == timedelta(1)
assert offset._offset == relativedelta(days=1)
result = Timestamp(2022, 1, 2) + offset
expected = Timestamp(2022, 1, 2 + n)
assert result == expected
Expand Down Expand Up @@ -1227,3 +1228,11 @@ def test_is_yqm_start_end():
def test_multiply_dateoffset_typeerror(left, right):
with pytest.raises(TypeError, match="Cannot multiply"):
left * right


def test_dateoffset_days_vs_n_near_dst_transition():
ts = Timestamp("2022-10-30", tz="Europe/Brussels")
Copy link
Member

Choose a reason for hiding this comment

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

GH ref


offset_days = ts + offsets.DateOffset(days=1)
offset_n = ts + offsets.DateOffset(1)
assert offset_days == offset_n
Loading