Skip to content

Commit 794f92c

Browse files
committed
Address errors due to pandas-dev/pandas#63146
1 parent 58594f8 commit 794f92c

File tree

3 files changed

+18
-8
lines changed

3 files changed

+18
-8
lines changed

xarray/tests/test_groupby.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3815,7 +3815,7 @@ def test_mean_with_cftime_objects_dask():
38153815

38163816
def test_groupby_bins_datetime_mean():
38173817
"""Test groupby_bins with datetime mean (issue #6995)"""
3818-
times = pd.date_range("2020-01-01", "2020-02-01", freq="1h")
3818+
times = pd.date_range("2020-01-01", "2020-02-01", freq="1h", unit="ns")
38193819
index = np.arange(len(times))
38203820
bins = np.arange(0, len(index), 5)
38213821

@@ -3836,7 +3836,10 @@ def test_groupby_bins_mean_time_series():
38363836
ds = xr.Dataset(
38373837
{
38383838
"measurement": ("trial", np.arange(0, 100, 10)),
3839-
"time": ("trial", pd.date_range("20240101T1500", "20240101T1501", 10)),
3839+
"time": (
3840+
"trial",
3841+
pd.date_range("20240101T1500", "20240101T1501", 10, unit="ns"),
3842+
),
38403843
}
38413844
)
38423845

xarray/tests/test_interp.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -721,7 +721,7 @@ def test_datetime(x_new, expected) -> None:
721721
da = xr.DataArray(
722722
np.arange(24),
723723
dims="time",
724-
coords={"time": pd.date_range("2000-01-01", periods=24)},
724+
coords={"time": pd.date_range("2000-01-01", periods=24, unit="ns")},
725725
)
726726

727727
actual = da.interp(time=x_new)
@@ -739,7 +739,7 @@ def test_datetime_single_string() -> None:
739739
da = xr.DataArray(
740740
np.arange(24),
741741
dims="time",
742-
coords={"time": pd.date_range("2000-01-01", periods=24)},
742+
coords={"time": pd.date_range("2000-01-01", periods=24, unit="ns")},
743743
)
744744
actual = da.interp(time="2000-01-01T12:00")
745745
expected = xr.DataArray(0.5)

xarray/tests/test_variable.py

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ def test_0d_time_data(self):
279279
expected = np.datetime64("2000-01-01", "ns")
280280
assert x[0].values == expected
281281

282-
dt64_data = pd.date_range("1970-01-01", periods=3)
282+
dt64_data = pd.date_range("1970-01-01", periods=3, unit="ns")
283283

284284
@pytest.mark.parametrize(
285285
"values, unit",
@@ -3158,7 +3158,7 @@ def test_from_pint_wrapping_dask(self, Var):
31583158
(np.datetime64("2000-01-01", "s"), "s"),
31593159
(np.array([np.datetime64("2000-01-01", "ns")]), "ns"),
31603160
(np.array([np.datetime64("2000-01-01", "s")]), "s"),
3161-
(pd.date_range("2000", periods=1), "ns"),
3161+
(pd.date_range("2000", periods=1, unit="ns"), "ns"),
31623162
(
31633163
datetime(2000, 1, 1),
31643164
"us" if has_pandas_3 else "ns",
@@ -3167,10 +3167,17 @@ def test_from_pint_wrapping_dask(self, Var):
31673167
np.array([datetime(2000, 1, 1)]),
31683168
"us" if has_pandas_3 else "ns",
31693169
),
3170-
(pd.date_range("2000", periods=1, tz=pytz.timezone("America/New_York")), "ns"),
3170+
(
3171+
pd.date_range(
3172+
"2000", periods=1, tz=pytz.timezone("America/New_York"), unit="ns"
3173+
),
3174+
"ns",
3175+
),
31713176
(
31723177
pd.Series(
3173-
pd.date_range("2000", periods=1, tz=pytz.timezone("America/New_York"))
3178+
pd.date_range(
3179+
"2000", periods=1, tz=pytz.timezone("America/New_York"), unit="ns"
3180+
)
31743181
),
31753182
"ns",
31763183
),

0 commit comments

Comments
 (0)