Merge pull request #737 from satra/fix/warn

Remove warnings about uninstalled interface software

Author: mwaskom

nipype/interfaces/cmtk/convert.py

@@ -23,7 +23,6 @@
  package_check('cfflib')
 except Exception, e:
  have_cfflib = False
- warnings.warn('cfflib not installed')
 else:
  import cfflib as cf
 

nipype/interfaces/cmtk/nbs.py

@@ -17,7 +17,6 @@
  package_check('cviewer')
 except Exception, e:
  have_cv = False
- warnings.warn('ConnectomeViewer not installed')
 else:
  import cviewer.libs.pyconto.groupstatistics.nbs as nbs
 

nipype/interfaces/cmtk/nx.py

@@ -29,7 +29,6 @@
  package_check('cmp')
 except Exception, e:
  have_cmp = False
- warnings.warn('cmp not installed')
 else:
  import cmp
 

nipype/interfaces/cmtk/parcellation.py

@@ -29,7 +29,6 @@
  package_check('cmp')
 except Exception, e:
  have_cmp = False
- warnings.warn('cmp not installed')
 else:
  import cmp
  from cmp.util import runCmd

nipype/interfaces/dipy/tensors.py

@@ -18,12 +18,14 @@
 from ... import logging
 iflogger = logging.getLogger('interface')
 
+have_dipy = True
 try:
  package_check('dipy', version='0.6.0')
+except Exception, e:
+ have_dipy = False
+else:
  import dipy.reconst.dti as dti
  from dipy.core.gradients import GradientTable
-except Exception, e:
- warnings.warn('dipy not installed')
 
 
 class TensorModeInputSpec(TraitedSpec):

nipype/interfaces/dipy/tracks.py

@@ -10,11 +10,13 @@
 from ... import logging
 iflogger = logging.getLogger('interface')
 
+have_dipy = True
 try:
- package_check('dipy')
- from dipy.tracking.utils import density_map
+ package_check('dipy', version='0.6.0')
 except Exception, e:
- warnings.warn('dipy not installed')
+ have_dipy = False
+else:
+ from dipy.tracking.utils import density_map
 
 
 class TrackDensityMapInputSpec(TraitedSpec):

nipype/interfaces/mrtrix/convert.py

@@ -10,23 +10,29 @@
 """
 
 # -*- coding: utf-8 -*-
-from nipype.interfaces.base import (TraitedSpec, BaseInterface, BaseInterfaceInputSpec,
- File, isdefined, traits)
-from nipype.utils.filemanip import split_filename
-import os, os.path as op
-from nipype.workflows.misc.utils import get_data_dims, get_vox_dims
+import os.path as op
 import nibabel as nb, nibabel.trackvis as trk
 import numpy as np
 from nibabel.trackvis import HeaderError
 from nibabel.volumeutils import native_code
-from nipype.utils.misc import package_check
+
+from ..base import (TraitedSpec, BaseInterface, BaseInterfaceInputSpec,
+ File, isdefined, traits)
+from ...utils.filemanip import split_filename
+from ...utils.misc import package_check
+from ...workflows.misc.utils import get_data_dims, get_vox_dims
+
 import warnings
+have_dipy = True
 try:
  package_check('dipy')
- from dipy.tracking.utils import move_streamlines, affine_from_fsl_mat_file
 except Exception, e:
- warnings.warn('dipy not installed')
+ False
+else:
+ from dipy.tracking.utils import move_streamlines, affine_from_fsl_mat_file
+
 from nibabel.orientations import aff2axcodes
+
 from ... import logging
 iflogger = logging.getLogger('interface')
 

nipype/interfaces/nipy/model.py

@@ -12,7 +12,6 @@
  package_check('nipy')
 except Exception, e:
  have_nipy = False
- warnings.warn('nipy not installed')
 else:
  import nipy.modalities.fmri.design_matrix as dm
  import nipy.labs.glm.glm as GLM

nipype/interfaces/nipy/preprocess.py

@@ -16,10 +16,11 @@
 from ...utils.filemanip import split_filename, fname_presuffix
 
 
+have_nipy = True
 try:
  package_check('nipy')
 except Exception, e:
- warnings.warn('nipy not installed')
+ have_nipy = False
 else:
  import nipy
  from nipy import save_image, load_image

nipype/interfaces/nipy/utils.py

@@ -12,10 +12,11 @@
 
 from ...utils.misc import package_check
 
+have_nipy = True
 try:
  package_check('nipy')
 except Exception, e:
- warnings.warn('nipy not installed')
+ have_nipy = False
 else:
  from nipy.algorithms.registration.histogram_registration import HistogramRegistration
  from nipy.algorithms.registration.affine import Affine