Skip to content

Commit 11fd619

Browse files
committed
fix travis (second round)
1 parent a34c0fd commit 11fd619

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

.travis.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ env:
1010
- INSTALL_DEB_DEPENDECIES=false NIPYPE_EXTRAS="doc,tests,fmri,profiler"
1111
- INSTALL_DEB_DEPENDECIES=true NIPYPE_EXTRAS="doc,tests,fmri,profiler,duecredit"
1212
before_install:
13-
- function bef_inst {
13+
- function apt_inst {
1414
if $INSTALL_DEB_DEPENDECIES; then sudo rm -rf /dev/shm; fi &&
1515
if $INSTALL_DEB_DEPENDECIES; then sudo ln -s /run/shm /dev/shm; fi &&
1616
bash <(wget -q -O- http://neuro.debian.net/_files/neurodebian-travis.sh) &&
@@ -21,17 +21,20 @@ before_install:
2121
if $INSTALL_DEB_DEPENDECIES; then
2222
source /etc/fsl/fsl.sh;
2323
source /etc/afni/afni.sh;
24-
export FSLOUTPUTTYPE=NIFTI_GZ; fi &&
24+
export FSLOUTPUTTYPE=NIFTI_GZ; fi }
25+
- function conda_inst {
26+
export CONDA_HOME=/home/travis/anaconda &&
2527
wget https://repo.continuum.io/archive/Anaconda${TRAVIS_PYTHON_VERSION:0:1}-4.3.0-Linux-x86_64.sh
2628
-O /home/travis/.cache/anaconda.sh &&
27-
bash /home/travis/.cache/anaconda.sh -b -p /home/travis/anaconda &&
28-
export PATH=/home/travis/anaconda/bin:$PATH &&
29+
bash /home/travis/.cache/anaconda.sh -b -p ${CONDA_HOME} &&
30+
export PATH=${CONDA_HOME}/bin:$PATH &&
2931
conda config --append channels conda-forge &&
3032
conda update --all -y python=$TRAVIS_PYTHON_VERSION &&
3133
conda install -y nipype icu==56.1 &&
32-
rm -r /home/travis/miniconda/lib/python${TRAVIS_PYTHON_VERSION}/site-packages/nipype*}
33-
# Add install of vtk and mayavi to test mesh (disabled): conda install -y vtk mayavi &&
34-
- travis_retry bef_inst
34+
rm -r ${CONDA_HOME}/lib/python${TRAVIS_PYTHON_VERSION}/site-packages/nipype*; }
35+
# Add install of vtk and mayavi to test mesh (disabled): conda install -y vtk mayavi
36+
- travis_retry apt_inst
37+
- travis_retry conda_inst
3538
install:
3639
- travis_retry pip install -e .[$NIPYPE_EXTRAS]
3740
script:

0 commit comments

Comments
 (0)