Skip to content

Commit 664a839

Browse files
author
Oscar Esteban
committed
remove ubuntu pinning
1 parent 62a23e2 commit 664a839

File tree

1 file changed

+6
-13
lines changed

1 file changed

+6
-13
lines changed

.travis.yml

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,16 @@ before_install:
1919
- if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then export PATH=/home/travis/miniconda2/bin:$PATH; else export PATH=/home/travis/miniconda3/bin:$PATH; fi
2020
- if $INSTALL_DEB_DEPENDECIES; then sudo rm -rf /dev/shm; fi
2121
- if $INSTALL_DEB_DEPENDECIES; then sudo ln -s /run/shm /dev/shm; fi
22-
# Enable universe and multiverse
23-
# - sudo bash -c 'echo "deb http://archive.ubuntu.com/ubuntu/ trusty main universe multiverse" >> /etc/apt/sources.list.d/trusty.list'
24-
# - sudo bash -c 'echo "deb-src http://archive.ubuntu.com/ubuntu/ trusty main universe multiverse" >> /etc/apt/sources.list.d/trusty.list'
2522
- bash <(wget -q -O- https://gist.github.com/oesteban/a0d8972f978339910bf4/raw)
2623
- sudo apt-get update
2724
# Fix numpy problem: https://github.com/enthought/enable/issues/34#issuecomment-2029381
28-
- if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then
29-
echo '[x11]' >> $HOME/.numpy-site.cfg;
30-
echo 'library_dirs = /usr/lib64:/usr/lib:/usr/lib/x86_64-linux-gnu' >> $HOME/.numpy-site.cfg;
31-
echo 'include_dirs = /usr/include:/usr/include/X11' >> $HOME/.numpy-site.cfg;
32-
fi
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
3330
install:
34-
- sudo apt-get build-dep -y -qq dh-python
35-
- sudo apt-get -b source -t trusty -y -qq python
36-
- sudo apt-get build-dep -y -qq libvtk6-dev
37-
- sudo apt-get -b source -t trusty -y -qq libvtk6-dev
38-
- sudo apt-get install -y -qq xvfb libx11-dev swig
31+
- travis_retry sudo apt-get install -y -qq xvfb libx11-dev swig libvtk6-dev python-vtk
3932
- if $INSTALL_DEB_DEPENDECIES; then travis_retry sudo apt-get install -qq --no-install-recommends
4033
fsl afni elastix; fi
4134
- if $INSTALL_DEB_DEPENDECIES; then travis_retry sudo apt-get install -qq fsl-atlases;

0 commit comments

Comments
 (0)