From 7b1a1ca18b2b6cd5f746647ca2bfde84f3585212 Mon Sep 17 00:00:00 2001 From: Manuel Schlund <32543114+schlunma@users.noreply.github.com> Date: Mon, 3 Jun 2024 15:19:00 +0200 Subject: [PATCH] Updated esmf-related pins (#3643) --- environment.yml | 4 ++-- environment_osx.yml | 4 ++-- setup.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/environment.yml b/environment.yml index 547aaecec1..c3d746f34f 100644 --- a/environment.yml +++ b/environment.yml @@ -21,14 +21,14 @@ dependencies: - distributed - ecmwf-api-client - eofs - - esmpy !=8.1.0,<8.6.0 # https://github.com/SciTools-incubator/iris-esmf-regrid/pull/342#issuecomment-2092921514 + - esmpy >=8.6.0 # github.com/SciTools-incubator/iris-esmf-regrid/pull/342 - esmvalcore 2.10.* - fiona - fire - fsspec - gdal - iris >=3.6.1 - - iris-esmf-regrid >=0.7.0 + - iris-esmf-regrid >=0.10.0 # github.com/SciTools-incubator/iris-esmf-regrid/pull/342 - jinja2 - joblib - lime diff --git a/environment_osx.yml b/environment_osx.yml index 809cb09346..92eb9fed93 100644 --- a/environment_osx.yml +++ b/environment_osx.yml @@ -21,14 +21,14 @@ dependencies: - distributed - ecmwf-api-client - eofs - - esmpy !=8.1.0,<8.6.0 # https://github.com/SciTools-incubator/iris-esmf-regrid/pull/342#issuecomment-2092921514 + - esmpy >=8.6.0 # github.com/SciTools-incubator/iris-esmf-regrid/pull/342 - esmvalcore 2.10.* - fiona - fsspec - fire - gdal - iris >=3.6.1 - - iris-esmf-regrid >=0.7.0 + - iris-esmf-regrid >=0.10.0 # github.com/SciTools-incubator/iris-esmf-regrid/pull/342 - jinja2 - joblib - lime diff --git a/setup.py b/setup.py index 84bd2a7c82..5cb030b8a4 100755 --- a/setup.py +++ b/setup.py @@ -33,7 +33,7 @@ 'eofs', 'ESMPy', # not on PyPI 'esmvalcore', - 'esmf-regrid>=0.7.0', + 'esmf-regrid>=0.10.0', # iris-esmf-regrid #342 'fiona', 'fire', 'fsspec',