From 22c36c69dd070fdc7637f67ac8c9565a63765ad4 Mon Sep 17 00:00:00 2001
From: Charles Turner <52199577+charles-turner-1@users.noreply.github.com>
Date: Tue, 29 Oct 2024 05:55:56 +0800
Subject: [PATCH] Intake Take2 (#233)

* Rebased 153 onto 187

* gelaxed intake version on pyproject.toml to >0.7 (take2) & added tox environments for take2
---
 pyproject.toml |  2 +-
 tox.ini        | 55 +++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 55 insertions(+), 2 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 2bc6b75e..97964914 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -16,7 +16,7 @@ classifiers = [
 dependencies = [
     "cftime",
     "ecgtools>=2023.7.13",
-    "intake==0.7.0",
+    "intake>=0.7.0",
     "intake-dataframe-catalog>=0.2.4",
     "intake-esm>=2023.11.10",
     "jsonschema",
diff --git a/tox.ini b/tox.ini
index 2e8cdd98..8fc25653 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,6 +2,8 @@
 env_list =
     py{310,311}-main,
     py{310,311}-coords,
+    py{310,311}-take2,
+    py{310,311}-take2coords
 
 minversion = 4.23.0
 
@@ -27,7 +29,8 @@ commands =
 setenv =
     XFAILS=1
     ; We expect correctness checks to fail here because coordinate discovery isn't 
-    ; enabled in the main branch of intake-esm. This enables xfail marks in conftest.py.
+    ; enabled in the main branch of intake-esm. This toggles on xfail marks in
+    ; conftest.py.  
 
 [testenv:coordsenabled]
 setenv =
@@ -51,6 +54,22 @@ deps =
     git+https://github.com/ACCESS-NRI/intake-dataframe-catalog.git@main#egg=intake_dataframe_catalog
     intake==0.7.0
 
+[testenv:base-take2]
+description = Pin the intake version to 0.7.0, run pytest
+deps =
+    {[testenv]deps}
+    git+https://github.com/ACCESS-NRI/intake-dataframe-catalog.git@take2#egg=intake_dataframe_catalog
+    intake>=2.0.0
+
+
+[testenv:base-take2coords]
+description = Use the ACCESS-NRI fork of intake-esm, branch issue_660-coords
+deps = 
+    {[testenv]deps}
+    git+https://github.com/ACCESS-NRI/intake-esm.git@take2-coords#egg=intake-esm
+    git+https://github.com/ACCESS-NRI/intake-dataframe-catalog.git@take2#egg=intake_dataframe_catalog
+    intake>=2.0.0
+
 [testenv:py39-main]
 basepython = python3.9
 deps = {[testenv:base-main]deps}
@@ -87,4 +106,38 @@ deps = {[testenv:base-coords]deps}
 setenv = {[testenv:coordsenabled]setenv}
 commands = {[testenv]commands}   
 
+[testenv:py39-take2]
+basepython = python3.9
+deps = {[testenv:base-take2]deps}
+setenv = {[testenv:coordsdisabled]setenv}
+commands = {[testenv]commands}   
+
+[testenv:py310-take2]
+basepython = python3.10
+deps = {[testenv:base-take2]deps}
+setenv = {[testenv:coordsdisabled]setenv}
+commands = {[testenv]commands}   
 
+[testenv:py311-take2]
+basepython = python3.11
+deps = {[testenv:base-take2]deps}
+setenv = {[testenv:coordsdisabled]setenv}
+commands = {[testenv]commands}   
+
+[testenv:py39-take2coords]
+basepython = python3.9
+deps = {[testenv:base-take2coords]deps}
+setenv = {[testenv:coordsenabled]setenv}
+commands = {[testenv]commands}   
+
+[testenv:py310-take2coords]
+basepython = python3.10
+deps = {[testenv:base-take2coords]deps}
+setenv = {[testenv:coordsenabled]setenv}
+commands = {[testenv]commands}   
+
+[testenv:py311-take2coords]
+basepython = python3.11
+deps = {[testenv:base-take2coords]deps}
+setenv = {[testenv:coordsenabled]setenv}
+commands = {[testenv]commands}