Commit 08770b49 authored by Javier Vegas-Regidor's avatar Javier Vegas-Regidor
Browse files

Merge branch 'master' into 'production'

Master

See merge request !57
parents 646c03cb 3a09fae3
......@@ -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
......
......@@ -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,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment