From f6c4b101d2f981125029b1607bbc6996c54a99af Mon Sep 17 00:00:00 2001 From: Manuel Schlund Date: Mon, 3 Jun 2024 14:31:11 +0200 Subject: [PATCH 1/2] Updated esmf-related pins --- environment.yml | 4 ++-- setup.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/environment.yml b/environment.yml index 0f68f0642d..293d66631b 100644 --- a/environment.yml +++ b/environment.yml @@ -12,7 +12,7 @@ dependencies: - dask-jobqueue - distributed - esgf-pyclient >=0.3.1 - - esmpy !=8.1.0,<8.6.0 # https://github.com/SciTools-incubator/iris-esmf-regrid/pull/342#issuecomment-2092921514 + - esmpy !=8.1.0,>=8.6.0 # github.com/SciTools-incubator/iris-esmf-regrid/pull/342 - filelock - fiona - fire @@ -20,7 +20,7 @@ dependencies: - humanfriendly - importlib_metadata # required for Python < 3.10 - iris >3.8.0 - - iris-esmf-regrid >=0.7.0 + - iris-esmf-regrid >=0.10.0 # github.com/SciTools-incubator/iris-esmf-regrid/pull/342 - isodate - jinja2 - libnetcdf !=4.9.1 # to avoid hdf5 warnings diff --git a/setup.py b/setup.py index c969fa8f67..b77cc27247 100755 --- a/setup.py +++ b/setup.py @@ -32,7 +32,7 @@ 'dask[array,distributed]', 'dask-jobqueue', 'esgf-pyclient>=0.3.1', - 'esmf-regrid', + 'esmf-regrid>=0.10.0', # iris-esmf-regrid #342 'esmpy!=8.1.0', # not on PyPI 'filelock', 'fiona', From 86144a5580fd5c33dc5b531aaa05b59aabce05f4 Mon Sep 17 00:00:00 2001 From: Manuel Schlund Date: Mon, 3 Jun 2024 15:04:01 +0200 Subject: [PATCH 2/2] Simplify env --- environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index 293d66631b..21918a1c46 100644 --- a/environment.yml +++ b/environment.yml @@ -12,7 +12,7 @@ dependencies: - dask-jobqueue - distributed - esgf-pyclient >=0.3.1 - - esmpy !=8.1.0,>=8.6.0 # github.com/SciTools-incubator/iris-esmf-regrid/pull/342 + - esmpy >=8.6.0 # github.com/SciTools-incubator/iris-esmf-regrid/pull/342 - filelock - fiona - fire