Skip to content

Commit 21de024

Browse files
committed
update tests
1 parent a4a9d37 commit 21de024

File tree

11 files changed

+41
-40
lines changed

11 files changed

+41
-40
lines changed

pandas/tests/arithmetic/test_datetime64.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -905,7 +905,7 @@ def test_dt64arr_add_sub_td64_nat(self, box_with_array, tz_naive_fixture):
905905

906906
dti = date_range("1994-04-01", periods=9, tz=tz, freq="QS")
907907
other = np.timedelta64("NaT")
908-
expected = DatetimeIndex(["NaT"] * 9, tz=tz)
908+
expected = DatetimeIndex(["NaT"] * 9, tz=tz).as_unit("ns")
909909

910910
obj = tm.box_expected(dti, box_with_array)
911911
expected = tm.box_expected(expected, box_with_array)

pandas/tests/arithmetic/test_timedelta64.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1039,7 +1039,7 @@ def test_td64arr_add_datetime64_nat(self, box_with_array):
10391039
other = np.datetime64("NaT")
10401040

10411041
tdi = timedelta_range("1 day", periods=3)
1042-
expected = DatetimeIndex(["NaT", "NaT", "NaT"])
1042+
expected = DatetimeIndex(["NaT", "NaT", "NaT"], dtype="M8[ns]")
10431043

10441044
tdser = tm.box_expected(tdi, box_with_array)
10451045
expected = tm.box_expected(expected, box_with_array)

pandas/tests/io/excel/test_readers.py

+5-4
Original file line numberDiff line numberDiff line change
@@ -1125,17 +1125,18 @@ def test_read_excel_multiindex_blank_after_name(
11251125

11261126
expected = DataFrame(
11271127
[
1128-
[1, 2.5, pd.Timestamp("2015-01-01").as_unit(unit), True],
1129-
[2, 3.5, pd.Timestamp("2015-01-02").as_unit(unit), False],
1130-
[3, 4.5, pd.Timestamp("2015-01-03").as_unit(unit), False],
1131-
[4, 5.5, pd.Timestamp("2015-01-04").as_unit(unit), True],
1128+
[1, 2.5, pd.Timestamp("2015-01-01"), True],
1129+
[2, 3.5, pd.Timestamp("2015-01-02"), False],
1130+
[3, 4.5, pd.Timestamp("2015-01-03"), False],
1131+
[4, 5.5, pd.Timestamp("2015-01-04"), True],
11321132
],
11331133
columns=mi,
11341134
index=MultiIndex.from_arrays(
11351135
(["foo", "foo", "bar", "bar"], idx_lvl2),
11361136
names=["ilvl1", "ilvl2"],
11371137
),
11381138
)
1139+
expected[mi[2]] = expected[mi[2]].astype(f"M8[{unit}]")
11391140
result = pd.read_excel(
11401141
mi_file,
11411142
sheet_name=sheet_name,

pandas/tests/io/parser/common/test_common_basic.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,9 @@ def test_read_csv_local(all_parsers, csv1):
112112
datetime(2000, 1, 10),
113113
datetime(2000, 1, 11),
114114
],
115+
dtype="M8[s]",
115116
name="index",
116-
).as_unit("s"),
117+
),
117118
)
118119
tm.assert_frame_equal(result, expected)
119120

@@ -213,8 +214,9 @@ def test_read_csv_dataframe(all_parsers, csv1):
213214
datetime(2000, 1, 10),
214215
datetime(2000, 1, 11),
215216
],
217+
dtype="M8[s]",
216218
name="index",
217-
).as_unit("s"),
219+
),
218220
)
219221
tm.assert_frame_equal(result, expected)
220222

pandas/tests/io/parser/common/test_index.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -258,10 +258,10 @@ def test_read_csv_no_index_name(all_parsers, csv_dir_path):
258258
datetime(2000, 1, 5),
259259
datetime(2000, 1, 6),
260260
datetime(2000, 1, 7),
261-
]
261+
],
262+
dtype="M8[s]",
262263
),
263264
)
264-
expected.index = expected.index.as_unit("s")
265265
tm.assert_frame_equal(result, expected)
266266

267267

pandas/tests/io/parser/test_parse_dates.py

+12-17
Original file line numberDiff line numberDiff line change
@@ -469,8 +469,9 @@ def test_date_col_as_index_col(all_parsers):
469469
datetime(1999, 1, 27, 21, 0),
470470
datetime(1999, 1, 27, 22, 0),
471471
],
472+
dtype="M8[s]",
472473
name="X1",
473-
).as_unit("s")
474+
)
474475
expected = DataFrame(
475476
[
476477
["KORD", " 18:56:00", 0.81, 2.81, 7.2, 0.0, 280.0],
@@ -738,8 +739,8 @@ def test_date_parser_int_bug(all_parsers):
738739
),
739740
raise_on_extra_warnings=False,
740741
)
741-
dti = Index([Timestamp("2012-07-24 04:12:30")], name="posix_timestamp").as_unit(
742-
"us"
742+
dti = Index(
743+
[Timestamp("2012-07-24 04:12:30")], dtype="M8[us]", name="posix_timestamp"
743744
)
744745
expected = DataFrame(
745746
[
@@ -842,9 +843,7 @@ def test_parse_dates_string(all_parsers):
842843
parser = all_parsers
843844
result = parser.read_csv(StringIO(data), index_col="date", parse_dates=["date"])
844845
# freq doesn't round-trip
845-
index = DatetimeIndex(
846-
list(date_range("1/1/2009", periods=3)), name="date", freq=None
847-
).as_unit("s")
846+
index = date_range("1/1/2009", periods=3, name="date", unit="s")._with_freq(None)
848847

849848
expected = DataFrame(
850849
{"A": ["a", "b", "c"], "B": [1, 3, 4], "C": [2, 4, 5]}, index=index
@@ -1769,17 +1768,13 @@ def test_parse_timezone(all_parsers):
17691768
2018-01-04 09:05:00+09:00,23400"""
17701769
result = parser.read_csv(StringIO(data), parse_dates=["dt"])
17711770

1772-
dti = DatetimeIndex(
1773-
list(
1774-
date_range(
1775-
start="2018-01-04 09:01:00",
1776-
end="2018-01-04 09:05:00",
1777-
freq="1min",
1778-
tz=timezone(timedelta(minutes=540)),
1779-
)
1780-
),
1781-
freq=None,
1782-
).as_unit("s")
1771+
dti = date_range(
1772+
start="2018-01-04 09:01:00",
1773+
end="2018-01-04 09:05:00",
1774+
freq="1min",
1775+
tz=timezone(timedelta(minutes=540)),
1776+
unit="s",
1777+
)._with_freq(None)
17831778
expected_data = {"dt": dti, "val": [23350, 23400, 23400, 23400, 23400]}
17841779

17851780
expected = DataFrame(expected_data)

pandas/tests/io/parser/test_read_fwf.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -310,8 +310,9 @@ def test_fwf_regression():
310310
"2009-06-13 20:40:00",
311311
"2009-06-13 20:50:00",
312312
"2009-06-13 21:00:00",
313-
]
314-
).as_unit("us"),
313+
],
314+
dtype="M8[us]",
315+
),
315316
columns=["SST", "T010", "T020", "T030", "T060", "T080", "T100"],
316317
)
317318
tm.assert_frame_equal(result, expected)

pandas/tests/io/parser/test_skiprows.py

+8-4
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,10 @@ def test_skip_rows_bug(all_parsers, skiprows):
4242
StringIO(text), skiprows=skiprows, header=None, index_col=0, parse_dates=True
4343
)
4444
index = Index(
45-
[datetime(2000, 1, 1), datetime(2000, 1, 2), datetime(2000, 1, 3)], name=0
46-
).as_unit("s")
45+
[datetime(2000, 1, 1), datetime(2000, 1, 2), datetime(2000, 1, 3)],
46+
dtype="M8[s]",
47+
name=0,
48+
)
4749

4850
expected = DataFrame(
4951
np.arange(1.0, 10.0).reshape((3, 3)), columns=[1, 2, 3], index=index
@@ -85,8 +87,10 @@ def test_skip_rows_blank(all_parsers):
8587
StringIO(text), skiprows=6, header=None, index_col=0, parse_dates=True
8688
)
8789
index = Index(
88-
[datetime(2000, 1, 1), datetime(2000, 1, 2), datetime(2000, 1, 3)], name=0
89-
).as_unit("s")
90+
[datetime(2000, 1, 1), datetime(2000, 1, 2), datetime(2000, 1, 3)],
91+
dtype="M8[s]",
92+
name=0,
93+
)
9094

9195
expected = DataFrame(
9296
np.arange(1.0, 10.0).reshape((3, 3)), columns=[1, 2, 3], index=index

pandas/tests/scalar/test_nat.py

+3-5
Original file line numberDiff line numberDiff line change
@@ -440,11 +440,9 @@ def test_nat_rfloordiv_timedelta(val, expected):
440440
@pytest.mark.parametrize(
441441
"value",
442442
[
443-
DatetimeIndex(["2011-01-01", "2011-01-02"], name="x").as_unit("ns"),
444-
DatetimeIndex(["2011-01-01", "2011-01-02"], tz="US/Eastern", name="x").as_unit(
445-
"ns"
446-
),
447-
DatetimeArray._from_sequence(["2011-01-01", "2011-01-02"]).as_unit("ns"),
443+
DatetimeIndex(["2011-01-01", "2011-01-02"], name="x"),
444+
DatetimeIndex(["2011-01-01", "2011-01-02"], tz="US/Eastern", name="x"),
445+
DatetimeArray._from_sequence(["2011-01-01", "2011-01-02"]),
448446
DatetimeArray._from_sequence(
449447
["2011-01-01", "2011-01-02"], dtype=DatetimeTZDtype(tz="US/Pacific")
450448
),

pandas/tests/series/accessors/test_dt_accessor.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ def test_dt_round_tz_nonexistent(self, method, ts_str, freq):
383383
tm.assert_series_equal(result, expected)
384384

385385
result = getattr(ser.dt, method)(freq, nonexistent="NaT")
386-
expected = Series([pd.NaT], dtype="M8[s]").dt.tz_localize(result.dt.tz)
386+
expected = Series([pd.NaT]).dt.tz_localize(result.dt.tz)
387387
tm.assert_series_equal(result, expected)
388388

389389
with pytest.raises(pytz.NonExistentTimeError, match="2018-03-11 02:00:00"):

pandas/tests/tseries/offsets/test_offsets.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,7 @@ def test_add_empty_datetimeindex(self, offset_types, tz_naive_fixture):
504504
# GH#12724, GH#30336
505505
offset_s = _create_offset(offset_types)
506506

507-
dti = DatetimeIndex([], tz=tz_naive_fixture)
507+
dti = DatetimeIndex([], tz=tz_naive_fixture).as_unit("ns")
508508

509509
warn = None
510510
if isinstance(

0 commit comments

Comments
 (0)