From 966f6a57466faed6b85b5f847caaf90d29dbc48e Mon Sep 17 00:00:00 2001
From: Bouwe Andela <b.andela@esciencecenter.nl>
Date: Mon, 11 Jun 2018 10:50:42 +0200
Subject: [PATCH 1/2] Unpin cf_units to fix conda build

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 8926ec94c6..fbfaa9704d 100755
--- a/setup.py
+++ b/setup.py
@@ -31,7 +31,7 @@
     'install': [
         'cartopy',
         'cdo',
-        'cf_units>=2.0.1',
+        'cf_units',
         'cython',
         'matplotlib',
         'netCDF4',

From c20b942b4502361a42f330e800b8d9383e0fad69 Mon Sep 17 00:00:00 2001
From: Bouwe Andela <b.andela@esciencecenter.nl>
Date: Tue, 19 Jun 2018 10:54:15 +0200
Subject: [PATCH 2/2] Update dependencies to be in line with conda

---
 setup.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/setup.py b/setup.py
index fbfaa9704d..a6c169e201 100755
--- a/setup.py
+++ b/setup.py
@@ -29,10 +29,12 @@
     # Installation dependencies
     # Use with pip install . to install from source
     'install': [
+        'basemap',
         'cartopy',
         'cdo',
         'cf_units',
         'cython',
+        'iris==1.13',
         'matplotlib',
         'netCDF4',
         'numba',
@@ -42,6 +44,7 @@
         'pyyaml',
         'shapely',
         'six',
+        'stratify',
         'yamale',
     ],
     # Test dependencies