Merge pull request #31 from bsipocz/patch-1

Use generic version of setup_conda rather than OS dependent
astropy · Jun 23, 2017 · 8f61781 · 8f61781
2 parents b8e9ba3 + 4791e00
commit 8f61781
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -43,7 +43,7 @@ before_install:
 
 install:
     - git clone git://github.com/astropy/ci-helpers.git
-    - source ci-helpers/travis/setup_conda_$TRAVIS_OS_NAME.sh
+    - source ci-helpers/travis/setup_conda.sh
     - if [[ $SPHINX_VERSION == dev ]]; then
         pip install git+https://github.com/sphinx-doc/sphinx.git;
       fi