test 11

.travis.yml

@@ -30,6 +30,11 @@ addons:
 install:
   - chmod +x ./.travis/travis_install.sh
   - ./.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
+  - pip install nose-exclude
 
 # command to run tests
 env:

.travis/travis_before_install.sh

 #!/usr/bin/env bash
 # Install miniconda to avoid compiling scipy
-if ! test -e $HOME/miniconda2/bin ; then
+if test -e $HOME/miniconda2/bin ; then
+    echo "miniconda already installed."
+else
+    echo "Installing miniconda."
     rm -rf $HOME/miniconda2
     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
-else
-    echo "miniconda already installed."
 fi
\ No newline at end of file

.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.
 # nose-exclude plugin should allow use to tell nosetests to exclude folder with --exclude-dir=path/to/directory.
-if ! test -e $HOME/miniconda2/envs/pyenv
-then
-    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
-    source activate pyenv
-else
+if test -e $HOME/miniconda2/envs/pyenv ; then
+    echo "pyenv already exists."
     source activate pyenv
     if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then conda install 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 install 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
+    source deactivate
+else
+    echo "Creating pyenv."
+    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
 fi
-
-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
-pip install nose-exclude
\ No newline at end of file