Merge branch 'master' into more_helpful_bc_errors

* master: Specify precisely which h5py-parallel to install.
ketch · Mar 8, 2017 · af2ec50 · af2ec50
2 parents abeea8f + b2f8420
commit af2ec50
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -37,7 +37,11 @@ install:
   - conda install -c conda-forge mpich mpi4py
   - conda install matplotlib nose coverage
   - conda install -c clawpack hdf5-parallel
-  - conda install -c clawpack h5py-parallel
+  - if [[ "$TRAVIS_PYTHON_VERSION" == "3.5" ]]; then
+      conda install -c clawpack -c conda-forge h5py-parallel=2.6.0=py35_0;
+    else
+      conda install -c clawpack h5py-parallel=2.6.0=py27_0;
+    fi
   - conda install -c conda-forge petsc4py
   - conda install -c conda-forge scipy=0.17.1
   - conda install -c conda-forge python-coveralls