Remove nitime from requirements

  - Skip DVARS test if nitime is not present
  - Add nitime and matplotlib to travis

Author: oesteban

.travis.yml

@@ -31,7 +31,7 @@ install:
 - conda update --all -y python=$TRAVIS_PYTHON_VERSION
 # - if [[ "${INSTALL_DEB_DEPENDECIES}" == "true" && ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]]; then
 #   conda install -y vtk mayavi; fi
-- conda install -y nipype
+- conda install -y nipype matplotlib nitime
 - pip install python-coveralls coverage doctest-ignore-unicode
 - if [ ! -z "$DUECREDIT_ENABLE"]; then pip install duecredit; fi
 - rm -r /home/travis/miniconda/lib/python${TRAVIS_PYTHON_VERSION}/site-packages/nipype*

nipype/algorithms/tests/test_confounds.py

@@ -1,12 +1,20 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 import os
-from nipype.testing import (assert_equal, example_data)
+from nipype.testing import (assert_equal, example_data, skipif)
 from nipype.algorithms.confounds import FramewiseDisplacement, ComputeDVARS
 import numpy as np
 from tempfile import mkdtemp
 from shutil import rmtree
 
+nonitime = True
+try:
+    import nitime
+    nonitime = False
+except ImportError:
+    pass
+
+
 def test_fd():
     tempdir = mkdtemp()
     ground_truth = np.loadtxt(example_data('fsl_motion_outliers_fd.txt'))
@@ -17,6 +25,7 @@ def test_fd():
     yield assert_equal, np.abs(ground_truth.mean() - res.outputs.fd_average) < 1e-4, True
     rmtree(tempdir)
 
+@skipif(nonitime)
 def test_dvars():
     tempdir = mkdtemp()
     ground_truth = np.loadtxt(example_data('ds003_sub-01_mc.DVARS'))

requirements.txt

@@ -12,4 +12,3 @@ xvfbwrapper
 psutil
 funcsigs
 configparser
-nitime