Skip to content

Commit 5347c87

Browse files
committed
update tests
1 parent 61f869b commit 5347c87

File tree

3 files changed

+10
-14
lines changed

3 files changed

+10
-14
lines changed

pandas/tests/frame/methods/test_reset_index.py

+9-11
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,7 @@ def test_reset_index_tz(self, tz_aware_fixture):
7171
# GH 3950
7272
# reset_index with single level
7373
tz = tz_aware_fixture
74-
idx = date_range("1/1/2011", periods=5, freq="D", tz=tz, name="idx").as_unit(
75-
"us"
76-
)
74+
idx = date_range("1/1/2011", periods=5, freq="D", tz=tz, name="idx")
7775
df = DataFrame({"a": range(5), "b": ["A", "B", "C", "D", "E"]}, index=idx)
7876

7977
expected = DataFrame(
@@ -480,12 +478,9 @@ def test_reset_index_allow_duplicates_check(self, multiindex_df, allow_duplicate
480478
def test_reset_index_datetime(self, tz_naive_fixture):
481479
# GH#3950
482480
tz = tz_naive_fixture
483-
idx1 = date_range(
484-
"1/1/2011", periods=5, freq="D", tz=tz, name="idx1", unit="us"
485-
)
481+
idx1 = date_range("1/1/2011", periods=5, freq="D", tz=tz, name="idx1")
486482
idx2 = Index(range(5), name="idx2", dtype="int64")
487483
idx = MultiIndex.from_arrays([idx1, idx2])
488-
assert idx.levels[0].unit == "us"
489484
df = DataFrame(
490485
{"a": np.arange(5, dtype="int64"), "b": ["A", "B", "C", "D", "E"]},
491486
index=idx,
@@ -508,7 +503,7 @@ def test_reset_index_datetime2(self, tz_naive_fixture):
508503
idx1 = date_range("1/1/2011", periods=5, freq="D", tz=tz, name="idx1")
509504
idx2 = Index(range(5), name="idx2", dtype="int64")
510505
idx3 = date_range(
511-
"1/1/2012", periods=5, freq="MS", tz="Europe/Paris", name="idx3", unit="us"
506+
"1/1/2012", periods=5, freq="MS", tz="Europe/Paris", name="idx3"
512507
)
513508
idx = MultiIndex.from_arrays([idx1, idx2, idx3])
514509
df = DataFrame(
@@ -532,7 +527,7 @@ def test_reset_index_datetime2(self, tz_naive_fixture):
532527
def test_reset_index_datetime3(self, tz_naive_fixture):
533528
# GH#7793
534529
tz = tz_naive_fixture
535-
dti = date_range("20130101", periods=3, tz=tz, unit="us")
530+
dti = date_range("20130101", periods=3, tz=tz)
536531
idx = MultiIndex.from_product([["a", "b"], dti])
537532
df = DataFrame(
538533
np.arange(6, dtype="int64").reshape(6, 1), columns=["a"], index=idx
@@ -700,13 +695,16 @@ def test_reset_index_empty_frame_with_datetime64_multiindex_from_groupby():
700695
def test_reset_index_multiindex_nat():
701696
# GH 11479
702697
idx = range(3)
703-
tstamp = date_range("2015-07-01", freq="D", periods=3, unit="s")
698+
tstamp = date_range("2015-07-01", freq="D", periods=3)
704699
df = DataFrame({"id": idx, "tstamp": tstamp, "a": list("abc")})
705700
df.loc[2, "tstamp"] = pd.NaT
706701
result = df.set_index(["id", "tstamp"]).reset_index("id")
702+
dti = pd.DatetimeIndex(
703+
["2015-07-01", "2015-07-02", "NaT"], dtype="M8[ns]", name="tstamp"
704+
)
707705
expected = DataFrame(
708706
{"id": range(3), "a": list("abc")},
709-
index=pd.DatetimeIndex(["2015-07-01", "2015-07-02", "NaT"], name="tstamp"),
707+
index=dti,
710708
)
711709
tm.assert_frame_equal(result, expected)
712710

pandas/tests/indexing/test_coercion.py

-2
Original file line numberDiff line numberDiff line change
@@ -918,8 +918,6 @@ def test_replace_series_datetime_datetime(self, how, to_key, from_key, replacer)
918918
exp = exp.astype(obj.dtype)
919919
warn = None
920920
else:
921-
# exp = exp.dt.as_unit("ns")
922-
# assert exp.dtype == to_key
923921
if to_key == from_key:
924922
warn = None
925923
exp = exp.dt.as_unit("ns")

pandas/tests/tools/test_to_datetime.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -635,7 +635,7 @@ def test_to_datetime_mixed_date_and_string(self, format):
635635
# https://github.com/pandas-dev/pandas/issues/50108
636636
d1 = date(2020, 1, 2)
637637
res = to_datetime(["2020-01-01", d1], format=format)
638-
expected = DatetimeIndex(["2020-01-01", "2020-01-02"], dtype="M8[ns]")
638+
expected = DatetimeIndex(["2020-01-01", "2020-01-02"], dtype="M8[s]")
639639
tm.assert_index_equal(res, expected)
640640

641641
@pytest.mark.parametrize(

0 commit comments

Comments
 (0)