Skip to content

Commit dc80226

Browse files
authored
Fix imports again (#565)
* Fix imports again * try again * yet agaoin
1 parent cb5e888 commit dc80226

File tree

1 file changed

+21
-2
lines changed

1 file changed

+21
-2
lines changed

cf_xarray/accessor.py

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,27 @@
2626
from xarray import DataArray, Dataset
2727
from xarray.core.groupby import GroupBy
2828
from xarray.core.resample import Resample
29-
from xarray.core.rolling import Coarsen, Rolling
30-
from xarray.core.weighted import Weighted
29+
30+
try:
31+
from xarray.core.rolling import ( # type:ignore[import-not-found,no-redef,unused-ignore]
32+
Coarsen,
33+
Rolling,
34+
)
35+
except ImportError:
36+
from xarray.computation.rolling import ( # type:ignore[import-not-found,no-redef,unused-ignore]
37+
Coarsen,
38+
Rolling,
39+
)
40+
41+
try:
42+
from xarray.core.weighted import (
43+
Weighted, # type:ignore[import-not-found,no-redef,unused-ignore]
44+
)
45+
except ImportError:
46+
from xarray.computation.weighted import ( # type:ignore[import-not-found,no-redef,unused-ignore]
47+
Weighted,
48+
)
49+
3150

3251
from . import parametric, sgrid
3352
from .criteria import (

0 commit comments

Comments
 (0)