Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #587 from Garyfallidis/fvtk_2.0
Fvtk 2.0 PR1
  • Loading branch information
arokem committed Nov 1, 2015
2 parents 0bbaadf + b590ca0 commit d90ee2a
Show file tree
Hide file tree
Showing 29 changed files with 3,910 additions and 1,121 deletions.
36 changes: 23 additions & 13 deletions .travis.yml
Expand Up @@ -31,28 +31,41 @@ matrix:
- python: 2.7
env:
- DEPENDS="cython numpy scipy matplotlib h5py nibabel cvxopt scikit_learn"
# To test vtk functionality
- python: 2.7
sudo: true
sudo: true # This is set to true for apt-get
env:
- VTK=1
- VTK_VER="python-vtk"
- LIBGL_ALWAYS_INDIRECT=y
- VENV_ARGS="--system-site-packages --python=/usr/bin/python2.7"
- TEST_WITH_XVFB=true
- python: 2.7
sudo: true # This is set to true for apt-get
env:
- VTK=1
- VTK_VER="python-vtk6"
- LIBGL_ALWAYS_INDIRECT=y
- VENV_ARGS="--system-site-packages --python=/usr/bin/python2.7"
- TEST_WITH_XVFB=true
before_install:
- source tools/travis_tools.sh
- virtualenv $VENV_ARGS venv
- source venv/bin/activate
- python --version # just to check
- retry pip install nose # always
- wheelhouse_pip_install $DEPENDS
- retry pip install nose;
- wheelhouse_pip_install $DEPENDS;
- if [ "${COVERAGE}" == "1" ]; then
pip install coverage;
pip install coveralls;
fi
- if [ "${VTK}" == "1" ]; then
sudo apt-get update;
sudo apt-get install -y python-vtk;
sudo apt-get install -y xvfb;
sudo apt-get install -y python-tk;
python -c "import vtk";
sudo apt-get update;
sudo apt-get install -y $VTK_VER;
sudo apt-get install -y xvfb;
sudo apt-get install -y python-tk;
sudo apt-get install -y python-imaging;
retry pip install xvfbwrapper;
fi
install:
- python setup.py install
Expand All @@ -67,9 +80,6 @@ script:
cp ../.coveragerc .;
COVER_ARGS="--with-coverage --cover-package dipy";
fi
- if [ "${VTK}" == "1" ]; then
VIRT_BUFF="xvfb-run";
fi
- $VIRT_BUFF nosetests --with-doctest --verbose $COVER_ARGS dipy
- nosetests --with-doctest --verbose $COVER_ARGS dipy
after_success:
- if [ "${COVERAGE}" == "1" ]; then coveralls; fi
- if [ "${COVERAGE}" == "1" ]; then coveralls; fi
5 changes: 4 additions & 1 deletion dipy/data/__init__.py
Expand Up @@ -27,7 +27,6 @@ def loads_compat(bytes):
from dipy.core.gradients import GradientTable, gradient_table
from dipy.core.sphere import Sphere, HemiSphere
from dipy.sims.voxel import SticksAndBall
import numpy as np
from dipy.data.fetcher import (fetch_scil_b0,
read_scil_b0,
fetch_stanford_hardi,
Expand All @@ -45,6 +44,10 @@ def loads_compat(bytes):
read_stanford_t1,
fetch_stanford_pve_maps,
read_stanford_pve_maps,
fetch_viz_icons,
read_viz_icons,
fetch_bundles_2_subjects,
read_bundles_2_subjects,
fetch_cenir_multib,
read_cenir_multib,
fetch_mni_template,
Expand Down

0 comments on commit d90ee2a

Please sign in to comment.