Skip to content

Commit bd875d3

Browse files
committed
Address more warnings
1 parent 891fd6e commit bd875d3

File tree

5 files changed

+18
-13
lines changed

5 files changed

+18
-13
lines changed

xarray/tests/test_backends.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -529,7 +529,7 @@ def test_roundtrip_string_encoded_characters(self) -> None:
529529
assert actual["x"].encoding["_Encoding"] == "ascii"
530530

531531
def test_roundtrip_numpy_datetime_data(self) -> None:
532-
times = pd.to_datetime(["2000-01-01", "2000-01-02", "NaT"])
532+
times = pd.to_datetime(["2000-01-01", "2000-01-02", "NaT"], unit="ns")
533533
expected = Dataset({"t": ("t", times), "t0": times[0]})
534534
kwargs = {"encoding": {"t0": {"units": "days since 1950-01-01"}}}
535535
with self.roundtrip(expected, save_kwargs=kwargs) as actual:

xarray/tests/test_dataarray.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3647,7 +3647,9 @@ def test_to_and_from_dict_with_time_dim(self) -> None:
36473647
t = pd.date_range("20130101", periods=10)
36483648
lat = [77.7, 83.2, 76]
36493649
da = DataArray(x, {"t": t, "lat": lat}, dims=["t", "lat"])
3650-
roundtripped = DataArray.from_dict(da.to_dict())
3650+
with warnings.catch_warnings():
3651+
warnings.filterwarnings("ignore", message="Converting non-nanosecond")
3652+
roundtripped = DataArray.from_dict(da.to_dict())
36513653
assert_identical(da, roundtripped)
36523654

36533655
def test_to_and_from_dict_with_nan_nat(self) -> None:
@@ -3657,7 +3659,9 @@ def test_to_and_from_dict_with_nan_nat(self) -> None:
36573659
t[2] = np.nan
36583660
lat = [77.7, 83.2, 76]
36593661
da = DataArray(y, {"t": t, "lat": lat}, dims=["t", "lat"])
3660-
roundtripped = DataArray.from_dict(da.to_dict())
3662+
with warnings.catch_warnings():
3663+
warnings.filterwarnings("ignore", message="Converting non-nanosecond")
3664+
roundtripped = DataArray.from_dict(da.to_dict())
36613665
assert_identical(da, roundtripped)
36623666

36633667
def test_to_dict_with_numpy_attrs(self) -> None:

xarray/tests/test_groupby.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,7 @@ def test_groupby_da_datetime() -> None:
139139
times = pd.date_range("2000-01-01", periods=4)
140140
foo = xr.DataArray([1, 2, 3, 4], coords=dict(time=times), dims="time")
141141
# create test index
142-
dd = times.to_pydatetime()
143-
reference_dates = [dd[0], dd[2]]
142+
reference_dates = [times[0], times[2]]
144143
labels = reference_dates[0:1] * 2 + reference_dates[1:2] * 2
145144
ind = xr.DataArray(
146145
labels, coords=dict(time=times), dims="time", name="reference_date"
@@ -1881,7 +1880,7 @@ def test_resample_first(self) -> None:
18811880
array = Dataset({"time": times})["time"]
18821881
actual = array.resample(time="1D").last()
18831882
expected_times = pd.to_datetime(
1884-
["2000-01-01T18", "2000-01-02T18", "2000-01-03T06"]
1883+
["2000-01-01T18", "2000-01-02T18", "2000-01-03T06"], unit="ns"
18851884
)
18861885
expected = DataArray(expected_times, [("time", times[::4])], name="time")
18871886
assert_identical(expected, actual)

xarray/tests/test_plot.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import math
66
from collections.abc import Generator, Hashable
77
from copy import copy
8-
from datetime import date, datetime, timedelta
8+
from datetime import date, timedelta
99
from typing import Any, Callable, Literal
1010

1111
import numpy as np
@@ -2912,9 +2912,8 @@ def setUp(self) -> None:
29122912
"""
29132913
month = np.arange(1, 13, 1)
29142914
data = np.sin(2 * np.pi * month / 12.0)
2915-
2916-
darray = DataArray(data, dims=["time"])
2917-
darray.coords["time"] = np.array([datetime(2017, m, 1) for m in month])
2915+
times = pd.date_range(start="2017-01-01", freq="ME", periods=12)
2916+
darray = DataArray(data, dims=["time"], coords=[times])
29182917

29192918
self.darray = darray
29202919

xarray/tests/test_variable.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
requires_bottleneck,
4141
requires_cupy,
4242
requires_dask,
43+
requires_pandas_3,
4344
requires_pint,
4445
requires_sparse,
4546
source_ndarray,
@@ -256,7 +257,9 @@ def test_index_and_concat_datetime(self):
256257
# regression test for #125
257258
date_range = pd.date_range("2011-09-01", periods=10)
258259
for dates in [date_range, date_range.values, date_range.to_pydatetime()]:
259-
expected = self.cls("t", dates)
260+
with warnings.catch_warnings():
261+
warnings.filterwarnings("ignore", message="Converting non-nanosecond")
262+
expected = self.cls("t", dates)
260263
for times in [
261264
[expected[i] for i in range(10)],
262265
[expected[i : (i + 1)] for i in range(10)],
@@ -2942,8 +2945,8 @@ def test_from_pint_wrapping_dask(self, Var):
29422945
(np.array([np.datetime64("2000-01-01", "ns")]), False),
29432946
(np.array([np.datetime64("2000-01-01", "s")]), True),
29442947
(pd.date_range("2000", periods=1), False),
2945-
(datetime(2000, 1, 1), False),
2946-
(np.array([datetime(2000, 1, 1)]), False),
2948+
pytest.param(datetime(2000, 1, 1), True, marks=requires_pandas_3),
2949+
pytest.param(np.array([datetime(2000, 1, 1)]), True, marks=requires_pandas_3),
29472950
(pd.date_range("2000", periods=1, tz=pytz.timezone("America/New_York")), False),
29482951
(
29492952
pd.Series(

0 commit comments

Comments
 (0)