diff --git a/environment.yml b/environment.yml index 270f0f6ecd..72ccf127f6 100644 --- a/environment.yml +++ b/environment.yml @@ -10,27 +10,27 @@ channels: dependencies: - aiohttp - - cartopy <0.24 # https://github.com/ESMValGroup/ESMValTool/issues/3767 + - cartopy - cdo >=2.3.0 - cdsapi - cf-units - cfgrib - cftime - cmocean - - curl <8.10 + - curl <8.10 # https://github.com/ESMValGroup/ESMValTool/issues/3758 - cython - dask !=2024.8.0 # https://github.com/dask/dask/issues/11296 - distributed - ecmwf-api-client - eofs - - esmpy # <8.6 safe https://github.com/SciTools/iris-esmf-regrid/issues/415 + - esmpy - esmvalcore 2.11.* - fiona - fire - fsspec - gdal >=3.9.0 - importlib_metadata <8 # https://github.com/ESMValGroup/ESMValTool/issues/3699 only for Python 3.10/11 and esmpy<8.6 - - iris >=3.6.1 + - iris >=3.11 - iris-esmf-regrid >=0.10.0 # github.com/SciTools-incubator/iris-esmf-regrid/pull/342 - jinja2 - joblib @@ -41,7 +41,7 @@ dependencies: - nc-time-axis - netCDF4 - numba - - numpy !=1.24.3,<2.0 # severe masking bug + - numpy !=1.24.3 # severe masking bug - openpyxl - packaging - pandas==2.1.4 # unpin when ESMValCore released with https://github.com/ESMValGroup/ESMValCore/pull/2529 diff --git a/environment_osx.yml b/environment_osx.yml index 8285b43ecd..242f0a4f56 100644 --- a/environment_osx.yml +++ b/environment_osx.yml @@ -10,7 +10,7 @@ channels: dependencies: - aiohttp - - cartopy <0.24 # https://github.com/ESMValGroup/ESMValTool/issues/3767 + - cartopy - cdo >=2.3.0 - cdsapi - cf-units @@ -22,14 +22,14 @@ dependencies: - distributed - ecmwf-api-client - eofs - - esmpy # <8.6 safe https://github.com/SciTools/iris-esmf-regrid/issues/415 + - esmpy - esmvalcore 2.11.* - fiona - fire - fsspec - gdal >=3.9.0 - importlib_metadata <8 # https://github.com/ESMValGroup/ESMValTool/issues/3699 only for Python 3.10/11 and esmpy<8.6 - - iris >=3.6.1 + - iris >=3.11 - iris-esmf-regrid >=0.10.0 # github.com/SciTools-incubator/iris-esmf-regrid/pull/342 - jinja2 - joblib @@ -40,7 +40,7 @@ dependencies: - nc-time-axis - netCDF4 - numba - - numpy !=1.24.3,<2.0 # severe masking bug + - numpy !=1.24.3 # severe masking bug - openpyxl - packaging - pandas==2.1.4 # unpin when ESMValCore released with https://github.com/ESMValGroup/ESMValCore/pull/2529 diff --git a/setup.py b/setup.py index 86aab79854..cdadaca2d2 100755 --- a/setup.py +++ b/setup.py @@ -21,7 +21,7 @@ # Use with pip install . to install from source 'install': [ 'aiohttp', - 'cartopy<0.24', # github.com/ESMValGroup/ESMValTool/issues/3767 + 'cartopy', 'cdo', 'cdsapi', 'cf-units', @@ -67,7 +67,7 @@ 'scikit-image', 'scikit-learn>=1.4.0', # github.com/ESMValGroup/ESMValTool/issues/3504 'scipy', - 'scitools-iris>=3.6.1', + 'scitools-iris>=3.11', 'seaborn', 'seawater', 'shapely>=2',