Skip to content

Commit c8305a6

Browse files
author
MarcoGorelli
committed
wip
1 parent d74c498 commit c8305a6

File tree

1 file changed

+38
-22
lines changed

1 file changed

+38
-22
lines changed

pandas/tests/resample/test_datetime_index.py

Lines changed: 38 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1557,24 +1557,28 @@ def test_groupby_with_dst_time_change():
15571557
tm.assert_frame_equal(result, expected)
15581558

15591559

1560-
def test_resample_dst_anchor():
1560+
def test_resample_dst_anchor(unit):
15611561
# 5172
1562-
dti = DatetimeIndex([datetime(2012, 11, 4, 23)], tz="US/Eastern")
1562+
dti = DatetimeIndex([datetime(2012, 11, 4, 23)], tz="US/Eastern").as_unit(unit)
15631563
df = DataFrame([5], index=dti)
15641564

1565-
dti = DatetimeIndex(df.index.normalize(), freq="D")
1565+
dti = DatetimeIndex(df.index.normalize(), freq="D").as_unit(unit)
15661566
expected = DataFrame([5], index=dti)
15671567
tm.assert_frame_equal(df.resample(rule="D").sum(), expected)
15681568
df.resample(rule="MS").sum()
15691569
tm.assert_frame_equal(
15701570
df.resample(rule="MS").sum(),
15711571
DataFrame(
15721572
[5],
1573-
index=DatetimeIndex([datetime(2012, 11, 1)], tz="US/Eastern", freq="MS"),
1573+
index=DatetimeIndex(
1574+
[datetime(2012, 11, 1)], tz="US/Eastern", freq="MS"
1575+
).as_unit(unit),
15741576
),
15751577
)
15761578

1577-
dti = date_range("2013-09-30", "2013-11-02", freq="30Min", tz="Europe/Paris")
1579+
dti = date_range(
1580+
"2013-09-30", "2013-11-02", freq="30Min", tz="Europe/Paris"
1581+
).as_unit(unit)
15781582
values = range(dti.size)
15791583
df = DataFrame({"a": values, "b": values, "c": values}, index=dti, dtype="int64")
15801584
how = {"a": "min", "b": "max", "c": "count"}
@@ -1587,7 +1591,9 @@ def test_resample_dst_anchor():
15871591
"b": [47, 383, 719, 1055, 1393, 1586],
15881592
"c": [48, 336, 336, 336, 338, 193],
15891593
},
1590-
index=date_range("9/30/2013", "11/4/2013", freq="W-MON", tz="Europe/Paris"),
1594+
index=date_range(
1595+
"9/30/2013", "11/4/2013", freq="W-MON", tz="Europe/Paris"
1596+
).as_unit(unit),
15911597
),
15921598
"W-MON Frequency",
15931599
)
@@ -1602,7 +1608,7 @@ def test_resample_dst_anchor():
16021608
},
16031609
index=date_range(
16041610
"9/30/2013", "11/11/2013", freq="2W-MON", tz="Europe/Paris"
1605-
),
1611+
).as_unit(unit),
16061612
),
16071613
"2W-MON Frequency",
16081614
)
@@ -1611,7 +1617,9 @@ def test_resample_dst_anchor():
16111617
df.resample("MS").agg(how)[["a", "b", "c"]],
16121618
DataFrame(
16131619
{"a": [0, 48, 1538], "b": [47, 1537, 1586], "c": [48, 1490, 49]},
1614-
index=date_range("9/1/2013", "11/1/2013", freq="MS", tz="Europe/Paris"),
1620+
index=date_range(
1621+
"9/1/2013", "11/1/2013", freq="MS", tz="Europe/Paris"
1622+
).as_unit(unit),
16151623
),
16161624
"MS Frequency",
16171625
)
@@ -1620,7 +1628,9 @@ def test_resample_dst_anchor():
16201628
df.resample("2MS").agg(how)[["a", "b", "c"]],
16211629
DataFrame(
16221630
{"a": [0, 1538], "b": [1537, 1586], "c": [1538, 49]},
1623-
index=date_range("9/1/2013", "11/1/2013", freq="2MS", tz="Europe/Paris"),
1631+
index=date_range(
1632+
"9/1/2013", "11/1/2013", freq="2MS", tz="Europe/Paris"
1633+
).as_unit(unit),
16241634
),
16251635
"2MS Frequency",
16261636
)
@@ -1636,61 +1646,67 @@ def test_resample_dst_anchor():
16361646
"b": [1295, 1345, 1393, 1441],
16371647
"c": [48, 50, 48, 48],
16381648
},
1639-
index=date_range("10/26/2013", "10/29/2013", freq="D", tz="Europe/Paris"),
1649+
index=date_range(
1650+
"10/26/2013", "10/29/2013", freq="D", tz="Europe/Paris"
1651+
).as_unit(unit),
16401652
),
16411653
"D Frequency",
16421654
)
16431655

16441656

1645-
def test_downsample_across_dst():
1657+
def test_downsample_across_dst(unit):
16461658
# GH 8531
16471659
tz = pytz.timezone("Europe/Berlin")
16481660
dt = datetime(2014, 10, 26)
1649-
dates = date_range(tz.localize(dt), periods=4, freq="2H")
1661+
dates = date_range(tz.localize(dt), periods=4, freq="2H").as_unit(unit)
16501662
result = Series(5, index=dates).resample("H").mean()
16511663
expected = Series(
16521664
[5.0, np.nan] * 3 + [5.0],
1653-
index=date_range(tz.localize(dt), periods=7, freq="H"),
1665+
index=date_range(tz.localize(dt), periods=7, freq="H").as_unit(unit),
16541666
)
16551667
tm.assert_series_equal(result, expected)
16561668

16571669

1658-
def test_downsample_across_dst_weekly():
1670+
def test_downsample_across_dst_weekly(unit):
16591671
# GH 9119, GH 21459
16601672
df = DataFrame(
16611673
index=DatetimeIndex(
16621674
["2017-03-25", "2017-03-26", "2017-03-27", "2017-03-28", "2017-03-29"],
16631675
tz="Europe/Amsterdam",
1664-
),
1676+
).as_unit(unit),
16651677
data=[11, 12, 13, 14, 15],
16661678
)
16671679
result = df.resample("1W").sum()
16681680
expected = DataFrame(
16691681
[23, 42],
16701682
index=DatetimeIndex(
16711683
["2017-03-26", "2017-04-02"], tz="Europe/Amsterdam", freq="W"
1672-
),
1684+
).as_unit(unit),
16731685
)
16741686
tm.assert_frame_equal(result, expected)
16751687

16761688

1677-
def test_downsample_across_dst_weekly_2():
1689+
def test_downsample_across_dst_weekly_2(unit):
16781690
# GH 9119, GH 21459
1679-
idx = date_range("2013-04-01", "2013-05-01", tz="Europe/London", freq="H")
1691+
idx = date_range("2013-04-01", "2013-05-01", tz="Europe/London", freq="H").as_unit(
1692+
unit
1693+
)
16801694
s = Series(index=idx, dtype=np.float64)
16811695
result = s.resample("W").mean()
16821696
expected = Series(
1683-
index=date_range("2013-04-07", freq="W", periods=5, tz="Europe/London"),
1697+
index=date_range("2013-04-07", freq="W", periods=5, tz="Europe/London").as_unit(
1698+
unit
1699+
),
16841700
dtype=np.float64,
16851701
)
16861702
tm.assert_series_equal(result, expected)
16871703

16881704

1689-
def test_downsample_dst_at_midnight():
1705+
def test_downsample_dst_at_midnight(unit):
16901706
# GH 25758
16911707
start = datetime(2018, 11, 3, 12)
16921708
end = datetime(2018, 11, 5, 12)
1693-
index = date_range(start, end, freq="1H")
1709+
index = date_range(start, end, freq="1H").as_unit(unit)
16941710
index = index.tz_localize("UTC").tz_convert("America/Havana")
16951711
data = list(range(len(index)))
16961712
dataframe = DataFrame(data, index=index)
@@ -1699,7 +1715,7 @@ def test_downsample_dst_at_midnight():
16991715
dti = date_range("2018-11-03", periods=3).tz_localize(
17001716
"America/Havana", ambiguous=True
17011717
)
1702-
dti = DatetimeIndex(dti, freq="D")
1718+
dti = DatetimeIndex(dti, freq="D").as_unit(unit)
17031719
expected = DataFrame([7.5, 28.0, 44.5], index=dti)
17041720
tm.assert_frame_equal(result, expected)
17051721

0 commit comments

Comments
 (0)