Merge pull request #771 from satra/fix/makespec

auto-spec generation now sorts keys to track changes better
nipy · Jan 23, 2014 · 9ec0774 · 9ec0774
2 parents cf81228 + 95ca57f
commit 9ec0774
Show file tree

Hide file tree

Showing 387 changed files with 9,294 additions and 8,155 deletions.
diff --git a/nipype/algorithms/tests/test_auto_AddCSVColumn.py b/nipype/algorithms/tests/test_auto_AddCSVColumn.py
@@ -1,19 +1,21 @@
 # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT
 from nipype.testing import assert_equal
 from nipype.algorithms.misc import AddCSVColumn
+
 def test_AddCSVColumn_inputs():
     input_map = dict(extra_column_heading=dict(),
     extra_field=dict(),
-    out_file=dict(usedefault=True,
-    ),
     in_file=dict(mandatory=True,
     ),
+    out_file=dict(usedefault=True,
+    ),
     )
     inputs = AddCSVColumn.input_spec()
 
     for key, metadata in input_map.items():
         for metakey, value in metadata.items():
             yield assert_equal, getattr(inputs.traits()[key], metakey), value
+
 def test_AddCSVColumn_outputs():
     output_map = dict(csv_file=dict(),
     )
@@ -22,3 +24,4 @@ def test_AddCSVColumn_outputs():
     for key, metadata in output_map.items():
         for metakey, value in metadata.items():
             yield assert_equal, getattr(outputs.traits()[key], metakey), value
+
diff --git a/nipype/algorithms/tests/test_auto_ArtifactDetect.py b/nipype/algorithms/tests/test_auto_ArtifactDetect.py
@@ -1,64 +1,67 @@
 # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT
 from nipype.testing import assert_equal
 from nipype.algorithms.rapidart import ArtifactDetect
+
 def test_ArtifactDetect_inputs():
-    input_map = dict(ignore_exception=dict(nohash=True,
-    usedefault=True,
+    input_map = dict(bound_by_brainmask=dict(usedefault=True,
     ),
-    plot_type=dict(usedefault=True,
+    global_threshold=dict(usedefault=True,
     ),
-    mask_type=dict(mandatory=True,
+    ignore_exception=dict(nohash=True,
+    usedefault=True,
     ),
+    intersect_mask=dict(),
+    mask_file=dict(),
     mask_threshold=dict(),
-    parameter_source=dict(mandatory=True,
+    mask_type=dict(mandatory=True,
     ),
-    translation_threshold=dict(mandatory=True,
-    xor=['norm_threshold'],
+    norm_threshold=dict(mandatory=True,
+    xor=['rotation_threshold', 'translation_threshold'],
     ),
-    global_threshold=dict(usedefault=True,
+    parameter_source=dict(mandatory=True,
     ),
-    bound_by_brainmask=dict(usedefault=True,
+    plot_type=dict(usedefault=True,
     ),
     realigned_files=dict(mandatory=True,
     ),
+    realignment_parameters=dict(mandatory=True,
+    ),
     rotation_threshold=dict(mandatory=True,
     xor=['norm_threshold'],
     ),
     save_plot=dict(usedefault=True,
     ),
-    use_differences=dict(minlen=2,
-    maxlen=2,
-    usedefault=True,
-    ),
-    norm_threshold=dict(mandatory=True,
-    xor=['rotation_threshold', 'translation_threshold'],
+    translation_threshold=dict(mandatory=True,
+    xor=['norm_threshold'],
     ),
-    zintensity_threshold=dict(mandatory=True,
+    use_differences=dict(maxlen=2,
+    minlen=2,
+    usedefault=True,
     ),
     use_norm=dict(requires=['norm_threshold'],
     usedefault=True,
     ),
-    mask_file=dict(),
-    intersect_mask=dict(),
-    realignment_parameters=dict(mandatory=True,
+    zintensity_threshold=dict(mandatory=True,
     ),
     )
     inputs = ArtifactDetect.input_spec()
 
     for key, metadata in input_map.items():
         for metakey, value in metadata.items():
             yield assert_equal, getattr(inputs.traits()[key], metakey), value
+
 def test_ArtifactDetect_outputs():
     output_map = dict(displacement_files=dict(),
-    outlier_files=dict(),
-    mask_files=dict(),
     intensity_files=dict(),
+    mask_files=dict(),
     norm_files=dict(),
-    statistic_files=dict(),
+    outlier_files=dict(),
     plot_files=dict(),
+    statistic_files=dict(),
     )
     outputs = ArtifactDetect.output_spec()
 
     for key, metadata in output_map.items():
         for metakey, value in metadata.items():
             yield assert_equal, getattr(outputs.traits()[key], metakey), value
+
diff --git a/nipype/algorithms/tests/test_auto_CalculateNormalizedMoments.py b/nipype/algorithms/tests/test_auto_CalculateNormalizedMoments.py
@@ -1,6 +1,7 @@
 # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT
 from nipype.testing import assert_equal
 from nipype.algorithms.misc import CalculateNormalizedMoments
+
 def test_CalculateNormalizedMoments_inputs():
     input_map = dict(moment=dict(mandatory=True,
     ),
@@ -12,6 +13,7 @@ def test_CalculateNormalizedMoments_inputs():
     for key, metadata in input_map.items():
         for metakey, value in metadata.items():
             yield assert_equal, getattr(inputs.traits()[key], metakey), value
+
 def test_CalculateNormalizedMoments_outputs():
     output_map = dict(moments=dict(),
     )
@@ -20,3 +22,4 @@ def test_CalculateNormalizedMoments_outputs():
     for key, metadata in output_map.items():
         for metakey, value in metadata.items():
             yield assert_equal, getattr(outputs.traits()[key], metakey), value
+
diff --git a/nipype/algorithms/tests/test_auto_CreateNifti.py b/nipype/algorithms/tests/test_auto_CreateNifti.py
@@ -1,21 +1,23 @@
 # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT
 from nipype.testing import assert_equal
 from nipype.algorithms.misc import CreateNifti
+
 def test_CreateNifti_inputs():
-    input_map = dict(ignore_exception=dict(nohash=True,
-    usedefault=True,
-    ),
+    input_map = dict(affine=dict(),
     data_file=dict(mandatory=True,
     ),
-    affine=dict(),
     header_file=dict(mandatory=True,
     ),
+    ignore_exception=dict(nohash=True,
+    usedefault=True,
+    ),
     )
     inputs = CreateNifti.input_spec()
 
     for key, metadata in input_map.items():
         for metakey, value in metadata.items():
             yield assert_equal, getattr(inputs.traits()[key], metakey), value
+
 def test_CreateNifti_outputs():
     output_map = dict(nifti_file=dict(),
     )
@@ -24,3 +26,4 @@ def test_CreateNifti_outputs():
     for key, metadata in output_map.items():
         for metakey, value in metadata.items():
             yield assert_equal, getattr(outputs.traits()[key], metakey), value
+
diff --git a/nipype/algorithms/tests/test_auto_Distance.py b/nipype/algorithms/tests/test_auto_Distance.py
@@ -1,15 +1,16 @@
 # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT
 from nipype.testing import assert_equal
 from nipype.algorithms.misc import Distance
+
 def test_Distance_inputs():
     input_map = dict(ignore_exception=dict(nohash=True,
     usedefault=True,
     ),
-    volume1=dict(mandatory=True,
-    ),
+    mask_volume=dict(),
     method=dict(usedefault=True,
     ),
-    mask_volume=dict(),
+    volume1=dict(mandatory=True,
+    ),
     volume2=dict(mandatory=True,
     ),
     )
@@ -18,14 +19,16 @@ def test_Distance_inputs():
     for key, metadata in input_map.items():
         for metakey, value in metadata.items():
             yield assert_equal, getattr(inputs.traits()[key], metakey), value
+
 def test_Distance_outputs():
     output_map = dict(distance=dict(),
-    point2=dict(),
     histogram=dict(),
     point1=dict(),
+    point2=dict(),
     )
     outputs = Distance.output_spec()
 
     for key, metadata in output_map.items():
         for metakey, value in metadata.items():
             yield assert_equal, getattr(outputs.traits()[key], metakey), value
+
diff --git a/nipype/algorithms/tests/test_auto_FuzzyOverlap.py b/nipype/algorithms/tests/test_auto_FuzzyOverlap.py
@@ -1,33 +1,36 @@
 # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT
 from nipype.testing import assert_equal
 from nipype.algorithms.misc import FuzzyOverlap
+
 def test_FuzzyOverlap_inputs():
     input_map = dict(ignore_exception=dict(nohash=True,
     usedefault=True,
     ),
-    weighting=dict(usedefault=True,
+    in_ref=dict(mandatory=True,
     ),
     in_tst=dict(mandatory=True,
     ),
     out_file=dict(usedefault=True,
     ),
-    in_ref=dict(mandatory=True,
+    weighting=dict(usedefault=True,
     ),
     )
     inputs = FuzzyOverlap.input_spec()
 
     for key, metadata in input_map.items():
         for metakey, value in metadata.items():
             yield assert_equal, getattr(inputs.traits()[key], metakey), value
+
 def test_FuzzyOverlap_outputs():
-    output_map = dict(class_fji=dict(),
-    class_fdi=dict(),
-    diff_file=dict(),
+    output_map = dict(class_fdi=dict(),
+    class_fji=dict(),
     dice=dict(),
+    diff_file=dict(),
     jaccard=dict(),
     )
     outputs = FuzzyOverlap.output_spec()
 
     for key, metadata in output_map.items():
         for metakey, value in metadata.items():
             yield assert_equal, getattr(outputs.traits()[key], metakey), value
+
diff --git a/nipype/algorithms/tests/test_auto_Gunzip.py b/nipype/algorithms/tests/test_auto_Gunzip.py
@@ -1,6 +1,7 @@
 # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT
 from nipype.testing import assert_equal
 from nipype.algorithms.misc import Gunzip
+
 def test_Gunzip_inputs():
     input_map = dict(ignore_exception=dict(nohash=True,
     usedefault=True,
@@ -13,6 +14,7 @@ def test_Gunzip_inputs():
     for key, metadata in input_map.items():
         for metakey, value in metadata.items():
             yield assert_equal, getattr(inputs.traits()[key], metakey), value
+
 def test_Gunzip_outputs():
     output_map = dict(out_file=dict(),
     )
@@ -21,3 +23,4 @@ def test_Gunzip_outputs():
     for key, metadata in output_map.items():
         for metakey, value in metadata.items():
             yield assert_equal, getattr(outputs.traits()[key], metakey), value
+
diff --git a/nipype/algorithms/tests/test_auto_ICC.py b/nipype/algorithms/tests/test_auto_ICC.py
@@ -1,6 +1,7 @@
 # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT
 from nipype.testing import assert_equal
 from nipype.algorithms.icc import ICC
+
 def test_ICC_inputs():
     input_map = dict(ignore_exception=dict(nohash=True,
     usedefault=True,
@@ -15,13 +16,15 @@ def test_ICC_inputs():
     for key, metadata in input_map.items():
         for metakey, value in metadata.items():
             yield assert_equal, getattr(inputs.traits()[key], metakey), value
+
 def test_ICC_outputs():
-    output_map = dict(session_var_map=dict(),
-    icc_map=dict(),
+    output_map = dict(icc_map=dict(),
+    session_var_map=dict(),
     subject_var_map=dict(),
     )
     outputs = ICC.output_spec()
 
     for key, metadata in output_map.items():
         for metakey, value in metadata.items():
             yield assert_equal, getattr(outputs.traits()[key], metakey), value
+
diff --git a/nipype/algorithms/tests/test_auto_Matlab2CSV.py b/nipype/algorithms/tests/test_auto_Matlab2CSV.py
@@ -1,17 +1,19 @@
 # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT
 from nipype.testing import assert_equal
 from nipype.algorithms.misc import Matlab2CSV
+
 def test_Matlab2CSV_inputs():
-    input_map = dict(reshape_matrix=dict(usedefault=True,
+    input_map = dict(in_file=dict(mandatory=True,
     ),
-    in_file=dict(mandatory=True,
+    reshape_matrix=dict(usedefault=True,
     ),
     )
     inputs = Matlab2CSV.input_spec()
 
     for key, metadata in input_map.items():
         for metakey, value in metadata.items():
             yield assert_equal, getattr(inputs.traits()[key], metakey), value
+
 def test_Matlab2CSV_outputs():
     output_map = dict(csv_files=dict(),
     )
@@ -20,3 +22,4 @@ def test_Matlab2CSV_outputs():
     for key, metadata in output_map.items():
         for metakey, value in metadata.items():
             yield assert_equal, getattr(outputs.traits()[key], metakey), value
+
diff --git a/nipype/algorithms/tests/test_auto_MergeCSVFiles.py b/nipype/algorithms/tests/test_auto_MergeCSVFiles.py
@@ -1,23 +1,25 @@
 # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT
 from nipype.testing import assert_equal
 from nipype.algorithms.misc import MergeCSVFiles
+
 def test_MergeCSVFiles_inputs():
-    input_map = dict(out_file=dict(usedefault=True,
-    ),
-    column_headings=dict(),
+    input_map = dict(column_headings=dict(),
+    extra_column_heading=dict(),
     extra_field=dict(),
-    row_heading_title=dict(usedefault=True,
-    ),
     in_files=dict(mandatory=True,
     ),
+    out_file=dict(usedefault=True,
+    ),
+    row_heading_title=dict(usedefault=True,
+    ),
     row_headings=dict(),
-    extra_column_heading=dict(),
     )
     inputs = MergeCSVFiles.input_spec()
 
     for key, metadata in input_map.items():
         for metakey, value in metadata.items():
             yield assert_equal, getattr(inputs.traits()[key], metakey), value
+
 def test_MergeCSVFiles_outputs():
     output_map = dict(csv_file=dict(),
     )
@@ -26,3 +28,4 @@ def test_MergeCSVFiles_outputs():
     for key, metadata in output_map.items():
         for metakey, value in metadata.items():
             yield assert_equal, getattr(outputs.traits()[key], metakey), value
+
diff --git a/nipype/algorithms/tests/test_auto_ModifyAffine.py b/nipype/algorithms/tests/test_auto_ModifyAffine.py
@@ -1,12 +1,13 @@
 # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT
 from nipype.testing import assert_equal
 from nipype.algorithms.misc import ModifyAffine
+
 def test_ModifyAffine_inputs():
-    input_map = dict(transformation_matrix=dict(usedefault=True,
-    ),
-    ignore_exception=dict(nohash=True,
+    input_map = dict(ignore_exception=dict(nohash=True,
     usedefault=True,
     ),
+    transformation_matrix=dict(usedefault=True,
+    ),
     volumes=dict(mandatory=True,
     ),
     )
@@ -15,6 +16,7 @@ def test_ModifyAffine_inputs():
     for key, metadata in input_map.items():
         for metakey, value in metadata.items():
             yield assert_equal, getattr(inputs.traits()[key], metakey), value
+
 def test_ModifyAffine_outputs():
     output_map = dict(transformed_volumes=dict(),
     )
@@ -23,3 +25,4 @@ def test_ModifyAffine_outputs():
     for key, metadata in output_map.items():
         for metakey, value in metadata.items():
             yield assert_equal, getattr(outputs.traits()[key], metakey), value
+