Merge branch 'main' into update-readthedocs-config

ci/environment-docs.yml

@@ -4,11 +4,11 @@ channels:
   - nodefaults
 dependencies:
   - cftime
-  - dask[complete]>=2022.02.0
+  - dask>=2024.12
   - distributed
   - ecgtools >=2022.10.7
-  - fsspec>=2023.05
-  - gcsfs >=2023.05
+  - fsspec>=2024.12
+  - gcsfs >=2024.12
   - intake>=2.0
   - jupyterlab
   - matplotlib
@@ -19,13 +19,13 @@ dependencies:
   - pydantic>=2.0
   - python-graphviz
   - python=3.11
-  - s3fs >=2023.05
+  - s3fs >=2024.12
   - sphinx<6.0
   - sphinx-copybutton
   - sphinx-design
   - watermark
   - xarray-datatree>=0.0.9
-  - xarray>=2023.05
+  - xarray>=2024.10
   - zarr>=2.12
   - furo>=2022.09.15
   - pip:

ci/environment-upstream-dev.yml

@@ -6,9 +6,9 @@ dependencies:
   - cartopy
   - cftime
   - codecov
-  - dask>=2022.02.0
+  - dask>=2024.12
   - fastprogress>=1.0.0
-  - gcsfs >=2022.11.0
+  - gcsfs >=2024.12
   - h5netcdf>=0.8.1
   - ipython
   - matplotlib
@@ -28,7 +28,7 @@ dependencies:
   - pytest-sugar
   - pytest-xdist
   - regionmask
-  - s3fs >=2022.11.0
+  - s3fs >=2024.12
   - scipy
   - xarray-datatree
   - xgcm

ci/environment.yml

@@ -5,10 +5,10 @@ channels:
 dependencies:
   - cftime
   - codecov
-  - dask[complete]>=2022.02.0
+  - dask>=2024.12
   - fastprogress>=1.0.0
-  - fsspec>=2022.11.0
-  - gcsfs >=2022.11.0
+  - fsspec>=2024.12
+  - gcsfs >=2024.12
   - h5netcdf>=0.8.1
   - intake>=2.0
   - ipython
@@ -25,9 +25,9 @@ dependencies:
   - pytest-sugar
   - pytest-xdist
   - pytest-mock
-  - s3fs >=2022.11.0
+  - s3fs >=2024.12
   - scipy
-  - xarray>=2022.06, !=2024.10
+  - xarray>=2024.10
   - xarray-datatree
   - zarr>=2.12
   # - pytest-icdiff

intake_esm/core.py

@@ -5,16 +5,19 @@
 from copy import deepcopy
 
 import dask
+import packaging.version
+import xarray as xr
 
 try:
-    from datatree import DataTree
-
+    if packaging.version.Version(xr.__version__) < packaging.version.Version('2024.10'):
+        from datatree import DataTree
+    else:
+        from xarray import DataTree
     _DATATREE_AVAILABLE = True
 except ImportError:
     _DATATREE_AVAILABLE = False
 import pandas as pd
 import pydantic
-import xarray as xr
 from fastprogress.fastprogress import progress_bar
 from intake.catalog import Catalog
 
@@ -81,9 +84,9 @@ def __init__(
         progressbar: bool = True,
         sep: str = '.',
         registry: DerivedVariableRegistry | None = None,
-        read_csv_kwargs: dict[str, typing.Any] = None,
-        columns_with_iterables: list[str] = None,
-        storage_options: dict[str, typing.Any] = None,
+        read_csv_kwargs: dict[str, typing.Any] | None = None,
+        columns_with_iterables: list[str] | None = None,
+        storage_options: dict[str, typing.Any] | None = None,
         **intake_kwargs: dict[str, typing.Any],
     ):
         """Intake Catalog representing an ESM Collection."""

requirements.txt

@@ -1,10 +1,10 @@
-dask[complete]>=2022.02.0
+dask[complete]>=2024.12
 fastprogress>=1.0.0
-fsspec>=2022.11.0
+fsspec>=2024.12
 intake>=2.0.0
 netCDF4>=1.5.5
 pandas>=2.1.0
 requests>=2.24.0
-xarray>=2022.06
+xarray>=2024.10
 zarr>=2.12
 pydantic>=2.0

tests/test_core.py

@@ -2,11 +2,16 @@
 import os
 
 import intake
+import packaging.version
 import pandas as pd
 import pydantic
 import pytest
 import xarray as xr
-from datatree import DataTree
+
+if packaging.version.Version(xr.__version__) < packaging.version.Version('2024.10'):
+    from datatree import DataTree
+else:
+    from xarray import DataTree
 
 import intake_esm