Merge fa3d066 into f9c956a

astrofrog · Nov 4, 2015 · 9b3e15f · 9b3e15f
2 parents f9c956a + fa3d066
commit 9b3e15f
Show file tree

Hide file tree

Showing 3 changed files with 656 additions and 429 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -70,11 +70,15 @@ before_install:
     # Use utf8 encoding. Should be default, but this is insurance against
     # future changes
     - export PYTHONIOENCODING=UTF8
-    - wget http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh
-    - chmod +x miniconda.sh
-    - ./miniconda.sh -b
-    - export PATH=/home/travis/miniconda/bin:$PATH
-    - conda update --yes conda
+
+    # http://conda.pydata.org/docs/travis.html#the-travis-yml-file
+    - wget https://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh;
+    - bash miniconda.sh -b -p $HOME/miniconda
+    - export PATH="$HOME/miniconda/bin:$PATH"
+    - hash -r
+    - conda config --set always_yes yes --set changeps1 no
+    - conda update -q conda
+    - conda info -a
 
     # Make sure that interactive matplotlib backends work
     - export DISPLAY=:99.0