Merge remote-tracking branch 'private/fix/dipy_tests'

* private/fix/dipy_tests:
  moved the import inside the constructor
  Fixes #933

Author: chrisgorgo

nipype/interfaces/dipy/preprocess.py

@@ -1,9 +1,12 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# @Author: oesteban
-# @Date:   2014-09-01 10:33:35
-# @Last Modified by:   oesteban
-# @Last Modified time: 2014-09-03 15:07:46
+"""Change directory to provide relative paths for doctests
+   >>> import os
+   >>> filepath = os.path.dirname( os.path.realpath( __file__ ) )
+   >>> datadir = os.path.realpath(os.path.join(filepath, '../../testing/data'))
+   >>> os.chdir(datadir)
+"""
+
 from nipype.interfaces.base import (traits, TraitedSpec, BaseInterface,
                                     File, isdefined)
 from nipype.utils.filemanip import split_filename
@@ -23,7 +26,6 @@
 else:
     from dipy.align.aniso2iso import resample
     from dipy.core.gradients import GradientTable
-    from dipy.denoise.nlmeans import nlmeans
 
 
 class ResampleInputSpec(TraitedSpec):
@@ -125,6 +127,15 @@ class Denoise(BaseInterface):
     """
     input_spec = DenoiseInputSpec
     output_spec = DenoiseOutputSpec
+    
+    def __init__(self, **inputs):
+        try:
+            package_check('dipy', version='0.8.0.dev')
+        except Exception, e:
+            have_dipy = False
+        else:
+            from dipy.denoise.nlmeans import nlmeans
+        BaseInterface.__init__(self, **inputs)
 
     def _run_interface(self, runtime):
         out_file = op.abspath(self._gen_outfilename())

nipype/interfaces/dipy/tracks.py

@@ -1,4 +1,10 @@
 # -*- coding: utf-8 -*-
+"""Change directory to provide relative paths for doctests
+   >>> import os
+   >>> filepath = os.path.dirname( os.path.realpath( __file__ ) )
+   >>> datadir = os.path.realpath(os.path.join(filepath, '../../testing/data'))
+   >>> os.chdir(datadir)
+"""
 from nipype.interfaces.base import (TraitedSpec, BaseInterface, BaseInterfaceInputSpec,
                                     File, isdefined, traits)
 from nipype.utils.filemanip import split_filename