From baa34009a6332e9e3ca4c9e2a09e385394dca1e2 Mon Sep 17 00:00:00 2001 From: Emma Hogan Date: Thu, 27 Jun 2024 16:51:54 +0100 Subject: [PATCH 1/3] Pin R <4.3.0 (#3689) --- environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index c3d746f34f..7f37b52448 100644 --- a/environment.yml +++ b/environment.yml @@ -103,7 +103,7 @@ dependencies: # R and dependencies - cdo - - r-base >=3.5 + - r-base >=3.5,<4.3.0 - r-abind - r-akima - r-climdex.pcic From 8f12662a2745861604046be2a3e0a881d0c8b753 Mon Sep 17 00:00:00 2001 From: Emma Hogan Date: Mon, 1 Jul 2024 09:15:11 +0100 Subject: [PATCH 2/3] #3699: Add importlib_metadata to ESMValTool, pin version to <8 --- environment.yml | 1 + setup.py | 1 + 2 files changed, 2 insertions(+) diff --git a/environment.yml b/environment.yml index 7f37b52448..6f2828aa76 100644 --- a/environment.yml +++ b/environment.yml @@ -27,6 +27,7 @@ dependencies: - fire - fsspec - gdal + - importlib_metadata <8 # required for Python < 3.10 - iris >=3.6.1 - iris-esmf-regrid >=0.10.0 # github.com/SciTools-incubator/iris-esmf-regrid/pull/342 - jinja2 diff --git a/setup.py b/setup.py index 5cb030b8a4..9b41097457 100755 --- a/setup.py +++ b/setup.py @@ -38,6 +38,7 @@ 'fire', 'fsspec', 'GDAL', + "importlib_metadata<8;python_version<'3.10'", 'jinja2', 'joblib', 'lime', From 72c2eb9e9eefedb7afb5411157337dadbca4dff9 Mon Sep 17 00:00:00 2001 From: Emma Hogan Date: Mon, 1 Jul 2024 09:19:06 +0100 Subject: [PATCH 3/3] #3699: Add importlib_metadata to osx environment file --- environment_osx.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/environment_osx.yml b/environment_osx.yml index 92eb9fed93..15cdfb9f85 100644 --- a/environment_osx.yml +++ b/environment_osx.yml @@ -27,6 +27,7 @@ dependencies: - fsspec - fire - gdal + - importlib_metadata <8 # required for Python < 3.10 - iris >=3.6.1 - iris-esmf-regrid >=0.10.0 # github.com/SciTools-incubator/iris-esmf-regrid/pull/342 - jinja2