update travis

Author: Oscar Esteban

.travis.yml

@@ -18,41 +18,39 @@ before_install:
 - if $INSTALL_DEB_DEPENDECIES; then sudo ln -s /run/shm /dev/shm; fi
 - bash <(wget -q -O- http://neuro.debian.net/_files/neurodebian-travis.sh)
 - sudo apt-get update
-- sudo apt-get install xvfb
+- sudo apt-get install -qq xvfb libvtk6-dev python-vtk libx11-dev swig
 - if $INSTALL_DEB_DEPENDECIES; then travis_retry sudo apt-get install -qq --no-install-recommends
   fsl afni elastix; fi
 - if $INSTALL_DEB_DEPENDECIES; then travis_retry sudo apt-get install -qq fsl-atlases;
   fi
 - if $INSTALL_DEB_DEPENDECIES; then source /etc/fsl/fsl.sh; fi
 - if $INSTALL_DEB_DEPENDECIES; then source /etc/afni/afni.sh; fi
 - export FSLOUTPUTTYPE=NIFTI_GZ
-# Install vtk and fix numpy installation problem
 # Fix numpy problem: https://github.com/enthought/enable/issues/34#issuecomment-2029381
-- if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then travis_retry sudo apt-get install -qq libx11-dev swig;
+- if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then
   echo '[x11]' >> $HOME/.numpy-site.cfg; 
   echo 'library_dirs = /usr/lib64:/usr/lib:/usr/lib/x86_64-linux-gnu' >> $HOME/.numpy-site.cfg;
   echo 'include_dirs = /usr/include:/usr/include/X11' >> $HOME/.numpy-site.cfg;
   fi
 install:
 - conda update --yes conda
-- conda create -n testenv --yes pip python=$TRAVIS_PYTHON_VERSION
+- conda create -n testenv --yes pip numpy scipy nose networkx dateutil python=$TRAVIS_PYTHON_VERSION
 - source activate testenv
-- if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then pip install ordereddict; fi
-- conda install --yes numpy scipy nose networkx dateutil
-- if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then conda install --yes traits; else pip install traits; fi
-- if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then conda install --yes vtk; fi
+- if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then 
+  pip install ordereddict; fi
+  conda install --yes traits; else 
+  pip install traits; 
+  fi
 - pip install python-coveralls
 - pip install nose-cov
 # Add tvtk (PIL is required by blockcanvas)
 # Install mayavi (see https://github.com/enthought/mayavi/issues/271)
-- if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then
-  pip install http://effbot.org/downloads/Imaging-1.1.7.tar.gz;
-  pip install -e git+https://github.com/enthought/etsdevtools.git#egg=etsdevtools;
-  pip install -e git+https://github.com/enthought/blockcanvas.git#egg=blockcanvas;
-  pip install -e git+https://github.com/enthought/etsproxy.git#egg=etsproxy;
-  pip install https://github.com/dmsurti/mayavi/archive/4d4aaf315a29d6a86707dd95149e27d9ed2225bf.zip;
-  pip install -e git+https://github.com/enthought/ets.git#egg=ets;
-  fi
+- pip install http://effbot.org/downloads/Imaging-1.1.7.tar.gz
+- pip install -e git+https://github.com/enthought/etsdevtools.git#egg=etsdevtools
+- pip install -e git+https://github.com/enthought/blockcanvas.git#egg=blockcanvas
+- pip install -e git+https://github.com/enthought/etsproxy.git#egg=etsproxy
+- pip install https://github.com/enthought/mayavi/archive/a811639986fc1babecea68656f301c9a68d1ec07.zip
+- pip install -e git+https://github.com/enthought/ets.git#egg=ets
 - pip install -r requirements.txt  # finish remaining requirements
 - python setup.py install
 script: