Skip to content

Commit 11c7754

Browse files
committed
update tests
1 parent f901c2f commit 11c7754

File tree

4 files changed

+14
-11
lines changed

4 files changed

+14
-11
lines changed

pandas/core/arrays/datetimelike.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2070,6 +2070,8 @@ def _maybe_pin_freq(self, freq, validate_kwds: dict):
20702070
# We cannot inherit a freq from the data, so we need to validate
20712071
# the user-passed freq
20722072
freq = to_offset(freq)
2073+
if self.dtype.kind == "m":
2074+
freq = freq._maybe_to_hours()
20732075
type(self)._validate_frequency(self, freq, **validate_kwds)
20742076
self._freq = freq
20752077
else:

pandas/tests/indexes/datetimes/methods/test_round.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ def test_ceil_floor_edge(self, test_input, rounder, freq, expected):
190190
)
191191
def test_round_int64(self, start, index_freq, periods, round_freq):
192192
dt = date_range(start=start, freq=index_freq, periods=periods)
193-
unit = to_offset(round_freq).nanos
193+
unit = to_offset(round_freq)._maybe_to_hours().nanos
194194

195195
# test floor
196196
result = dt.floor(round_freq)

pandas/tests/indexes/datetimes/test_arithmetic.py

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# Arithmetic tests specific to DatetimeIndex are generally about `freq`
22
# rentention or inference. Other arithmetic tests belong in
33
# tests/arithmetic/test_datetime64.py
4-
import pytest
54

65
from pandas import (
76
Timedelta,
@@ -16,28 +15,30 @@
1615
class TestDatetimeIndexArithmetic:
1716
def test_add_timedelta_preserves_freq(self):
1817
# GH#37295 should hold for any DTI with freq=None or Tick freq
18+
# In pandas3 "D" preserves time-of-day across DST transitions, so
19+
# is not preserved by subtraction. Ticks offsets like "24h"
20+
# are still preserved
1921
tz = "Canada/Eastern"
2022
dti = date_range(
2123
start=Timestamp("2019-03-26 00:00:00-0400", tz=tz),
2224
end=Timestamp("2020-10-17 00:00:00-0400", tz=tz),
23-
freq="D",
25+
freq="24h",
2426
)
2527
result = dti + Timedelta(days=1)
2628
assert result.freq == dti.freq
2729

2830
def test_sub_datetime_preserves_freq(self, tz_naive_fixture):
2931
# GH#48818
30-
dti = date_range("2016-01-01", periods=12, tz=tz_naive_fixture)
32+
# In pandas3 "D" preserves time-of-day across DST transitions, so
33+
# is not preserved by subtraction. Ticks offsets like "24h"
34+
# are still preserved
35+
dti = date_range("2016-01-01", periods=12, tz=tz_naive_fixture, freq="24h")
3136

3237
res = dti - dti[0]
3338
expected = timedelta_range("0 Days", "11 Days")
3439
tm.assert_index_equal(res, expected)
3540
assert res.freq == expected.freq
3641

37-
@pytest.mark.xfail(
38-
reason="The inherited freq is incorrect bc dti.freq is incorrect "
39-
"https://github.com/pandas-dev/pandas/pull/48818/files#r982793461"
40-
)
4142
def test_sub_datetime_preserves_freq_across_dst(self):
4243
# GH#48818
4344
ts = Timestamp("2016-03-11", tz="US/Pacific")

pandas/tests/indexes/datetimes/test_misc.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ def test_datetimeindex_accessors(self):
119119
tm.assert_index_equal(res, exp)
120120

121121
def test_datetimeindex_accessors2(self):
122-
dti = date_range(freq="BQ-FEB", start=datetime(1998, 1, 1), periods=4)
122+
dti = date_range(freq="BQE-FEB", start=datetime(1998, 1, 1), periods=4)
123123

124124
assert sum(dti.is_quarter_start) == 0
125125
assert sum(dti.is_quarter_end) == 4
@@ -142,9 +142,9 @@ def test_datetimeindex_accessors4(self):
142142
def test_datetimeindex_accessors5(self):
143143
freq_m = to_offset("ME")
144144
bm = to_offset("BME")
145-
qfeb = to_offset("Q-FEB")
145+
qfeb = to_offset("QE-FEB")
146146
qsfeb = to_offset("QS-FEB")
147-
bq = to_offset("BQ")
147+
bq = to_offset("BQE")
148148
bqs_apr = to_offset("BQS-APR")
149149
as_nov = to_offset("YS-NOV")
150150

0 commit comments

Comments
 (0)