From fb69019918647561164bd7bc1dd3145cd32e1437 Mon Sep 17 00:00:00 2001 From: Patrick Peglar Date: Fri, 31 Aug 2018 11:28:49 +0100 Subject: [PATCH 1/2] Add proj4>=5 to Iris deps : just for test, should fail. --- requirements/core.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements/core.txt b/requirements/core.txt index 997c91c665..99b976cdd0 100644 --- a/requirements/core.txt +++ b/requirements/core.txt @@ -4,6 +4,7 @@ # Without these, iris won't even import. cartopy +#conda: proj4>=5 cf_units>=2 cftime dask[array]==0.18.1 #conda: dask==0.18.1 From d06e22ef127e17cbc5a2bfdb74a742dec92c2884 Mon Sep 17 00:00:00 2001 From: Patrick Peglar Date: Fri, 31 Aug 2018 16:03:31 +0100 Subject: [PATCH 2/2] Switch to proj4<5, to fix graphics problems. --- requirements/core.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/core.txt b/requirements/core.txt index 99b976cdd0..e9abec5732 100644 --- a/requirements/core.txt +++ b/requirements/core.txt @@ -4,7 +4,7 @@ # Without these, iris won't even import. cartopy -#conda: proj4>=5 +#conda: proj4<5 cf_units>=2 cftime dask[array]==0.18.1 #conda: dask==0.18.1