Merge branch 'master' into assignpotevalincfullorbits

jobovy · Jan 17, 2018 · 31b597f · 31b597f
2 parents f13041b + bcfc8e5
commit 31b597f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -48,8 +48,8 @@ before_install:
  - export PATH="$HOME/miniconda/bin:$PATH"
  - hash -r
  - conda config --set always_yes yes --set changeps1 no
- - conda update -q conda
- - conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION numpy scipy matplotlib setuptools pip cython>=0.20 pytest
+ - conda update conda
+ - conda create -n test-environment python=$TRAVIS_PYTHON_VERSION numpy=1.13 scipy matplotlib setuptools pip cython>=0.20 pytest
  - source activate test-environment
  - export DISPLAY=:99.0 #For plotting tests, courtesy Ryan Varley
  - sh -e /etc/init.d/xvfb start $For plotting tests