Skip to content

Commit ed1ad30

Browse files
committed
FIX: revert E501 changes in doc description to please doctest
1 parent c4f6415 commit ed1ad30

File tree

9 files changed

+17
-41
lines changed

9 files changed

+17
-41
lines changed

nipype/interfaces/freesurfer/longitudinal.py

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -100,31 +100,22 @@ class RobustTemplate(FSCommandOpenMP):
100100
>>> template.inputs.no_iteration = True
101101
>>> template.inputs.subsample_threshold = 200
102102
>>> template.cmdline #doctest:
103-
'mri_robust_template --satit --average 0 --fixtp --mov structural.nii
104-
functional.nii --inittp 1 --noit --template mri_robust_template_out.mgz
105-
--subsample 200'
103+
'mri_robust_template --satit --average 0 --fixtp --mov structural.nii functional.nii --inittp 1 --noit --template mri_robust_template_out.mgz --subsample 200'
106104
>>> template.inputs.out_file = 'T1.nii'
107105
>>> template.cmdline #doctest:
108-
'mri_robust_template --satit --average 0 --fixtp --mov structural.nii
109-
functional.nii --inittp 1 --noit --template T1.nii --subsample 200'
106+
'mri_robust_template --satit --average 0 --fixtp --mov structural.nii functional.nii --inittp 1 --noit --template T1.nii --subsample 200'
110107
111108
>>> template.inputs.transform_outputs = ['structural.lta',
112109
... 'functional.lta']
113110
>>> template.inputs.scaled_intensity_outputs = ['structural-iscale.txt',
114111
... 'functional-iscale.txt']
115112
>>> template.cmdline #doctest: +ELLIPSIS
116-
'mri_robust_template --satit --average 0 --fixtp --mov structural.nii
117-
functional.nii --inittp 1 --noit --template T1.nii
118-
--iscaleout .../structural-iscale.txt .../functional-iscale.txt
119-
--subsample 200 --lta .../structural.lta .../functional.lta'
113+
'mri_robust_template --satit --average 0 --fixtp --mov structural.nii functional.nii --inittp 1 --noit --template T1.nii --iscaleout .../structural-iscale.txt .../functional-iscale.txt --subsample 200 --lta .../structural.lta .../functional.lta'
120114
121115
>>> template.inputs.transform_outputs = True
122116
>>> template.inputs.scaled_intensity_outputs = True
123117
>>> template.cmdline #doctest: +ELLIPSIS
124-
'mri_robust_template --satit --average 0 --fixtp --mov structural.nii
125-
functional.nii --inittp 1 --noit --template T1.nii
126-
--iscaleout .../is1.txt .../is2.txt --subsample 200
127-
--lta .../tp1.lta .../tp2.lta'
118+
'mri_robust_template --satit --average 0 --fixtp --mov structural.nii functional.nii --inittp 1 --noit --template T1.nii --iscaleout .../is1.txt .../is2.txt --subsample 200 --lta .../tp1.lta .../tp2.lta'
128119
129120
>>> template.run() #doctest: +SKIP
130121
@@ -210,8 +201,7 @@ class FuseSegmentations(FSCommand):
210201
>>> fuse.inputs.in_segmentations_noCC = ['aseg.mgz', 'aseg.mgz']
211202
>>> fuse.inputs.in_norms = ['norm.mgz', 'norm.mgz', 'norm.mgz']
212203
>>> fuse.cmdline
213-
'mri_fuse_segmentations -n norm.mgz -a aseg.mgz
214-
-c aseg.mgz tp.long.A.template tp1 tp2'
204+
'mri_fuse_segmentations -n norm.mgz -a aseg.mgz -c aseg.mgz tp.long.A.template tp1 tp2'
215205
"""
216206

217207
_cmd = 'mri_fuse_segmentations'

nipype/interfaces/fsl/dti.py

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
Change directory to provide relative paths for doctests
99
>>> import os
1010
>>> filepath = os.path.dirname( os.path.realpath( __file__ ) )
11-
>>> datadir = os.path.realpath(os.path.join(filepath,
12-
'../../testing/data'))
11+
>>> datadir = os.path.realpath(os.path.join(filepath, '../../testing/data'))
1312
>>> os.chdir(datadir)
1413
1514
"""
@@ -587,10 +586,7 @@ class ProbTrackX(FSLCommand):
587586
thsamples='merged_thsamples.nii', fsamples='merged_fsamples.nii', \
588587
phsamples='merged_phsamples.nii', out_dir='.')
589588
>>> pbx.cmdline
590-
'probtrackx --forcedir -m mask.nii --mode=seedmask --nsamples=3 --nsteps=10
591-
--opd --os2t --dir=. --samples=merged
592-
--seed=MASK_average_thal_right.nii
593-
--targetmasks=targets.txt --xfm=trans.mat'
589+
'probtrackx --forcedir -m mask.nii --mode=seedmask --nsamples=3 --nsteps=10 --opd --os2t --dir=. --samples=merged --seed=MASK_average_thal_right.nii --targetmasks=targets.txt --xfm=trans.mat'
594590
595591
"""
596592

@@ -788,8 +784,7 @@ class ProbTrackX2(ProbTrackX):
788784
>>> pbx2.inputs.n_samples = 3
789785
>>> pbx2.inputs.n_steps = 10
790786
>>> pbx2.cmdline
791-
'probtrackx2 --forcedir -m nodif_brain_mask.nii.gz --nsamples=3 --nsteps=10
792-
--opd --dir=. --samples=merged --seed=seed_source.nii.gz'
787+
'probtrackx2 --forcedir -m nodif_brain_mask.nii.gz --nsamples=3 --nsteps=10 --opd --dir=. --samples=merged --seed=seed_source.nii.gz'
793788
"""
794789
_cmd = 'probtrackx2'
795790
input_spec = ProbTrackX2InputSpec
@@ -988,8 +983,7 @@ class FindTheBiggest(FSLCommand):
988983
989984
>>> from nipype.interfaces import fsl
990985
>>> ldir = ['seeds_to_M1.nii', 'seeds_to_M2.nii']
991-
>>> fBig = fsl.FindTheBiggest(in_files=ldir,
992-
out_file='biggestSegmentation')
986+
>>> fBig = fsl.FindTheBiggest(in_files=ldir, out_file='biggestSegmentation')
993987
>>> fBig.cmdline
994988
'find_the_biggest seeds_to_M1.nii seeds_to_M2.nii biggestSegmentation'
995989

nipype/interfaces/fsl/maths.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
Change directory to provide relative paths for doctests
99
>>> import os
1010
>>> filepath = os.path.dirname( os.path.realpath( __file__ ) )
11-
>>> datadir = os.path.realpath(
12-
os.path.join(filepath, '../../testing/data'))
11+
>>> datadir = os.path.realpath(os.path.join(filepath, '../../testing/data'))
1312
>>> os.chdir(datadir)
1413
"""
1514
from __future__ import (print_function, division, unicode_literals,
@@ -442,8 +441,7 @@ class MultiImageMaths(MathsCommand):
442441
>>> maths.inputs.operand_files = ["functional2.nii", "functional3.nii"]
443442
>>> maths.inputs.out_file = "functional4.nii"
444443
>>> maths.cmdline
445-
'fslmaths functional.nii -add functional2.nii -mul -1 -div functional3.nii
446-
functional4.nii'
444+
'fslmaths functional.nii -add functional2.nii -mul -1 -div functional3.nii functional4.nii'
447445
448446
"""
449447
input_spec = MultiImageMathsInput

nipype/interfaces/minc/base.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,7 @@ def aggregate_filename(files, new_suffix):
109109
--------
110110
111111
>>> from nipype.interfaces.minc.base import aggregate_filename
112-
>>> f = aggregate_filename(['/tmp/foo1.mnc', '/tmp/foo2.mnc',
113-
'/tmp/foo3.mnc'], 'averaged')
112+
>>> f = aggregate_filename(['/tmp/foo1.mnc', '/tmp/foo2.mnc', '/tmp/foo3.mnc'], 'averaged')
114113
>>> os.path.split(f)[1] # This has a full path, so just check the filename.
115114
'foo_averaged.mnc'
116115

nipype/interfaces/niftyseg/em.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,7 @@ class EM(NiftySegCommand):
128128
>>> node.inputs.in_file = 'im1.nii'
129129
>>> node.inputs.no_prior = 4
130130
>>> node.cmdline
131-
'seg_EM -in im1.nii -nopriors 4 -bc_out im1_bc_em.nii.gz -out im1_em.nii.gz
132-
-out_outlier im1_outlier_em.nii.gz'
131+
'seg_EM -in im1.nii -nopriors 4 -bc_out im1_bc_em.nii.gz -out im1_em.nii.gz -out_outlier im1_outlier_em.nii.gz'
133132
134133
"""
135134
_cmd = get_custom_path('seg_EM', env_dir='NIFTYSEGDIR')

nipype/interfaces/niftyseg/label_fusion.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,7 @@ class LabelFusion(NiftySegCommand):
148148
>>> node.inputs.template_num = 2
149149
>>> node.inputs.classifier_type = 'STEPS'
150150
>>> node.cmdline
151-
'seg_LabFusion -in im1.nii -STEPS 2.000000 2 im2.nii im3.nii
152-
-out im1_steps.nii'
151+
'seg_LabFusion -in im1.nii -STEPS 2.000000 2 im2.nii im3.nii -out im1_steps.nii'
153152
154153
"""
155154
_cmd = get_custom_path('seg_LabFusion', env_dir='NIFTYSEGDIR')

nipype/interfaces/nipy/utils.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
Change directory to provide relative paths for doctests
44
>>> import os
55
>>> filepath = os.path.dirname( os.path.realpath( __file__ ) )
6-
>>> datadir = os.path.realpath(
7-
os.path.join(filepath, '../../testing/data'))
6+
>>> datadir = os.path.realpath(os.path.join(filepath, '../../testing/data'))
87
>>> os.chdir(datadir)
98
109
"""

nipype/interfaces/vista/vista.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
Change directory to provide relative paths for doctests
66
>>> import os
77
>>> filepath = os.path.dirname( os.path.realpath( __file__ ) )
8-
>>> datadir = os.path.realpath(os.path.join(
9-
filepath, '../../testing/data'))
8+
>>> datadir = os.path.realpath(os.path.join(filepath, '../../testing/data'))
109
>>> os.chdir(datadir)
1110
1211
"""

nipype/utils/filemanip.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,8 +177,7 @@ def fname_presuffix(fname, prefix='', suffix='', newpath=None, use_ext=True):
177177
'/tmp/prefoopost.nii.gz'
178178
179179
>>> from nipype.interfaces.base import Undefined
180-
>>> fname_presuffix(fname, 'pre', 'post', Undefined) == fname_presuffix(
181-
fname, 'pre', 'post')
180+
>>> fname_presuffix(fname, 'pre', 'post', Undefined) == fname_presuffix(fname, 'pre', 'post')
182181
True
183182
184183
"""

0 commit comments

Comments
 (0)