From a36ea2f660863656b645b995346ac53c076e4f21 Mon Sep 17 00:00:00 2001 From: Bouwe Andela Date: Wed, 10 Dec 2025 16:38:08 +0100 Subject: [PATCH 1/3] Pin iris <3.14.1 to align with iris-esmf-regrid --- environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index ab1acac982..33d2389553 100644 --- a/environment.yml +++ b/environment.yml @@ -21,7 +21,7 @@ dependencies: - humanfriendly - intake-esgf >=2025.10.22 - intake-esm - - iris >=3.12.2 # https://github.com/SciTools/iris/issues/6417 + - iris >=3.12.2<3.14.1 # https://github.com/SciTools/iris/issues/6417, https://github.com/ESMValGroup/ESMValCore/issues/2921 - iris-esmf-regrid >=0.11.0 - iris-grib >=0.20.0 # github.com/ESMValGroup/ESMValCore/issues/2535 - isodate >=0.7.0 # incompatible with very old 0.6.1 From dcb49f5d7fdb47d5a458c2e33965f1cbd627fe82 Mon Sep 17 00:00:00 2001 From: Bouwe Andela Date: Wed, 10 Dec 2025 16:40:07 +0100 Subject: [PATCH 2/3] Also pin in pyproject.toml --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 9c7387422e..25487ece9f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -64,7 +64,7 @@ dependencies = [ "requests", "rich", "scipy>=1.6", - "scitools-iris>=3.12.2", # github.com/SciTools/iris/issues/6417 + "scitools-iris>=3.12.2,<3.14.1", # github.com/SciTools/iris/issues/6417, https://github.com/ESMValGroup/ESMValCore/issues/2921 "shapely>=2.0.0", "stratify>=0.3", "xarray", From 443c51d558f4c8e924e58ef57e838d0ace661a85 Mon Sep 17 00:00:00 2001 From: Bouwe Andela Date: Wed, 10 Dec 2025 16:58:02 +0100 Subject: [PATCH 3/3] Add missing comma --- environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index 33d2389553..659cf4918d 100644 --- a/environment.yml +++ b/environment.yml @@ -21,7 +21,7 @@ dependencies: - humanfriendly - intake-esgf >=2025.10.22 - intake-esm - - iris >=3.12.2<3.14.1 # https://github.com/SciTools/iris/issues/6417, https://github.com/ESMValGroup/ESMValCore/issues/2921 + - iris >=3.12.2,<3.14.1 # https://github.com/SciTools/iris/issues/6417, https://github.com/ESMValGroup/ESMValCore/issues/2921 - iris-esmf-regrid >=0.11.0 - iris-grib >=0.20.0 # github.com/ESMValGroup/ESMValCore/issues/2535 - isodate >=0.7.0 # incompatible with very old 0.6.1