From 9ac612054cda6d694b4a18b6f83c3b9386d22590 Mon Sep 17 00:00:00 2001
From: Charles Turner <52199577+charles-turner-1@users.noreply.github.com>
Date: Fri, 1 Nov 2024 14:15:33 +0800
Subject: [PATCH] Take2 (#683)

* Updated intake version dependency in ci/environment.yml & requirements.txt

* Update intake version to >=2.0, xarray !=2024.10 (datatree issues)

* Added explicit dask requirement to environment
---
 ci/environment-docs.yml | 3 ++-
 ci/environment.yml      | 5 +++--
 requirements.txt        | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ci/environment-docs.yml b/ci/environment-docs.yml
index 45ff4326..4072fd47 100644
--- 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
index 2f0b192b..95808f00 100644
--- 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
index d321c1aa..7de0800d 100644
--- 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