From 8ce9d0a918f54ef9ca13fec18df733a3a9da4e6f Mon Sep 17 00:00:00 2001
From: Deepak Cherian <deepak@cherian.net>
Date: Tue, 18 Mar 2025 09:33:18 -0600
Subject: [PATCH 1/3] Fix imports again

---
 cf_xarray/accessor.py | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/cf_xarray/accessor.py b/cf_xarray/accessor.py
index 91146fec..b9839ff0 100644
--- a/cf_xarray/accessor.py
+++ b/cf_xarray/accessor.py
@@ -26,8 +26,17 @@
 from xarray import DataArray, Dataset
 from xarray.core.groupby import GroupBy
 from xarray.core.resample import Resample
-from xarray.core.rolling import Coarsen, Rolling
-from xarray.core.weighted import Weighted
+
+try:
+    from xarray.core.rolling import Coarsen, Rolling
+except ImportError:
+    from xarray.computation.rolling import Coarsen, Rolling
+
+try:
+    from xarray.core.weighted import Weighted
+except ImportError:
+    from xarray.computation.weighted import Weighted
+
 
 from . import parametric, sgrid
 from .criteria import (

From 4be743c4b39d08e49a00fb0607a2f2d92ef8f574 Mon Sep 17 00:00:00 2001
From: Deepak Cherian <deepak@cherian.net>
Date: Tue, 18 Mar 2025 09:37:06 -0600
Subject: [PATCH 2/3] try again

---
 cf_xarray/accessor.py | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/cf_xarray/accessor.py b/cf_xarray/accessor.py
index b9839ff0..7c19725b 100644
--- a/cf_xarray/accessor.py
+++ b/cf_xarray/accessor.py
@@ -28,14 +28,22 @@
 from xarray.core.resample import Resample
 
 try:
-    from xarray.core.rolling import Coarsen, Rolling
+    from xarray.core.rolling import (  # type:ignore[import-not-found,no-redef]
+        Coarsen,
+        Rolling,
+    )
 except ImportError:
-    from xarray.computation.rolling import Coarsen, Rolling
+    from xarray.computation.rolling import (  # type:ignore[import-not-found,no-redef]
+        Coarsen,
+        Rolling,
+    )
 
 try:
-    from xarray.core.weighted import Weighted
+    from xarray.core.weighted import Weighted  # type:ignore[import-not-found,no-redef]
 except ImportError:
-    from xarray.computation.weighted import Weighted
+    from xarray.computation.weighted import (
+        Weighted,  # type:ignore[import-not-found,no-redef]
+    )
 
 
 from . import parametric, sgrid

From dcbd3689e9dbefc8d4f177ee08e6590b70dd77dc Mon Sep 17 00:00:00 2001
From: Deepak Cherian <deepak@cherian.net>
Date: Tue, 18 Mar 2025 09:49:54 -0600
Subject: [PATCH 3/3] yet agaoin

---
 cf_xarray/accessor.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/cf_xarray/accessor.py b/cf_xarray/accessor.py
index 7c19725b..2a370890 100644
--- a/cf_xarray/accessor.py
+++ b/cf_xarray/accessor.py
@@ -28,21 +28,23 @@
 from xarray.core.resample import Resample
 
 try:
-    from xarray.core.rolling import (  # type:ignore[import-not-found,no-redef]
+    from xarray.core.rolling import (  # type:ignore[import-not-found,no-redef,unused-ignore]
         Coarsen,
         Rolling,
     )
 except ImportError:
-    from xarray.computation.rolling import (  # type:ignore[import-not-found,no-redef]
+    from xarray.computation.rolling import (  # type:ignore[import-not-found,no-redef,unused-ignore]
         Coarsen,
         Rolling,
     )
 
 try:
-    from xarray.core.weighted import Weighted  # type:ignore[import-not-found,no-redef]
+    from xarray.core.weighted import (
+        Weighted,  # type:ignore[import-not-found,no-redef,unused-ignore]
+    )
 except ImportError:
-    from xarray.computation.weighted import (
-        Weighted,  # type:ignore[import-not-found,no-redef]
+    from xarray.computation.weighted import (  # type:ignore[import-not-found,no-redef,unused-ignore]
+        Weighted,
     )