Skip to content

TST: more accurate expecteds for DTI/TDI #33712

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

Closed
wants to merge 2 commits into from
Closed

TST: more accurate expecteds for DTI/TDI #33712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ca5704
TST: more accurate expecteds for DTI/TDI
jbrockmendel Apr 21, 2020
db5b495
Merge branch 'master' of https://github.com/pandas-dev/pandas into ts…
jbrockmendel Apr 22, 2020
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
4 changes: 4 additions & 0 deletions pandas/tests/arithmetic/test_datetime64.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2052,6 +2052,7 @@ def test_dti_add_tdi(self, tz_naive_fixture):
dti = DatetimeIndex([Timestamp("2017-01-01", tz=tz)] * 10)
tdi = pd.timedelta_range("0 days", periods=10)
expected = pd.date_range("2017-01-01", periods=10, tz=tz)
expected = pd.DatetimeIndex(list(expected), freq=None)

# add with TimdeltaIndex
result = dti + tdi
Expand All @@ -2073,6 +2074,7 @@ def test_dti_iadd_tdi(self, tz_naive_fixture):
dti = DatetimeIndex([Timestamp("2017-01-01", tz=tz)] * 10)
tdi = pd.timedelta_range("0 days", periods=10)
expected = pd.date_range("2017-01-01", periods=10, tz=tz)
expected = pd.DatetimeIndex(list(expected), freq=None)

# iadd with TimdeltaIndex
result = DatetimeIndex([Timestamp("2017-01-01", tz=tz)] * 10)
Expand All @@ -2098,6 +2100,7 @@ def test_dti_sub_tdi(self, tz_naive_fixture):
dti = DatetimeIndex([Timestamp("2017-01-01", tz=tz)] * 10)
tdi = pd.timedelta_range("0 days", periods=10)
expected = pd.date_range("2017-01-01", periods=10, tz=tz, freq="-1D")
expected = pd.DatetimeIndex(list(expected), freq=None)

# sub with TimedeltaIndex
result = dti - tdi
Expand All @@ -2121,6 +2124,7 @@ def test_dti_isub_tdi(self, tz_naive_fixture):
dti = DatetimeIndex([Timestamp("2017-01-01", tz=tz)] * 10)
tdi = pd.timedelta_range("0 days", periods=10)
expected = pd.date_range("2017-01-01", periods=10, tz=tz, freq="-1D")
expected = pd.DatetimeIndex(list(expected), freq=None)

# isub with TimedeltaIndex
result = DatetimeIndex([Timestamp("2017-01-01", tz=tz)] * 10)
Expand Down
2 changes: 1 addition & 1 deletion pandas/tests/arithmetic/test_numeric.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ def test_numeric_arr_mul_tdscalar(self, scalar_td, numeric_idx, box):
# GH#19333
index = numeric_idx

expected = pd.timedelta_range("0 days", "4 days")
expected = pd.TimedeltaIndex([pd.Timedelta(days=n) for n in range(5)])

index = tm.box_expected(index, box)
expected = tm.box_expected(expected, box)
Expand Down
8 changes: 3 additions & 5 deletions pandas/tests/arithmetic/test_timedelta64.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,9 +403,7 @@ def _check(result, expected):
_check(result, expected)

result = dti_tz - td
expected = DatetimeIndex(
["20121231", "20130101", "20130102"], tz="US/Eastern", freq="D"
)
expected = DatetimeIndex(["20121231", "20130101", "20130102"], tz="US/Eastern")
tm.assert_index_equal(result, expected)

def test_dti_tdi_numeric_ops(self):
Expand Down Expand Up @@ -512,9 +510,9 @@ def test_timedelta(self, freq):
rng = pd.date_range("2013", "2014")
s = Series(rng)
result1 = rng - pd.offsets.Hour(1)
result2 = DatetimeIndex(s - np.timedelta64(100000000))
result2 = DatetimeIndex(s - np.timedelta64(100000000), freq=rng.freq)
result3 = rng - np.timedelta64(100000000)
result4 = DatetimeIndex(s - pd.offsets.Hour(1))
result4 = DatetimeIndex(s - pd.offsets.Hour(1), freq=rng.freq)
tm.assert_index_equal(result1, result4)
tm.assert_index_equal(result2, result3)

Expand Down
1 change: 1 addition & 0 deletions pandas/tests/test_multilevel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1505,6 +1505,7 @@ def test_set_index_datetime(self):
tz="US/Eastern",
)
idx3 = pd.date_range("2011-01-01 09:00", periods=6, tz="Asia/Tokyo")
idx3 = pd.DatetimeIndex(list(idx3), freq=None)

df = df.set_index(idx1)
df = df.set_index(idx2, append=True)
Expand Down