From 9920043f0015f5458a0d0b88e73634c909001d92 Mon Sep 17 00:00:00 2001
From: "Ian L." <6273252+ilaflott@users.noreply.github.com>
Date: Wed, 20 May 2026 10:13:18 -0400
Subject: [PATCH 1/5] Update environment.yml

---
 environment.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/environment.yml b/environment.yml
index 8374bfd57..5c755c981 100644
--- a/environment.yml
+++ b/environment.yml
@@ -11,7 +11,7 @@ dependencies:
   - conda-forge::cdo>=2
   - conda-forge::cftime
   - conda-forge::click>=8.2
-  - conda-forge::cmor>=3.14
+  - conda-forge::cmor>=3.14.2
   - conda-forge::cylc-flow>=8.2
   - conda-forge::cylc-rose
   - conda-forge::jinja2>=3

From e5943b8de0703f04cc4147f82210309281da29cf Mon Sep 17 00:00:00 2001
From: "Ian L." <6273252+ilaflott@users.noreply.github.com>
Date: Wed, 20 May 2026 11:12:21 -0400
Subject: [PATCH 2/5] Update environment.yml

turn off packages that i know conflict to double-check that the incompatibility is what i think it is. specifically, these are cdo/python-cdo, and/or nccmp
---
 environment.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/environment.yml b/environment.yml
index 5c755c981..80a4f739a 100644
--- a/environment.yml
+++ b/environment.yml
@@ -8,7 +8,7 @@ dependencies:
   - noaa-gfdl::analysis_scripts==0.0.1
   - noaa-gfdl::catalogbuilder==2025.01.01
 #  - noaa-gfdl::fre-nctools==2022.02.01
-  - conda-forge::cdo>=2
+#  - conda-forge::cdo>=2
   - conda-forge::cftime
   - conda-forge::click>=8.2
   - conda-forge::cmor>=3.14.2
@@ -17,13 +17,13 @@ dependencies:
   - conda-forge::jinja2>=3
   - conda-forge::jsonschema
   - conda-forge::metomi-rose
-  - conda-forge::nccmp
+#  - conda-forge::nccmp
 #  - conda-forge::numpy==1.26.4
   - conda-forge::numpy>=2
   - conda-forge::pytest
   - conda-forge::pytest-cov
   - conda-forge::pylint
-  - conda-forge::python-cdo
+#  - conda-forge::python-cdo
   - conda-forge::pyyaml
   - conda-forge::xarray>=2024.*
   - conda-forge::netcdf4>=1.7.*

From d93391a21d3a0d68e2b849d4b2ab5ecf6c769f5d Mon Sep 17 00:00:00 2001
From: "Ian L." <6273252+ilaflott@users.noreply.github.com>
Date: Wed, 20 May 2026 11:28:28 -0400
Subject: [PATCH 3/5] `cmor>=3.14.2`+`nccmp`, but no `cdo`/`python-cdo`

---
 environment.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/environment.yml b/environment.yml
index 80a4f739a..ab428d016 100644
--- a/environment.yml
+++ b/environment.yml
@@ -17,7 +17,7 @@ dependencies:
   - conda-forge::jinja2>=3
   - conda-forge::jsonschema
   - conda-forge::metomi-rose
-#  - conda-forge::nccmp
+  - conda-forge::nccmp
 #  - conda-forge::numpy==1.26.4
   - conda-forge::numpy>=2
   - conda-forge::pytest

From f4fba5840d8c26354df03bababeebe11435cd710 Mon Sep 17 00:00:00 2001
From: "Ian L." <6273252+ilaflott@users.noreply.github.com>
Date: Wed, 20 May 2026 13:14:22 -0400
Subject: [PATCH 4/5] Update environment.yml

`cmor>=3.14.2`+`cdo`/`python-cdo`, but no `nccmp`
---
 environment.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/environment.yml b/environment.yml
index ab428d016..3797e1694 100644
--- a/environment.yml
+++ b/environment.yml
@@ -8,7 +8,7 @@ dependencies:
   - noaa-gfdl::analysis_scripts==0.0.1
   - noaa-gfdl::catalogbuilder==2025.01.01
 #  - noaa-gfdl::fre-nctools==2022.02.01
-#  - conda-forge::cdo>=2
+  - conda-forge::cdo>=2
   - conda-forge::cftime
   - conda-forge::click>=8.2
   - conda-forge::cmor>=3.14.2
@@ -17,13 +17,13 @@ dependencies:
   - conda-forge::jinja2>=3
   - conda-forge::jsonschema
   - conda-forge::metomi-rose
-  - conda-forge::nccmp
+#  - conda-forge::nccmp
 #  - conda-forge::numpy==1.26.4
   - conda-forge::numpy>=2
   - conda-forge::pytest
   - conda-forge::pytest-cov
   - conda-forge::pylint
-#  - conda-forge::python-cdo
+  - conda-forge::python-cdo
   - conda-forge::pyyaml
   - conda-forge::xarray>=2024.*
   - conda-forge::netcdf4>=1.7.*

From 0e0dcefc6c0e6b2576b6590b935965564ff7a5c8 Mon Sep 17 00:00:00 2001
From: "Ian L." <6273252+ilaflott@users.noreply.github.com>
Date: Wed, 20 May 2026 13:30:21 -0400
Subject: [PATCH 5/5] push `cmor` to 3.15.0

---
 environment.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/environment.yml b/environment.yml
index 3797e1694..63e9e646b 100644
--- a/environment.yml
+++ b/environment.yml
@@ -11,7 +11,7 @@ dependencies:
   - conda-forge::cdo>=2
   - conda-forge::cftime
   - conda-forge::click>=8.2
-  - conda-forge::cmor>=3.14.2
+  - conda-forge::cmor>=3.15.0
   - conda-forge::cylc-flow>=8.2
   - conda-forge::cylc-rose
   - conda-forge::jinja2>=3