Skip to content

Commit b27b8c2

Browse files
committed
ran make specs, this changed several files, but did not generate a test.
1 parent 4a19e2d commit b27b8c2

13 files changed

+51
-119
lines changed

nipype/interfaces/camino/tests/test_auto_ProcStreamlines.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,18 +56,14 @@ def test_ProcStreamlines_inputs():
5656
position=-1,
5757
),
5858
outputacm=dict(argstr='-outputacm',
59-
requires=['outputroot', 'seedfile'],
6059
),
6160
outputcbs=dict(argstr='-outputcbs',
62-
requires=['outputroot', 'targetfile', 'seedfile'],
6361
),
6462
outputcp=dict(argstr='-outputcp',
65-
requires=['outputroot', 'seedfile'],
6663
),
6764
outputroot=dict(argstr='-outputroot %s',
6865
),
6966
outputsc=dict(argstr='-outputsc',
70-
requires=['outputroot', 'seedfile'],
7167
),
7268
outputtracts=dict(argstr='-outputtracts',
7369
),
@@ -107,8 +103,7 @@ def test_ProcStreamlines_inputs():
107103
yield assert_equal, getattr(inputs.traits()[key], metakey), value
108104

109105
def test_ProcStreamlines_outputs():
110-
output_map = dict(outputroot_files=dict(),
111-
proc=dict(),
106+
output_map = dict(proc=dict(),
112107
)
113108
outputs = ProcStreamlines.output_spec()
114109

nipype/interfaces/fsl/tests/test_auto_ApplyTOPUP.py

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,28 +16,20 @@ def test_ApplyTOPUP_inputs():
1616
ignore_exception=dict(nohash=True,
1717
usedefault=True,
1818
),
19-
in_files=dict(argstr='--imain=%s',
19+
in_files=dict(argstr='%s',
2020
mandatory=True,
21-
sep=',',
2221
),
23-
in_index=dict(argstr='--inindex=%s',
22+
in_index=dict(argstr='%s',
2423
mandatory=True,
25-
sep=',',
2624
),
27-
in_topup_fieldcoef=dict(argstr='--topup=%s',
28-
copyfile=False,
29-
requires=['in_topup_movpar'],
30-
),
31-
in_topup_movpar=dict(copyfile=False,
32-
requires=['in_topup_fieldcoef'],
25+
in_topup=dict(argstr='--topup=%s',
26+
mandatory=True,
3327
),
3428
interp=dict(argstr='--interp=%s',
3529
),
3630
method=dict(argstr='--method=%s',
3731
),
38-
out_corrected=dict(argstr='--out=%s',
39-
name_source=['in_files'],
40-
name_template='%s_corrected',
32+
out_base=dict(argstr='--out=%s',
4133
),
4234
output_type=dict(),
4335
terminal_output=dict(mandatory=True,

nipype/interfaces/fsl/tests/test_auto_DTIFit.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ def test_DTIFit_inputs():
1717
mandatory=True,
1818
position=3,
1919
),
20-
cni=dict(argstr='--cni=%s',
20+
cni=dict(argstr='-cni %s',
2121
),
2222
dwi=dict(argstr='-k %s',
2323
mandatory=True,

nipype/interfaces/fsl/tests/test_auto_Eddy.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,7 @@ def test_Eddy_inputs():
3333
in_mask=dict(argstr='--mask=%s',
3434
mandatory=True,
3535
),
36-
in_topup_fieldcoef=dict(argstr='--topup=%s',
37-
copyfile=False,
38-
requires=['in_topup_movpar'],
39-
),
40-
in_topup_movpar=dict(copyfile=False,
41-
requires=['in_topup_fieldcoef'],
36+
in_topup=dict(argstr='--topup=%s',
4237
),
4338
method=dict(argstr='--resamp=%s',
4439
),

nipype/interfaces/fsl/tests/test_auto_FIRST.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ def test_FIRST_inputs():
1818
usedefault=True,
1919
),
2020
in_file=dict(argstr='-i %s',
21-
copyfile=False,
2221
mandatory=True,
2322
position=-2,
2423
),

nipype/interfaces/fsl/tests/test_auto_MELODIC.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ def test_MELODIC_inputs():
3232
in_files=dict(argstr='-i %s',
3333
mandatory=True,
3434
position=0,
35-
sep=',',
3635
),
3736
log_power=dict(argstr='--logPower',
3837
),

nipype/interfaces/fsl/tests/test_auto_TOPUP.py

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,8 @@ def test_TOPUP_inputs():
88
config=dict(argstr='--config=%s',
99
usedefault=True,
1010
),
11-
encoding_direction=dict(argstr='--datain=%s',
12-
mandatory=True,
13-
requires=['readout_times'],
14-
xor=['encoding_file'],
15-
),
11+
encoding_direction=dict(),
1612
encoding_file=dict(argstr='--datain=%s',
17-
mandatory=True,
18-
xor=['encoding_direction'],
1913
),
2014
environ=dict(nohash=True,
2115
usedefault=True,
@@ -39,31 +33,15 @@ def test_TOPUP_inputs():
3933
numprec=dict(argstr='--numprec=%s',
4034
),
4135
out_base=dict(argstr='--out=%s',
42-
hash_files=False,
43-
name_source=['in_file'],
44-
name_template='%s_base',
4536
),
4637
out_corrected=dict(argstr='--iout=%s',
47-
hash_files=False,
48-
name_source=['in_file'],
49-
name_template='%s_corrected',
5038
),
5139
out_field=dict(argstr='--fout=%s',
52-
hash_files=False,
53-
name_source=['in_file'],
54-
name_template='%s_field',
5540
),
5641
out_logfile=dict(argstr='--logout=%s',
57-
hash_files=False,
58-
keep_extension=True,
59-
name_source=['in_file'],
60-
name_template='%s_topup.log',
6142
),
6243
output_type=dict(),
63-
readout_times=dict(mandatory=True,
64-
requires=['encoding_direction'],
65-
xor=['encoding_file'],
66-
),
44+
readout_times=dict(),
6745
regrid=dict(argstr='--regrid=%d',
6846
),
6947
scale=dict(argstr='--scale=%d',
@@ -91,6 +69,7 @@ def test_TOPUP_outputs():
9169
out_fieldcoef=dict(),
9270
out_logfile=dict(),
9371
out_movpar=dict(),
72+
out_topup=dict(),
9473
)
9574
outputs = TOPUP.output_spec()
9675

nipype/interfaces/mrtrix/tests/test_auto_DiffusionTensorStreamlineTrack.py

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,12 @@ def test_DiffusionTensorStreamlineTrack_inputs():
1616
usedefault=True,
1717
),
1818
exclude_file=dict(argstr='-exclude %s',
19-
xor=['exclude_file', 'exclude_spec'],
19+
position=2,
2020
),
21-
exclude_spec=dict(argstr='-exclude %s',
21+
exclude_spec=dict(argstr='-seed %s',
2222
position=2,
2323
sep=',',
2424
units='mm',
25-
xor=['exclude_file', 'exclude_spec'],
2625
),
2726
gradient_encoding_file=dict(argstr='-grad %s',
2827
mandatory=True,
@@ -36,13 +35,12 @@ def test_DiffusionTensorStreamlineTrack_inputs():
3635
position=-2,
3736
),
3837
include_file=dict(argstr='-include %s',
39-
xor=['include_file', 'include_spec'],
38+
position=2,
4039
),
41-
include_spec=dict(argstr='-include %s',
40+
include_spec=dict(argstr='-seed %s',
4241
position=2,
4342
sep=',',
4443
units='mm',
45-
xor=['include_file', 'include_spec'],
4644
),
4745
initial_cutoff_value=dict(argstr='-initcutoff %s',
4846
units='NA',
@@ -54,14 +52,13 @@ def test_DiffusionTensorStreamlineTrack_inputs():
5452
position=-3,
5553
usedefault=True,
5654
),
57-
mask_file=dict(argstr='-mask %s',
58-
xor=['mask_file', 'mask_spec'],
55+
mask_file=dict(argstr='-exclude %s',
56+
position=2,
5957
),
60-
mask_spec=dict(argstr='-mask %s',
58+
mask_spec=dict(argstr='-seed %s',
6159
position=2,
6260
sep=',',
6361
units='mm',
64-
xor=['mask_file', 'mask_spec'],
6562
),
6663
maximum_number_of_tracks=dict(argstr='-maxnum %d',
6764
),
@@ -77,24 +74,21 @@ def test_DiffusionTensorStreamlineTrack_inputs():
7774
no_mask_interpolation=dict(argstr='-nomaskinterp',
7875
),
7976
out_file=dict(argstr='%s',
80-
name_source=['in_file'],
81-
name_template='%s_tracked.tck',
82-
output_name='tracked.tck',
77+
genfile=True,
8378
position=-1,
8479
),
8580
seed_file=dict(argstr='-seed %s',
86-
xor=['seed_file', 'seed_spec'],
81+
position=2,
8782
),
8883
seed_spec=dict(argstr='-seed %s',
8984
position=2,
9085
sep=',',
9186
units='mm',
92-
xor=['seed_file', 'seed_spec'],
9387
),
9488
step_size=dict(argstr='-step %s',
9589
units='mm',
9690
),
97-
stop=dict(argstr='-stop',
91+
stop=dict(argstr='-gzip',
9892
),
9993
terminal_output=dict(mandatory=True,
10094
nohash=True,

nipype/interfaces/mrtrix/tests/test_auto_ProbabilisticSphericallyDeconvolutedStreamlineTrack.py

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,12 @@ def test_ProbabilisticSphericallyDeconvolutedStreamlineTrack_inputs():
1616
usedefault=True,
1717
),
1818
exclude_file=dict(argstr='-exclude %s',
19-
xor=['exclude_file', 'exclude_spec'],
19+
position=2,
2020
),
21-
exclude_spec=dict(argstr='-exclude %s',
21+
exclude_spec=dict(argstr='-seed %s',
2222
position=2,
2323
sep=',',
2424
units='mm',
25-
xor=['exclude_file', 'exclude_spec'],
2625
),
2726
ignore_exception=dict(nohash=True,
2827
usedefault=True,
@@ -32,13 +31,12 @@ def test_ProbabilisticSphericallyDeconvolutedStreamlineTrack_inputs():
3231
position=-2,
3332
),
3433
include_file=dict(argstr='-include %s',
35-
xor=['include_file', 'include_spec'],
34+
position=2,
3635
),
37-
include_spec=dict(argstr='-include %s',
36+
include_spec=dict(argstr='-seed %s',
3837
position=2,
3938
sep=',',
4039
units='mm',
41-
xor=['include_file', 'include_spec'],
4240
),
4341
initial_cutoff_value=dict(argstr='-initcutoff %s',
4442
units='NA',
@@ -50,14 +48,13 @@ def test_ProbabilisticSphericallyDeconvolutedStreamlineTrack_inputs():
5048
position=-3,
5149
usedefault=True,
5250
),
53-
mask_file=dict(argstr='-mask %s',
54-
xor=['mask_file', 'mask_spec'],
51+
mask_file=dict(argstr='-exclude %s',
52+
position=2,
5553
),
56-
mask_spec=dict(argstr='-mask %s',
54+
mask_spec=dict(argstr='-seed %s',
5755
position=2,
5856
sep=',',
5957
units='mm',
60-
xor=['mask_file', 'mask_spec'],
6158
),
6259
maximum_number_of_tracks=dict(argstr='-maxnum %d',
6360
),
@@ -75,24 +72,21 @@ def test_ProbabilisticSphericallyDeconvolutedStreamlineTrack_inputs():
7572
no_mask_interpolation=dict(argstr='-nomaskinterp',
7673
),
7774
out_file=dict(argstr='%s',
78-
name_source=['in_file'],
79-
name_template='%s_tracked.tck',
80-
output_name='tracked.tck',
75+
genfile=True,
8176
position=-1,
8277
),
8378
seed_file=dict(argstr='-seed %s',
84-
xor=['seed_file', 'seed_spec'],
79+
position=2,
8580
),
8681
seed_spec=dict(argstr='-seed %s',
8782
position=2,
8883
sep=',',
8984
units='mm',
90-
xor=['seed_file', 'seed_spec'],
9185
),
9286
step_size=dict(argstr='-step %s',
9387
units='mm',
9488
),
95-
stop=dict(argstr='-stop',
89+
stop=dict(argstr='-gzip',
9690
),
9791
terminal_output=dict(mandatory=True,
9892
nohash=True,

nipype/interfaces/mrtrix/tests/test_auto_SphericallyDeconvolutedStreamlineTrack.py

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,12 @@ def test_SphericallyDeconvolutedStreamlineTrack_inputs():
1616
usedefault=True,
1717
),
1818
exclude_file=dict(argstr='-exclude %s',
19-
xor=['exclude_file', 'exclude_spec'],
19+
position=2,
2020
),
21-
exclude_spec=dict(argstr='-exclude %s',
21+
exclude_spec=dict(argstr='-seed %s',
2222
position=2,
2323
sep=',',
2424
units='mm',
25-
xor=['exclude_file', 'exclude_spec'],
2625
),
2726
ignore_exception=dict(nohash=True,
2827
usedefault=True,
@@ -32,13 +31,12 @@ def test_SphericallyDeconvolutedStreamlineTrack_inputs():
3231
position=-2,
3332
),
3433
include_file=dict(argstr='-include %s',
35-
xor=['include_file', 'include_spec'],
34+
position=2,
3635
),
37-
include_spec=dict(argstr='-include %s',
36+
include_spec=dict(argstr='-seed %s',
3837
position=2,
3938
sep=',',
4039
units='mm',
41-
xor=['include_file', 'include_spec'],
4240
),
4341
initial_cutoff_value=dict(argstr='-initcutoff %s',
4442
units='NA',
@@ -50,14 +48,13 @@ def test_SphericallyDeconvolutedStreamlineTrack_inputs():
5048
position=-3,
5149
usedefault=True,
5250
),
53-
mask_file=dict(argstr='-mask %s',
54-
xor=['mask_file', 'mask_spec'],
51+
mask_file=dict(argstr='-exclude %s',
52+
position=2,
5553
),
56-
mask_spec=dict(argstr='-mask %s',
54+
mask_spec=dict(argstr='-seed %s',
5755
position=2,
5856
sep=',',
5957
units='mm',
60-
xor=['mask_file', 'mask_spec'],
6158
),
6259
maximum_number_of_tracks=dict(argstr='-maxnum %d',
6360
),
@@ -73,24 +70,21 @@ def test_SphericallyDeconvolutedStreamlineTrack_inputs():
7370
no_mask_interpolation=dict(argstr='-nomaskinterp',
7471
),
7572
out_file=dict(argstr='%s',
76-
name_source=['in_file'],
77-
name_template='%s_tracked.tck',
78-
output_name='tracked.tck',
73+
genfile=True,
7974
position=-1,
8075
),
8176
seed_file=dict(argstr='-seed %s',
82-
xor=['seed_file', 'seed_spec'],
77+
position=2,
8378
),
8479
seed_spec=dict(argstr='-seed %s',
8580
position=2,
8681
sep=',',
8782
units='mm',
88-
xor=['seed_file', 'seed_spec'],
8983
),
9084
step_size=dict(argstr='-step %s',
9185
units='mm',
9286
),
93-
stop=dict(argstr='-stop',
87+
stop=dict(argstr='-gzip',
9488
),
9589
terminal_output=dict(mandatory=True,
9690
nohash=True,

0 commit comments

Comments
 (0)