Skip to content

Commit 57a4226

Browse files
committed
Revert "Updated esmf-related pins (#3643)"
This reverts commit 7b1a1ca.
1 parent bc25f87 commit 57a4226

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

environment.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ dependencies:
2121
- distributed
2222
- ecmwf-api-client
2323
- eofs
24-
- esmpy >=8.6.0 # github.com/SciTools-incubator/iris-esmf-regrid/pull/342
24+
- esmpy !=8.1.0,<8.6.0 # https://github.com/SciTools-incubator/iris-esmf-regrid/pull/342#issuecomment-2092921514
2525
- esmvalcore 2.10.*
2626
- fiona
2727
- fire
2828
- fsspec
2929
- gdal
3030
- iris >=3.6.1
31-
- iris-esmf-regrid >=0.10.0 # github.com/SciTools-incubator/iris-esmf-regrid/pull/342
31+
- iris-esmf-regrid >=0.7.0
3232
- jinja2
3333
- joblib
3434
- lime

environment_osx.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ dependencies:
2121
- distributed
2222
- ecmwf-api-client
2323
- eofs
24-
- esmpy >=8.6.0 # github.com/SciTools-incubator/iris-esmf-regrid/pull/342
24+
- esmpy !=8.1.0,<8.6.0 # https://github.com/SciTools-incubator/iris-esmf-regrid/pull/342#issuecomment-2092921514
2525
- esmvalcore 2.10.*
2626
- fiona
2727
- fsspec
2828
- fire
2929
- gdal
3030
- iris >=3.6.1
31-
- iris-esmf-regrid >=0.10.0 # github.com/SciTools-incubator/iris-esmf-regrid/pull/342
31+
- iris-esmf-regrid >=0.7.0
3232
- jinja2
3333
- joblib
3434
- lime

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
'eofs',
3434
'ESMPy', # not on PyPI
3535
'esmvalcore',
36-
'esmf-regrid>=0.10.0', # iris-esmf-regrid #342
36+
'esmf-regrid>=0.7.0',
3737
'fiona',
3838
'fire',
3939
'fsspec',

0 commit comments

Comments
 (0)