Merge branch 'main' into bugfix-684-derived-variables-from-iterables

intake · Nov 1, 2024 · 5be5fff · 5be5fff
2 parents a794de7 + 9ac6120
commit 5be5fff
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/ci/environment-docs.yml b/ci/environment-docs.yml
@@ -4,11 +4,12 @@ channels:
   - nodefaults
 dependencies:
   - cftime
+  - dask[complete]>=2022.02.0
   - distributed
   - ecgtools >=2022.10.7
   - fsspec>=2023.05
   - gcsfs >=2023.05
-  - intake<2.0
+  - intake>=2.0
   - jupyterlab
   - matplotlib
   - myst-nb

diff --git a/ci/environment.yml b/ci/environment.yml
@@ -5,11 +5,12 @@ channels:
 dependencies:
   - cftime
   - codecov
+  - dask[complete]>=2022.02.0
   - fastprogress>=1.0.0
   - fsspec>=2022.11.0
   - gcsfs >=2022.11.0
   - h5netcdf>=0.8.1
-  - intake<2.0
+  - intake>=2.0
   - ipython
   - matplotlib
   - netcdf4>=1.5.5
@@ -26,7 +27,7 @@ dependencies:
   - pytest-mock
   - s3fs >=2022.11.0
   - scipy
-  - xarray>=2022.06
+  - xarray>=2022.06, !=2024.10
   - xarray-datatree
   - zarr>=2.12
   # - pytest-icdiff
diff --git a/requirements.txt b/requirements.txt
@@ -1,7 +1,7 @@
 dask[complete]>=2022.02.0
 fastprogress>=1.0.0
 fsspec>=2022.11.0
-intake>=0.6.6,<2
+intake>=2.0.0
 netCDF4>=1.5.5
 pandas>=2.1.0
 requests>=2.24.0