diff --git a/environment.yml b/environment.yml index 504f10397d8e5985d596edd9423877071e984bb1..e159e74eaf749a9e0d87cdc45f9187d546c6c1bf 100644 --- a/environment.yml +++ b/environment.yml @@ -5,10 +5,10 @@ channels: - conda-forge dependencies: -- iris<2 +- iris>=2.2 - netcdf4 - numpy -- cdo=1.9.2 +- cdo - nco - python-cdo - python-eccodes diff --git a/setup.py b/setup.py index 0dc78f1028a50de42c9a55ed58744a0ecacdb0d2..548acc31a76b3dd2829dea818490e1e0db6bf072 100644 --- a/setup.py +++ b/setup.py @@ -24,8 +24,8 @@ setup( url='http://www.bsc.es/projects/earthsciences/autosubmit/', keywords=['climate', 'weather', 'diagnostic'], setup_requires=['pyproj'], - install_requires=['numpy', 'netCDF4', 'bscearth.utils', 'cdo>=1.3.4', 'nco>=0.0.3', 'iris>=1.12.0', 'coverage', - 'openpyxl', 'mock', 'futures', 'xxhash', 'six', 'psutil', 'eccodes', + install_requires=['numpy', 'netCDF4', 'bscearth.utils', 'cdo>=1.3.4', 'nco>=0.0.3', 'scitools-iris>=2.2', + 'coverage', 'openpyxl', 'mock', 'futures', 'xxhash', 'six', 'psutil', 'eccodes', 'exrex'], packages=find_packages(), include_package_data=True,