Skip to content

Commit fb101b0

Browse files
committed
Address errors due to pandas-dev/pandas#63196
1 parent ec384b4 commit fb101b0

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

xarray/tests/test_coding_times.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -599,7 +599,7 @@ def test_cf_timedelta(timedeltas, units, numbers) -> None:
599599
if timedeltas == "NaT":
600600
timedeltas = np.timedelta64("NaT", "ns")
601601
else:
602-
timedeltas = pd.to_timedelta(timedeltas).to_numpy()
602+
timedeltas = pd.to_timedelta(timedeltas).as_unit("ns").to_numpy()
603603
numbers = np.array(numbers)
604604

605605
expected = numbers
@@ -623,7 +623,8 @@ def test_cf_timedelta_2d() -> None:
623623
units = "days"
624624
numbers = np.atleast_2d([1, 2, 3])
625625

626-
timedeltas = np.atleast_2d(pd.to_timedelta(["1D", "2D", "3D"]).to_numpy())
626+
timedeltas = pd.to_timedelta(["1D", "2D", "3D"]).as_unit("ns")
627+
timedeltas = np.atleast_2d(timedeltas.to_numpy())
627628
expected = timedeltas
628629

629630
actual = decode_cf_timedelta(numbers, units)

xarray/tests/test_plot.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2897,7 +2897,7 @@ def test_datetime_hue(self) -> None:
28972897
ds2["hue"] = pd.date_range("2000-1-1", periods=4)
28982898
ds2.plot.scatter(x="A", y="B", hue="hue")
28992899

2900-
ds2["hue"] = pd.timedelta_range("-1D", periods=4, freq="D")
2900+
ds2["hue"] = pd.timedelta_range("-1D", periods=4, freq="D", unit="ns")
29012901
ds2.plot.scatter(x="A", y="B", hue="hue")
29022902

29032903
def test_facetgrid_hue_style(self) -> None:

xarray/tests/test_variable.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1114,7 +1114,7 @@ def test_datetime64_conversion_scalar(self, values, unit):
11141114
(np.timedelta64(1, "m"), "s"),
11151115
(np.timedelta64(1, "D"), "s"),
11161116
(np.timedelta64(1001, "ps"), "ns"),
1117-
(pd.Timedelta("1 day"), "ns"),
1117+
(pd.Timedelta("1 day").as_unit("ns"), "ns"),
11181118
(timedelta(days=1), "us" if has_pandas_3 else "ns"),
11191119
],
11201120
)
@@ -1140,7 +1140,8 @@ def test_0d_datetime(self):
11401140
assert v.values == np.datetime64("2000-01-01", expected_unit) # type: ignore[call-overload]
11411141

11421142
@pytest.mark.parametrize(
1143-
"values, unit", [(pd.to_timedelta("1s"), "ns"), (np.timedelta64(1, "s"), "s")]
1143+
"values, unit",
1144+
[(pd.to_timedelta("1s").as_unit("ns"), "ns"), (np.timedelta64(1, "s"), "s")],
11441145
)
11451146
def test_0d_timedelta(self, values, unit):
11461147
# todo: check, if this test is OK

0 commit comments

Comments
 (0)