Skip to content

Commit a2e52ee

Browse files
author
Oscar Esteban
committed
revert back travis
1 parent 0087bd9 commit a2e52ee

File tree

1 file changed

+23
-24
lines changed

1 file changed

+23
-24
lines changed

.travis.yml

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
cache:
22
- apt
33
language: python
4-
sudo: required
5-
dist: trusty
64
python:
75
- 2.7
86
- 3.4
97
env:
108
- INSTALL_DEB_DEPENDECIES=true
119
- INSTALL_DEB_DEPENDECIES=false
1210
before_install:
13-
# - echo 'APT::Default-Release "precise";' | sudo tee /etc/apt/apt.conf.d/01ubuntu
1411
- if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then wget http://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh
1512
-O miniconda.sh; else wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh
1613
-O miniconda.sh; fi
@@ -19,41 +16,43 @@ before_install:
1916
- if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then export PATH=/home/travis/miniconda2/bin:$PATH; else export PATH=/home/travis/miniconda3/bin:$PATH; fi
2017
- if $INSTALL_DEB_DEPENDECIES; then sudo rm -rf /dev/shm; fi
2118
- if $INSTALL_DEB_DEPENDECIES; then sudo ln -s /run/shm /dev/shm; fi
22-
- bash <(wget -q -O- https://gist.github.com/oesteban/a0d8972f978339910bf4/raw)
19+
- bash <(wget -q -O- http://neuro.debian.net/_files/neurodebian-travis.sh)
2320
- sudo apt-get update
24-
# Fix numpy problem: https://github.com/enthought/enable/issues/34#issuecomment-2029381
25-
#- if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then
26-
# echo '[x11]' >> $HOME/.numpy-site.cfg;
27-
# echo 'library_dirs = /usr/lib64:/usr/lib:/usr/lib/x86_64-linux-gnu' >> $HOME/.numpy-site.cfg;
28-
# echo 'include_dirs = /usr/include:/usr/include/X11' >> $HOME/.numpy-site.cfg;
29-
# fi
30-
install:
31-
- travis_retry sudo apt-get install -y -qq xvfb libx11-dev swig libvtk6-dev
21+
- sudo apt-get install xvfb
3222
- if $INSTALL_DEB_DEPENDECIES; then travis_retry sudo apt-get install -qq --no-install-recommends
3323
fsl afni elastix; fi
3424
- if $INSTALL_DEB_DEPENDECIES; then travis_retry sudo apt-get install -qq fsl-atlases;
3525
fi
3626
- if $INSTALL_DEB_DEPENDECIES; then source /etc/fsl/fsl.sh; fi
3727
- if $INSTALL_DEB_DEPENDECIES; then source /etc/afni/afni.sh; fi
3828
- export FSLOUTPUTTYPE=NIFTI_GZ
29+
# Install vtk and fix numpy installation problem
30+
# Fix numpy problem: https://github.com/enthought/enable/issues/34#issuecomment-2029381
31+
- if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then travis_retry sudo apt-get install -qq libx11-dev swig;
32+
echo '[x11]' >> $HOME/.numpy-site.cfg;
33+
echo 'library_dirs = /usr/lib64:/usr/lib:/usr/lib/x86_64-linux-gnu' >> $HOME/.numpy-site.cfg;
34+
echo 'include_dirs = /usr/include:/usr/include/X11' >> $HOME/.numpy-site.cfg;
35+
fi
36+
install:
3937
- conda update --yes conda
40-
- conda create -n testenv --yes pip numpy scipy nose networkx dateutil python=$TRAVIS_PYTHON_VERSION
38+
- conda create -n testenv --yes pip python=$TRAVIS_PYTHON_VERSION
4139
- source activate testenv
42-
- if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then
43-
pip install ordereddict; fi
44-
conda install --yes traits; else
45-
pip install traits;
46-
fi
40+
- if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then pip install ordereddict; fi
41+
- conda install --yes numpy scipy nose networkx dateutil
42+
- if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then conda install --yes traits; else pip install traits; fi
43+
- if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then conda install --yes vtk; fi
4744
- pip install python-coveralls
4845
- pip install nose-cov
4946
# Add tvtk (PIL is required by blockcanvas)
5047
# Install mayavi (see https://github.com/enthought/mayavi/issues/271)
51-
- pip install http://effbot.org/downloads/Imaging-1.1.7.tar.gz
52-
- pip install -e git+https://github.com/enthought/etsdevtools.git#egg=etsdevtools
53-
- pip install -e git+https://github.com/enthought/blockcanvas.git#egg=blockcanvas
54-
- pip install -e git+https://github.com/enthought/etsproxy.git#egg=etsproxy
55-
- pip install https://github.com/enthought/mayavi/archive/a811639986fc1babecea68656f301c9a68d1ec07.zip
56-
- pip install -e git+https://github.com/enthought/ets.git#egg=ets
48+
- if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then
49+
pip install http://effbot.org/downloads/Imaging-1.1.7.tar.gz;
50+
pip install -e git+https://github.com/enthought/etsdevtools.git#egg=etsdevtools;
51+
pip install -e git+https://github.com/enthought/blockcanvas.git#egg=blockcanvas;
52+
pip install -e git+https://github.com/enthought/etsproxy.git#egg=etsproxy;
53+
pip install https://github.com/dmsurti/mayavi/archive/4d4aaf315a29d6a86707dd95149e27d9ed2225bf.zip;
54+
pip install -e git+https://github.com/enthought/ets.git#egg=ets;
55+
fi
5756
- pip install -r requirements.txt # finish remaining requirements
5857
- python setup.py install
5958
script:

0 commit comments

Comments
 (0)