added xvfbwrapper requirement, fixing vtk in ci

Author: oesteban

.travis.yml

@@ -22,20 +22,22 @@ before_install:
   fsl afni elastix; fi
 - if $INSTALL_DEB_DEPENDECIES; then travis_retry sudo apt-get install -qq fsl-atlases;
   fi
-- travis_retry sudo apt-get install -qq libx11-dev swig
 - if $INSTALL_DEB_DEPENDECIES; then source /etc/fsl/fsl.sh; fi
 - if $INSTALL_DEB_DEPENDECIES; then source /etc/afni/afni.sh; fi
-# Fix numpy problem: https://github.com/enthought/enable/issues/34#issuecomment-2029381
-- 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
+- if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then travis_retry sudo apt-get install -qq libx11-dev swig;
+  # Fix numpy problem: https://github.com/enthought/enable/issues/34#issuecomment-2029381
+  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
 - source activate testenv
 - if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then pip install ordereddict; fi
-- conda install --yes numpy scipy nose networkx dateutil vtk
+- 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; else pip install vtk; fi
 - pip install python-coveralls
 - pip install nose-cov
 # Add tvtk (PIL is required by blockcanvas)

circle.yml

@@ -19,8 +19,8 @@ dependencies:
     - echo 'source /etc/fsl/fsl.sh' >> $HOME/.profile
     - echo 'source /etc/afni/afni.sh' >> $HOME/.profile
     # Enable system-wide vtk
-    - echo 'export PYTHONPATH=$PYTHONPATH:/usr/lib/pymodules/python2.7/' >> $HOME/.profile
-    - export PYTHONPATH=$PYTHONPATH:/usr/lib/pymodules/python2.7/
+    - echo 'ln -s /usr/lib/pymodules/python2.7/vtk ~/virtualenvs/venv-system/lib/python2.7/site-packages/' >> $HOME/.profile
+    - ln -s /usr/lib/pymodules/python2.7/vtk ~/virtualenvs/venv-system/lib/python2.7/site-packages/
     # Set up python environment
     - pip install --upgrade pip
     - pip install -e .

requirements.txt

@@ -8,3 +8,4 @@ nose>=1.2
 future==0.15.2
 simplejson>=3.8.0
 prov>=1.4.0
+xvfbwrapper