Skip to content

Commit 5e381b4

Browse files
committed
Merge pull request #1273 from nipy/fix/pep8_auto_tests
Updated auto test files to new PEP8 changes
2 parents 16808ae + 8953eef commit 5e381b4

File tree

576 files changed

+1141
-565
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

576 files changed

+1141
-565
lines changed

examples/test_spm.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
stc.inputs.num_slices = 21
1616
stc.inputs.time_repetition = 1.0
1717
stc.inputs.time_acquisition = 2. - 2. / 32
18-
stc.inputs.slice_order = list(range(21, 0, -1))
19-
stc.inputs.ref_slice = 10
18+
stc.inputs.slice_order = list(range(21, 0, -1))
19+
stc.inputs.ref_slice = 10
2020

2121
realign_estimate = pe.Node(interface=spm.Realign(), name='realign_estimate')
2222
realign_estimate.inputs.jobtype = "estimate"
@@ -50,8 +50,8 @@
5050
stc.inputs.num_slices = 21
5151
stc.inputs.time_repetition = 1.0
5252
stc.inputs.time_acquisition = 2. - 2. / 32
53-
stc.inputs.slice_order = list(range(21, 0, -1))
54-
stc.inputs.ref_slice = 10
53+
stc.inputs.slice_order = list(range(21, 0, -1))
54+
stc.inputs.ref_slice = 10
5555

5656
realign_estimate = pe.Node(interface=spm.Realign(), name='realign_estimate')
5757
realign_estimate.inputs.jobtype = "estimate"

nipype/algorithms/tests/test_auto_AddCSVColumn.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
from ...testing import assert_equal
33
from ..misc import AddCSVColumn
44

5+
56
def test_AddCSVColumn_inputs():
67
input_map = dict(extra_column_heading=dict(),
78
extra_field=dict(),
@@ -16,6 +17,7 @@ def test_AddCSVColumn_inputs():
1617
for metakey, value in list(metadata.items()):
1718
yield assert_equal, getattr(inputs.traits()[key], metakey), value
1819

20+
1921
def test_AddCSVColumn_outputs():
2022
output_map = dict(csv_file=dict(),
2123
)
@@ -24,4 +26,3 @@ def test_AddCSVColumn_outputs():
2426
for key, metadata in list(output_map.items()):
2527
for metakey, value in list(metadata.items()):
2628
yield assert_equal, getattr(outputs.traits()[key], metakey), value
27-

nipype/algorithms/tests/test_auto_AddCSVRow.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
from ...testing import assert_equal
33
from ..misc import AddCSVRow
44

5+
56
def test_AddCSVRow_inputs():
67
input_map = dict(_outputs=dict(usedefault=True,
78
),
@@ -17,6 +18,7 @@ def test_AddCSVRow_inputs():
1718
for metakey, value in list(metadata.items()):
1819
yield assert_equal, getattr(inputs.traits()[key], metakey), value
1920

21+
2022
def test_AddCSVRow_outputs():
2123
output_map = dict(csv_file=dict(),
2224
)
@@ -25,4 +27,3 @@ def test_AddCSVRow_outputs():
2527
for key, metadata in list(output_map.items()):
2628
for metakey, value in list(metadata.items()):
2729
yield assert_equal, getattr(outputs.traits()[key], metakey), value
28-

nipype/algorithms/tests/test_auto_AddNoise.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
from ...testing import assert_equal
33
from ..misc import AddNoise
44

5+
56
def test_AddNoise_inputs():
67
input_map = dict(bg_dist=dict(mandatory=True,
78
usedefault=True,
@@ -22,6 +23,7 @@ def test_AddNoise_inputs():
2223
for metakey, value in list(metadata.items()):
2324
yield assert_equal, getattr(inputs.traits()[key], metakey), value
2425

26+
2527
def test_AddNoise_outputs():
2628
output_map = dict(out_file=dict(),
2729
)
@@ -30,4 +32,3 @@ def test_AddNoise_outputs():
3032
for key, metadata in list(output_map.items()):
3133
for metakey, value in list(metadata.items()):
3234
yield assert_equal, getattr(outputs.traits()[key], metakey), value
33-

nipype/algorithms/tests/test_auto_ArtifactDetect.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
from ...testing import assert_equal
33
from ..rapidart import ArtifactDetect
44

5+
56
def test_ArtifactDetect_inputs():
67
input_map = dict(bound_by_brainmask=dict(usedefault=True,
78
),
@@ -50,6 +51,7 @@ def test_ArtifactDetect_inputs():
5051
for metakey, value in list(metadata.items()):
5152
yield assert_equal, getattr(inputs.traits()[key], metakey), value
5253

54+
5355
def test_ArtifactDetect_outputs():
5456
output_map = dict(displacement_files=dict(),
5557
intensity_files=dict(),
@@ -64,4 +66,3 @@ def test_ArtifactDetect_outputs():
6466
for key, metadata in list(output_map.items()):
6567
for metakey, value in list(metadata.items()):
6668
yield assert_equal, getattr(outputs.traits()[key], metakey), value
67-

nipype/algorithms/tests/test_auto_CalculateNormalizedMoments.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
from ...testing import assert_equal
33
from ..misc import CalculateNormalizedMoments
44

5+
56
def test_CalculateNormalizedMoments_inputs():
67
input_map = dict(moment=dict(mandatory=True,
78
),
@@ -14,6 +15,7 @@ def test_CalculateNormalizedMoments_inputs():
1415
for metakey, value in list(metadata.items()):
1516
yield assert_equal, getattr(inputs.traits()[key], metakey), value
1617

18+
1719
def test_CalculateNormalizedMoments_outputs():
1820
output_map = dict(moments=dict(),
1921
)
@@ -22,4 +24,3 @@ def test_CalculateNormalizedMoments_outputs():
2224
for key, metadata in list(output_map.items()):
2325
for metakey, value in list(metadata.items()):
2426
yield assert_equal, getattr(outputs.traits()[key], metakey), value
25-

nipype/algorithms/tests/test_auto_ComputeMeshWarp.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
from ...testing import assert_equal
33
from ..mesh import ComputeMeshWarp
44

5+
56
def test_ComputeMeshWarp_inputs():
67
input_map = dict(ignore_exception=dict(nohash=True,
78
usedefault=True,
@@ -25,6 +26,7 @@ def test_ComputeMeshWarp_inputs():
2526
for metakey, value in list(metadata.items()):
2627
yield assert_equal, getattr(inputs.traits()[key], metakey), value
2728

29+
2830
def test_ComputeMeshWarp_outputs():
2931
output_map = dict(distance=dict(),
3032
out_file=dict(),
@@ -35,4 +37,3 @@ def test_ComputeMeshWarp_outputs():
3537
for key, metadata in list(output_map.items()):
3638
for metakey, value in list(metadata.items()):
3739
yield assert_equal, getattr(outputs.traits()[key], metakey), value
38-

nipype/algorithms/tests/test_auto_CreateNifti.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
from ...testing import assert_equal
33
from ..misc import CreateNifti
44

5+
56
def test_CreateNifti_inputs():
67
input_map = dict(affine=dict(),
78
data_file=dict(mandatory=True,
@@ -18,6 +19,7 @@ def test_CreateNifti_inputs():
1819
for metakey, value in list(metadata.items()):
1920
yield assert_equal, getattr(inputs.traits()[key], metakey), value
2021

22+
2123
def test_CreateNifti_outputs():
2224
output_map = dict(nifti_file=dict(),
2325
)
@@ -26,4 +28,3 @@ def test_CreateNifti_outputs():
2628
for key, metadata in list(output_map.items()):
2729
for metakey, value in list(metadata.items()):
2830
yield assert_equal, getattr(outputs.traits()[key], metakey), value
29-

nipype/algorithms/tests/test_auto_Distance.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
from ...testing import assert_equal
33
from ..misc import Distance
44

5+
56
def test_Distance_inputs():
67
input_map = dict(ignore_exception=dict(nohash=True,
78
usedefault=True,
@@ -20,6 +21,7 @@ def test_Distance_inputs():
2021
for metakey, value in list(metadata.items()):
2122
yield assert_equal, getattr(inputs.traits()[key], metakey), value
2223

24+
2325
def test_Distance_outputs():
2426
output_map = dict(distance=dict(),
2527
histogram=dict(),
@@ -31,4 +33,3 @@ def test_Distance_outputs():
3133
for key, metadata in list(output_map.items()):
3234
for metakey, value in list(metadata.items()):
3335
yield assert_equal, getattr(outputs.traits()[key], metakey), value
34-

nipype/algorithms/tests/test_auto_FuzzyOverlap.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
from ...testing import assert_equal
33
from ..misc import FuzzyOverlap
44

5+
56
def test_FuzzyOverlap_inputs():
67
input_map = dict(ignore_exception=dict(nohash=True,
78
usedefault=True,
@@ -21,6 +22,7 @@ def test_FuzzyOverlap_inputs():
2122
for metakey, value in list(metadata.items()):
2223
yield assert_equal, getattr(inputs.traits()[key], metakey), value
2324

25+
2426
def test_FuzzyOverlap_outputs():
2527
output_map = dict(class_fdi=dict(),
2628
class_fji=dict(),
@@ -33,4 +35,3 @@ def test_FuzzyOverlap_outputs():
3335
for key, metadata in list(output_map.items()):
3436
for metakey, value in list(metadata.items()):
3537
yield assert_equal, getattr(outputs.traits()[key], metakey), value
36-

nipype/algorithms/tests/test_auto_Gunzip.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
from ...testing import assert_equal
33
from ..misc import Gunzip
44

5+
56
def test_Gunzip_inputs():
67
input_map = dict(ignore_exception=dict(nohash=True,
78
usedefault=True,
@@ -15,6 +16,7 @@ def test_Gunzip_inputs():
1516
for metakey, value in list(metadata.items()):
1617
yield assert_equal, getattr(inputs.traits()[key], metakey), value
1718

19+
1820
def test_Gunzip_outputs():
1921
output_map = dict(out_file=dict(),
2022
)
@@ -23,4 +25,3 @@ def test_Gunzip_outputs():
2325
for key, metadata in list(output_map.items()):
2426
for metakey, value in list(metadata.items()):
2527
yield assert_equal, getattr(outputs.traits()[key], metakey), value
26-

nipype/algorithms/tests/test_auto_ICC.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
from ...testing import assert_equal
33
from ..icc import ICC
44

5+
56
def test_ICC_inputs():
67
input_map = dict(ignore_exception=dict(nohash=True,
78
usedefault=True,
@@ -17,6 +18,7 @@ def test_ICC_inputs():
1718
for metakey, value in list(metadata.items()):
1819
yield assert_equal, getattr(inputs.traits()[key], metakey), value
1920

21+
2022
def test_ICC_outputs():
2123
output_map = dict(icc_map=dict(),
2224
session_var_map=dict(),
@@ -27,4 +29,3 @@ def test_ICC_outputs():
2729
for key, metadata in list(output_map.items()):
2830
for metakey, value in list(metadata.items()):
2931
yield assert_equal, getattr(outputs.traits()[key], metakey), value
30-

nipype/algorithms/tests/test_auto_Matlab2CSV.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
from ...testing import assert_equal
33
from ..misc import Matlab2CSV
44

5+
56
def test_Matlab2CSV_inputs():
67
input_map = dict(in_file=dict(mandatory=True,
78
),
@@ -14,6 +15,7 @@ def test_Matlab2CSV_inputs():
1415
for metakey, value in list(metadata.items()):
1516
yield assert_equal, getattr(inputs.traits()[key], metakey), value
1617

18+
1719
def test_Matlab2CSV_outputs():
1820
output_map = dict(csv_files=dict(),
1921
)
@@ -22,4 +24,3 @@ def test_Matlab2CSV_outputs():
2224
for key, metadata in list(output_map.items()):
2325
for metakey, value in list(metadata.items()):
2426
yield assert_equal, getattr(outputs.traits()[key], metakey), value
25-

nipype/algorithms/tests/test_auto_MergeCSVFiles.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
from ...testing import assert_equal
33
from ..misc import MergeCSVFiles
44

5+
56
def test_MergeCSVFiles_inputs():
67
input_map = dict(column_headings=dict(),
78
extra_column_heading=dict(),
@@ -20,6 +21,7 @@ def test_MergeCSVFiles_inputs():
2021
for metakey, value in list(metadata.items()):
2122
yield assert_equal, getattr(inputs.traits()[key], metakey), value
2223

24+
2325
def test_MergeCSVFiles_outputs():
2426
output_map = dict(csv_file=dict(),
2527
)
@@ -28,4 +30,3 @@ def test_MergeCSVFiles_outputs():
2830
for key, metadata in list(output_map.items()):
2931
for metakey, value in list(metadata.items()):
3032
yield assert_equal, getattr(outputs.traits()[key], metakey), value
31-

nipype/algorithms/tests/test_auto_MergeROIs.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
from ...testing import assert_equal
33
from ..misc import MergeROIs
44

5+
56
def test_MergeROIs_inputs():
67
input_map = dict(in_files=dict(),
78
in_index=dict(),
@@ -13,6 +14,7 @@ def test_MergeROIs_inputs():
1314
for metakey, value in list(metadata.items()):
1415
yield assert_equal, getattr(inputs.traits()[key], metakey), value
1516

17+
1618
def test_MergeROIs_outputs():
1719
output_map = dict(merged_file=dict(),
1820
)
@@ -21,4 +23,3 @@ def test_MergeROIs_outputs():
2123
for key, metadata in list(output_map.items()):
2224
for metakey, value in list(metadata.items()):
2325
yield assert_equal, getattr(outputs.traits()[key], metakey), value
24-

nipype/algorithms/tests/test_auto_MeshWarpMaths.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
from ...testing import assert_equal
33
from ..mesh import MeshWarpMaths
44

5+
56
def test_MeshWarpMaths_inputs():
67
input_map = dict(float_trait=dict(),
78
ignore_exception=dict(nohash=True,
@@ -24,6 +25,7 @@ def test_MeshWarpMaths_inputs():
2425
for metakey, value in list(metadata.items()):
2526
yield assert_equal, getattr(inputs.traits()[key], metakey), value
2627

28+
2729
def test_MeshWarpMaths_outputs():
2830
output_map = dict(out_file=dict(),
2931
out_warp=dict(),
@@ -33,4 +35,3 @@ def test_MeshWarpMaths_outputs():
3335
for key, metadata in list(output_map.items()):
3436
for metakey, value in list(metadata.items()):
3537
yield assert_equal, getattr(outputs.traits()[key], metakey), value
36-

nipype/algorithms/tests/test_auto_ModifyAffine.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
from ...testing import assert_equal
33
from ..misc import ModifyAffine
44

5+
56
def test_ModifyAffine_inputs():
67
input_map = dict(ignore_exception=dict(nohash=True,
78
usedefault=True,
@@ -17,6 +18,7 @@ def test_ModifyAffine_inputs():
1718
for metakey, value in list(metadata.items()):
1819
yield assert_equal, getattr(inputs.traits()[key], metakey), value
1920

21+
2022
def test_ModifyAffine_outputs():
2123
output_map = dict(transformed_volumes=dict(),
2224
)
@@ -25,4 +27,3 @@ def test_ModifyAffine_outputs():
2527
for key, metadata in list(output_map.items()):
2628
for metakey, value in list(metadata.items()):
2729
yield assert_equal, getattr(outputs.traits()[key], metakey), value
28-

nipype/algorithms/tests/test_auto_NormalizeProbabilityMapSet.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
from ...testing import assert_equal
33
from ..misc import NormalizeProbabilityMapSet
44

5+
56
def test_NormalizeProbabilityMapSet_inputs():
67
input_map = dict(in_files=dict(),
78
in_mask=dict(),
@@ -12,6 +13,7 @@ def test_NormalizeProbabilityMapSet_inputs():
1213
for metakey, value in list(metadata.items()):
1314
yield assert_equal, getattr(inputs.traits()[key], metakey), value
1415

16+
1517
def test_NormalizeProbabilityMapSet_outputs():
1618
output_map = dict(out_files=dict(),
1719
)
@@ -20,4 +22,3 @@ def test_NormalizeProbabilityMapSet_outputs():
2022
for key, metadata in list(output_map.items()):
2123
for metakey, value in list(metadata.items()):
2224
yield assert_equal, getattr(outputs.traits()[key], metakey), value
23-

nipype/algorithms/tests/test_auto_P2PDistance.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
from ...testing import assert_equal
33
from ..mesh import P2PDistance
44

5+
56
def test_P2PDistance_inputs():
67
input_map = dict(ignore_exception=dict(nohash=True,
78
usedefault=True,
@@ -25,6 +26,7 @@ def test_P2PDistance_inputs():
2526
for metakey, value in list(metadata.items()):
2627
yield assert_equal, getattr(inputs.traits()[key], metakey), value
2728

29+
2830
def test_P2PDistance_outputs():
2931
output_map = dict(distance=dict(),
3032
out_file=dict(),
@@ -35,4 +37,3 @@ def test_P2PDistance_outputs():
3537
for key, metadata in list(output_map.items()):
3638
for metakey, value in list(metadata.items()):
3739
yield assert_equal, getattr(outputs.traits()[key], metakey), value
38-

0 commit comments

Comments
 (0)