Skip to content

Commit 0ce8d9d

Browse files
committed
remove warnings
1 parent a531c5e commit 0ce8d9d

File tree

12 files changed

+34
-28
lines changed

12 files changed

+34
-28
lines changed

nipype/interfaces/cmtk/convert.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
package_check('cfflib')
2424
except Exception, e:
2525
have_cfflib = False
26-
warnings.warn('cfflib not installed')
2726
else:
2827
import cfflib as cf
2928

nipype/interfaces/cmtk/nbs.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
package_check('cviewer')
1818
except Exception, e:
1919
have_cv = False
20-
warnings.warn('ConnectomeViewer not installed')
2120
else:
2221
import cviewer.libs.pyconto.groupstatistics.nbs as nbs
2322

nipype/interfaces/cmtk/nx.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
package_check('cmp')
3030
except Exception, e:
3131
have_cmp = False
32-
warnings.warn('cmp not installed')
3332
else:
3433
import cmp
3534

nipype/interfaces/cmtk/parcellation.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
package_check('cmp')
3030
except Exception, e:
3131
have_cmp = False
32-
warnings.warn('cmp not installed')
3332
else:
3433
import cmp
3534
from cmp.util import runCmd

nipype/interfaces/dipy/tensors.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,14 @@
1818
from ... import logging
1919
iflogger = logging.getLogger('interface')
2020

21+
have_dipy = True
2122
try:
2223
package_check('dipy', version='0.6.0')
24+
except Exception, e:
25+
have_dipy = False
26+
else:
2327
import dipy.reconst.dti as dti
2428
from dipy.core.gradients import GradientTable
25-
except Exception, e:
26-
warnings.warn('dipy not installed')
2729

2830

2931
class TensorModeInputSpec(TraitedSpec):

nipype/interfaces/dipy/tracks.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,13 @@
1010
from ... import logging
1111
iflogger = logging.getLogger('interface')
1212

13+
have_dipy = True
1314
try:
14-
package_check('dipy')
15-
from dipy.tracking.utils import density_map
15+
package_check('dipy', version='0.6.0')
1616
except Exception, e:
17-
warnings.warn('dipy not installed')
17+
have_dipy = False
18+
else:
19+
from dipy.tracking.utils import density_map
1820

1921

2022
class TrackDensityMapInputSpec(TraitedSpec):

nipype/interfaces/mrtrix/convert.py

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,29 @@
1010
"""
1111

1212
# -*- coding: utf-8 -*-
13-
from nipype.interfaces.base import (TraitedSpec, BaseInterface, BaseInterfaceInputSpec,
14-
File, isdefined, traits)
15-
from nipype.utils.filemanip import split_filename
16-
import os, os.path as op
17-
from nipype.workflows.misc.utils import get_data_dims, get_vox_dims
13+
import os.path as op
1814
import nibabel as nb, nibabel.trackvis as trk
1915
import numpy as np
2016
from nibabel.trackvis import HeaderError
2117
from nibabel.volumeutils import native_code
22-
from nipype.utils.misc import package_check
18+
19+
from ..base import (TraitedSpec, BaseInterface, BaseInterfaceInputSpec,
20+
File, isdefined, traits)
21+
from ...utils.filemanip import split_filename
22+
from ...utils.misc import package_check
23+
from ...workflows.misc.utils import get_data_dims, get_vox_dims
24+
2325
import warnings
26+
have_dipy = True
2427
try:
2528
package_check('dipy')
26-
from dipy.tracking.utils import move_streamlines, affine_from_fsl_mat_file
2729
except Exception, e:
28-
warnings.warn('dipy not installed')
30+
False
31+
else:
32+
from dipy.tracking.utils import move_streamlines, affine_from_fsl_mat_file
33+
2934
from nibabel.orientations import aff2axcodes
35+
3036
from ... import logging
3137
iflogger = logging.getLogger('interface')
3238

nipype/interfaces/nipy/model.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
package_check('nipy')
1313
except Exception, e:
1414
have_nipy = False
15-
warnings.warn('nipy not installed')
1615
else:
1716
import nipy.modalities.fmri.design_matrix as dm
1817
import nipy.labs.glm.glm as GLM

nipype/interfaces/nipy/preprocess.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@
1616
from ...utils.filemanip import split_filename, fname_presuffix
1717

1818

19+
have_nipy = True
1920
try:
2021
package_check('nipy')
2122
except Exception, e:
22-
warnings.warn('nipy not installed')
23+
have_nipy = False
2324
else:
2425
import nipy
2526
from nipy import save_image, load_image

nipype/interfaces/nipy/utils.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,11 @@
1212

1313
from ...utils.misc import package_check
1414

15+
have_nipy = True
1516
try:
1617
package_check('nipy')
1718
except Exception, e:
18-
warnings.warn('nipy not installed')
19+
have_nipy = False
1920
else:
2021
from nipy.algorithms.registration.histogram_registration import HistogramRegistration
2122
from nipy.algorithms.registration.affine import Affine

0 commit comments

Comments
 (0)