Merge pull request #5266 from notoraptor/travis-update

.travis.yml

@@ -3,10 +3,10 @@
 sudo: false
 cache:
   directories:
-    - $HOME/download
-    - $HOME/download/miniconda.sh
     - $HOME/.cache/pip
     - $HOME/.theano
+    - $HOME/download # Sufficient to add miniconda.sh to TRAVIS cache.
+    - $HOME/miniconda2 # Add the installation to TRAVIS cache.
 
 
 language: python
@@ -14,15 +14,16 @@ python:
   - "2.7"
   - "3.3"
 
+# NB:
+# In before_install and install sections below,
+# some codes have been moved to separate files
+# to better handle if-else shell syntax
+# for multiple lines. New files are in
+# new folder ".travis".
+
 # command to install dependencies
 before_install:
-# Install miniconda to avoid compiling scipy
-  - mkdir -p download
-  - cd download
-  - wget -c https://repo.continuum.io/miniconda/Miniconda2-4.1.11-Linux-x86_64.sh -O miniconda.sh
-  - chmod +x miniconda.sh
-  - ./miniconda.sh -b
-  - cd ..
+  - ./.travis/travis_before_install.sh
   - export PATH=/home/travis/miniconda2/bin:$PATH
 
 addons:
@@ -33,14 +34,12 @@ addons:
    - dvipng
 
 install:
-# In Python 3.3, we test the min version of NumPy and SciPy. In Python 2.7, we test more recent version.
-# nose-exclude plugin should allow use to tell nosetests to exclude folder with --exclude-dir=path/to/directory.
-  - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then conda create --yes -q -n pyenv mkl python=2.7 numpy=1.9.1 scipy=0.14.0 nose=1.3.0 pip flake8=2.3 six=1.9.0 pep8=1.6.2 pyflakes=0.8.1 sphinx mkl-service libgfortran=1; fi
-  - if [[ $TRAVIS_PYTHON_VERSION == '3.3' ]]; then conda create --yes -q -n pyenv mkl python=3.3 numpy=1.9.1 scipy=0.14.0 nose=1.3.4 pip flake8=2.3 six=1.9.0 pep8=1.6.2 pyflakes=0.8.1 sphinx mkl-service; fi
+  - ./.travis/travis_install.sh
   - source activate pyenv
   - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then pip install pydot; else pip install pydot-ng; fi
   - pip install . --no-deps
   - pip install flake8-future-import nose-parameterized==0.5.0 sphinx_rtd_theme
+  # nose-exclude plugin allow us to tell nosetests to exclude folder with --exclude-dir=path/to/directory.
   - pip install nose-exclude
 
 # command to run tests

.travis/travis_before_install.sh

+#!/usr/bin/env bash
+# Install miniconda to avoid compiling scipy
+if test -e $HOME/miniconda2/bin ; then
+    echo "miniconda already installed."
+else
+    echo "Installing miniconda."
+    rm -rf $HOME/miniconda2
+    mkdir -p $HOME/download
+    if [[ -d $HOME/download/miniconda.sh ]] ; then rm -rf $HOME/download/miniconda.sh ; fi
+    wget -c https://repo.continuum.io/miniconda/Miniconda2-4.1.11-Linux-x86_64.sh -O $HOME/download/miniconda.sh
+    chmod +x $HOME/download/miniconda.sh
+    $HOME/download/miniconda.sh -b
+fi

.travis/travis_install.sh

+#!/usr/bin/env bash
+# In Python 3.3, we test the min version of NumPy and SciPy. In Python 2.7, we test more recent version.
+if test -e $HOME/miniconda2/envs/pyenv; then
+    echo "pyenv already exists."
+else
+    echo "Creating pyenv."
+    if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then conda create --yes -q -n pyenv python=2.7 ; fi
+    if [[ $TRAVIS_PYTHON_VERSION == '3.3' ]]; then conda create --yes -q -n pyenv python=3.3 ; fi
+fi
+
+source activate pyenv
+if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then conda install --yes -q mkl numpy=1.9.1 scipy=0.14.0 nose=1.3.0 pip flake8=2.3 six=1.9.0 pep8=1.6.2 pyflakes=0.8.1 sphinx mkl-service libgfortran=1; fi
+if [[ $TRAVIS_PYTHON_VERSION == '3.3' ]]; then conda install --yes -q mkl numpy=1.9.1 scipy=0.14.0 nose=1.3.4 pip flake8=2.3 six=1.9.0 pep8=1.6.2 pyflakes=0.8.1 sphinx mkl-service; fi
+source deactivate