Merge pull request #41 from jakevdp/conda-test

TST: use conda for pyamg
mmp2 · Mar 9, 2016 · cf7c3df · cf7c3df
2 parents dab07f3 + 426fae5
commit cf7c3df
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,8 +16,8 @@ env:
     - CONDA_DEPS="pip nose coverage cython scikit-learn flann"
     - PIP_DEPS="coveralls"
   matrix:
-    - EXTRA_CONDA_DEPS="pyflann" EXTRA_PIP_DEPS="pyamg"
-    - EXTRA_CONDA_DEPS="" EXTRA_PIP_DEPS=""
+    - EXTRA_DEPS="pyflann pyamg"
+    - EXTRA_DEPS=""
 
 before_install:
 - export MINICONDA=$HOME/miniconda
@@ -29,8 +29,8 @@ before_install:
 - conda config --set always_yes yes
 - conda update conda
 - conda info -a
-- conda install -c $CONDA_CHANNEL python=$TRAVIS_PYTHON_VERSION $CONDA_DEPS $EXTRA_CONDA_DEPS
-- travis_retry pip install $PIP_DEPS $EXTRA_PIP_DEPS
+- conda install -c $CONDA_CHANNEL python=$TRAVIS_PYTHON_VERSION $CONDA_DEPS $EXTRA_DEPS
+- travis_retry pip install $PIP_DEPS
 
 install:
 - python setup.py install