Skip to content

Commit 497131e

Browse files
committed
Run make check-before-commit.
1 parent d94625b commit 497131e

File tree

10 files changed

+800
-833
lines changed

10 files changed

+800
-833
lines changed

doc/devel/testing_nipype.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ dependencies. Installing software dependencies and downloading the necessary dat
3939
will reduce the number of skip tests.
4040

4141
Some tests in Nipype make use of some images distributed within the `FSL course data
42-
<http://fsl.fmrib.ox.ac.uk/fslcourse/>`_. This reduced version of the package can be downloaded `here
42+
<http://fsl.fmrib.ox.ac.uk/fslcourse/>`_. This reduced version of the package can be downloaded `here
4343
<https://3552243d5be815c1b09152da6525cb8fe7b900a6.googledrive.com/host/0BxI12kyv2olZVUswazA3NkFvOXM/nipype-fsl_course_data.tar.gz>`_.
4444
To enable the tests depending on these data, just unpack the targz file and set the :code:`FSL_COURSE_DATA` environment
4545
variable to point to that folder.

nipype/algorithms/tests/test_auto_ErrorMap.py

Lines changed: 0 additions & 35 deletions
This file was deleted.

nipype/algorithms/tests/test_auto_Overlap.py

Lines changed: 0 additions & 47 deletions
This file was deleted.

nipype/algorithms/tests/test_auto_TSNR.py renamed to nipype/algorithms/tests/test_auto_TCompCor.py

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,39 @@
11
# AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT
22
from ...testing import assert_equal
3-
from ..misc import TSNR
3+
from ..confounds import TCompCor
44

55

6-
def test_TSNR_inputs():
7-
input_map = dict(detrended_file=dict(hash_files=False,
6+
def test_TCompCor_inputs():
7+
input_map = dict(components_file=dict(mandatory=False,
88
usedefault=True,
99
),
1010
ignore_exception=dict(nohash=True,
1111
usedefault=True,
1212
),
13-
in_file=dict(mandatory=True,
13+
mask_file=dict(mandatory=False,
1414
),
15-
mean_file=dict(hash_files=False,
16-
usedefault=True,
15+
num_components=dict(usedefault=True,
1716
),
18-
regress_poly=dict(),
19-
stddev_file=dict(hash_files=False,
20-
usedefault=True,
17+
percentile_threshold=dict(usedefault=True,
2118
),
22-
tsnr_file=dict(hash_files=False,
23-
usedefault=True,
19+
realigned_file=dict(mandatory=True,
20+
),
21+
regress_poly_degree=dict(usedefault=True,
22+
),
23+
use_regress_poly=dict(usedefault=True,
2424
),
2525
)
26-
inputs = TSNR.input_spec()
26+
inputs = TCompCor.input_spec()
2727

2828
for key, metadata in list(input_map.items()):
2929
for metakey, value in list(metadata.items()):
3030
yield assert_equal, getattr(inputs.traits()[key], metakey), value
3131

3232

33-
def test_TSNR_outputs():
34-
output_map = dict(detrended_file=dict(),
35-
mean_file=dict(),
36-
stddev_file=dict(),
37-
tsnr_file=dict(),
33+
def test_TCompCor_outputs():
34+
output_map = dict(components_file=dict(),
3835
)
39-
outputs = TSNR.output_spec()
36+
outputs = TCompCor.output_spec()
4037

4138
for key, metadata in list(output_map.items()):
4239
for metakey, value in list(metadata.items()):

nipype/interfaces/afni/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@
1515
Fim, BlurInMask, Autobox, TCorrMap, Bandpass, Retroicor,
1616
TCorrelate, TCorr1D, BrickStat, ROIStats, AutoTcorrelate,
1717
AFNItoNIFTI, Eval, Means, Hist, FWHMx, OutlierCount,
18-
QualityIndex)
18+
QualityIndex, Notes)
1919
from .svm import (SVMTest, SVMTrain)

nipype/interfaces/afni/preprocess.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3058,7 +3058,7 @@ class Notes(CommandLine):
30583058
_cmd = '3dNotes'
30593059
input_spec = NotesInputSpec
30603060
output_spec = AFNICommandOutputSpec
3061-
3061+
30623062
def _list_outputs(self):
30633063
outputs = self.output_spec().get()
30643064
outputs["out_file"] = os.path.abspath(self.inputs.in_file)
Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
# AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT
2+
from ....testing import assert_equal
3+
from ..preprocess import Notes
4+
5+
6+
def test_Notes_inputs():
7+
input_map = dict(add=dict(argstr="-a '%s'",
8+
),
9+
add_history=dict(argstr="-h '%s'",
10+
xor=[u'rep_history'],
11+
),
12+
args=dict(argstr='%s',
13+
),
14+
delete=dict(argstr='-d %d',
15+
),
16+
environ=dict(nohash=True,
17+
usedefault=True,
18+
),
19+
ignore_exception=dict(nohash=True,
20+
usedefault=True,
21+
),
22+
in_file=dict(argstr='%s',
23+
copyfile=False,
24+
mandatory=True,
25+
position=-1,
26+
),
27+
out_file=dict(argstr='%s',
28+
),
29+
outputtype=dict(),
30+
rep_history=dict(argstr="-HH '%s'",
31+
xor=[u'add_history'],
32+
),
33+
ses=dict(argstr='-ses',
34+
),
35+
terminal_output=dict(nohash=True,
36+
),
37+
)
38+
inputs = Notes.input_spec()
39+
40+
for key, metadata in list(input_map.items()):
41+
for metakey, value in list(metadata.items()):
42+
yield assert_equal, getattr(inputs.traits()[key], metakey), value
43+
44+
45+
def test_Notes_outputs():
46+
output_map = dict(out_file=dict(),
47+
)
48+
outputs = Notes.output_spec()
49+
50+
for key, metadata in list(output_map.items()):
51+
for metakey, value in list(metadata.items()):
52+
yield assert_equal, getattr(outputs.traits()[key], metakey), value

nipype/interfaces/fsl/base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
2323
Examples
2424
--------
25-
See the docstrings of the individual classes for examples.
25+
See the docstrings of the individual classes for examples.
2626
2727
"""
2828
from __future__ import print_function, division, unicode_literals, absolute_import

0 commit comments

Comments
 (0)