From 3a09fae3de6fcb2d2997bde8f11a57b3a5422a80 Mon Sep 17 00:00:00 2001
From: Javier Vegas-Regidor <javier.vegas@bsc.es>
Date: Tue, 6 Nov 2018 12:22:49 +0100
Subject: [PATCH] Updated iris package

---
 environment.yml | 4 ++--
 setup.py        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/environment.yml b/environment.yml
index 504f1039..e159e74e 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 0dc78f10..548acc31 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,
-- 
GitLab