Merge pull request #1338 from oesteban/fix/ProblemsInMaster

[FIX] Some problems have sneaked into master

Author: oesteban

nipype/algorithms/tests/test_auto_ErrorMap.py

@@ -23,9 +23,6 @@
     package_check('dipy', version='0.6.0')
 except Exception as e:
     have_dipy = False
-else:
-    from dipy.align.aniso2iso import resample
-    from dipy.core.gradients import GradientTable
 
 
 class ResampleInputSpec(TraitedSpec):
@@ -172,6 +169,7 @@ def resample_proxy(in_file, order=3, new_zooms=None, out_file=None):
     """
     Performs regridding of an image to set isotropic voxel sizes using dipy.
     """
+    from dipy.align.aniso2iso import resample
 
     if out_file is None:
         fname, fext = op.splitext(op.basename(in_file))

nipype/algorithms/tests/test_auto_Overlap.py

@@ -16,6 +16,7 @@ def test_Surface2VolTransform_inputs():
     usedefault=True,
     ),
     mkmask=dict(argstr='--mkmask',
+    xor=['source_file'],
     ),
     projfrac=dict(argstr='--projfrac %s',
     ),
@@ -26,6 +27,7 @@ def test_Surface2VolTransform_inputs():
     source_file=dict(argstr='--surfval %s',
     copyfile=False,
     mandatory=True,
+    xor=['mkmask'],
     ),
     subject_id=dict(argstr='--identity %s',
     xor=['reg_file'],