repin mpl, force unpin np

SciTools · May 22, 2018 · 7eb7ecc · 7eb7ecc
1 parent c1d269e
commit 7eb7ecc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -77,6 +77,11 @@ install:
     python requirements/gen_conda_requirements.py ${CONDA_REQS_FLAGS} --groups ${CONDA_REQS_GROUPS} > ${CONDA_REQS_FILE};
     cat ${CONDA_REQS_FILE};
     conda install --quiet --file ${CONDA_REQS_FILE};
+    conda list;
+
+  - >
+    conda install --force numpy=1.14;
+    conda list;
 
   - PREFIX=$HOME/miniconda/envs/$ENV_NAME
 

diff --git a/requirements/core.txt b/requirements/core.txt
@@ -4,7 +4,7 @@
 # Without these, iris won't even import.
 
 cartopy
-matplotlib
+matplotlib<1.9
 netcdf4<1.4
 numpy
 scipy