address ariel comment

Author: skoudoro

nipype/interfaces/dipy/base.py

@@ -10,7 +10,11 @@
 from ..base import (traits, File, isdefined, LibraryBaseInterface,
                     BaseInterfaceInputSpec, TraitedSpec)
 
+# List of workflows to ignore
+SKIP_WORKFLOWS_LIST = ['Workflow', 'CombinedWorkflow']
+
 HAVE_DIPY = True
+
 try:
     import dipy
     from dipy.workflows.base import IntrospectiveArgumentParser
@@ -236,4 +240,4 @@ def get_dipy_workflows(module):
     return [(m, obj) for m, obj in inspect.getmembers(module)
             if inspect.isclass(obj) and
             issubclass(obj, module.Workflow) and
-            m not in ['Workflow', 'CombinedWorkflow']]
+            m not in SKIP_WORKFLOWS_LIST]

nipype/interfaces/dipy/reconstruction.py

@@ -24,18 +24,7 @@
 
 IFLOGGER = logging.getLogger('nipype.interface')
 
-if HAVE_DIPY and (LooseVersion('0.15') >= LooseVersion(dipy_version()) >= LooseVersion('0.16')):
-    from dipy.workflows.reconst import (ReconstDkiFlow, ReconstCSAFlow,
-                                        ReconstCSDFlow, ReconstMAPMRIFlow,
-                                        ReconstDtiFlow)
-
-    DKIModel = dipy_to_nipype_interface("DKIModel", ReconstDkiFlow)
-    MapmriModel = dipy_to_nipype_interface("MapmriModel", ReconstMAPMRIFlow)
-    DTIModel = dipy_to_nipype_interface("DTIModel", ReconstDtiFlow)
-    CSAModel = dipy_to_nipype_interface("CSAModel", ReconstCSAFlow)
-    CSDModel = dipy_to_nipype_interface("CSDModel", ReconstCSDFlow)
-
-elif HAVE_DIPY and LooseVersion(dipy_version()) >= LooseVersion('1.0'):
+if HAVE_DIPY and LooseVersion(dipy_version()) >= LooseVersion('0.15'):
     from dipy.workflows import reconst
 
     l_wkflw = get_dipy_workflows(reconst)

nipype/interfaces/dipy/registration.py

@@ -6,15 +6,8 @@
 
 IFLOGGER = logging.getLogger('nipype.interface')
 
-if HAVE_DIPY and (LooseVersion('0.15') >= LooseVersion(dipy_version()) >= LooseVersion('0.16')):
 
-    from dipy.workflows.align import ResliceFlow, SlrWithQbxFlow
-
-    Reslice = dipy_to_nipype_interface("Reslice", ResliceFlow)
-    StreamlineRegistration = dipy_to_nipype_interface("StreamlineRegistration",
-                                                      SlrWithQbxFlow)
-
-elif HAVE_DIPY and LooseVersion(dipy_version()) >= LooseVersion('1.0'):
+if HAVE_DIPY and LooseVersion(dipy_version()) >= LooseVersion('0.15'):
     from dipy.workflows import align
 
     l_wkflw = get_dipy_workflows(align)

nipype/interfaces/dipy/tracks.py

@@ -18,20 +18,15 @@
 
 
 if HAVE_DIPY and (LooseVersion('0.15') >= LooseVersion(dipy_version()) >= LooseVersion('0.16')):
-
-    from dipy.workflows.segment import RecoBundlesFlow, LabelsBundlesFlow
     try:
         from dipy.workflows.tracking import LocalFiberTrackingPAMFlow as DetTrackFlow
     except ImportError:  # different name in 0.15
         from dipy.workflows.tracking import DetTrackPAMFlow as DetTrackFlow
 
-    RecoBundles = dipy_to_nipype_interface("RecoBundles", RecoBundlesFlow)
-    LabelsBundles = dipy_to_nipype_interface("LabelsBundles",
-                                             LabelsBundlesFlow)
     DeterministicTracking = dipy_to_nipype_interface("DeterministicTracking",
                                                      DetTrackFlow)
 
-elif HAVE_DIPY and LooseVersion(dipy_version()) >= LooseVersion('1.0'):
+if HAVE_DIPY and LooseVersion(dipy_version()) >= LooseVersion('0.15'):
     from dipy.workflows import segment, tracking
 
     l_wkflw = get_dipy_workflows(segment) + get_dipy_workflows(tracking)