fixed doctests

Author: oesteban

circle.yml

@@ -19,7 +19,7 @@ dependencies:
     - echo 'source /etc/afni/afni.sh' >> $HOME/.profile
     # Enable system-wide vtk
     - echo 'ln -sf /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/
+    - ln -sf /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 .

nipype/algorithms/mesh.py

@@ -98,14 +98,18 @@ class WarpPoints(TVTKBaseInterface):
     >>> from nipype.algorithms.mesh import WarpPoints
     >>> if not have_tvtk:
     ...     wp = WarpPoints()
-    Traceback (most recent call last):
-     ...
-    ImportError: This interface requires tvtk to run.
     >>> else:
     ...     wp = WarpPoints()
     ...     wp.inputs.points = 'surf1.vtk'
     ...     wp.inputs.warp = 'warpfield.nii'
     ...     res = wp.run() # doctest: +SKIP
+    # Exceptions cannot be tested conditionally, so raise error
+    # https://docs.python.org/2/library/doctest.html#id2
+    ...     raise ImportError('This interface requires tvtk to run.')
+    Traceback (most recent call last):
+     ...
+    ImportError: This interface requires tvtk to run.
+
 
     """
     input_spec = WarpPointsInputSpec
@@ -228,14 +232,17 @@ class ComputeMeshWarp(TVTKBaseInterface):
     >>> import nipype.algorithms.mesh as m
     >>> if not have_tvtk:
     ...     dist = m.ComputeMeshWarp()
-    Traceback (most recent call last):
-     ...
-    ImportError: This interface requires tvtk to run.
     >>> else:
     ...     dist = m.ComputeMeshWarp()
     ...     dist.inputs.surface1 = 'surf1.vtk'
     ...     dist.inputs.surface2 = 'surf2.vtk'
     ...     res = dist.run()  # doctest: +SKIP
+    # Exceptions cannot be tested conditionally, so raise error
+    # https://docs.python.org/2/library/doctest.html#id2
+    ...     raise ImportError('This interface requires tvtk to run.')
+    Traceback (most recent call last):
+     ...
+    ImportError: This interface requires tvtk to run.
 
     """
 
@@ -366,15 +373,18 @@ class MeshWarpMaths(TVTKBaseInterface):
     >>> import nipype.algorithms.mesh as m
     >>> if not have_tvtk:
     ...     mmath = m.MeshWarpMaths()
-    Traceback (most recent call last):
-     ...
-    ImportError: This interface requires tvtk to run.
     >>> else:
     ...     mmath = m.MeshWarpMaths()
     ...     mmath.inputs.in_surf = 'surf1.vtk'
     ...     mmath.inputs.operator = 'surf2.vtk'
     ...     mmath.inputs.operation = 'mul'
     ...     res = mmath.run()  # doctest: +SKIP
+    # Exceptions cannot be tested conditionally, so raise error
+    # https://docs.python.org/2/library/doctest.html#id2
+    ...     raise ImportError('This interface requires tvtk to run.')
+    Traceback (most recent call last):
+     ...
+    ImportError: This interface requires tvtk to run.
 
     """