Merge pull request #1813 from effigies/issue1348

BF: Run `make specs` with CWD in PYTHONPATH

Author: satra

Makefile

@@ -71,7 +71,7 @@ html:
 
 specs:
 	@echo "Checking specs and autogenerating spec tests"
-	python tools/checkspecs.py
+	env PYTHONPATH=".:$(PYTHONPATH)" python tools/checkspecs.py
 
 check: check-before-commit # just a shortcut
 check-before-commit: specs trailing-spaces html test

nipype/algorithms/tests/test_auto_ACompCor.py

@@ -1,4 +1,5 @@
 # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT
+from __future__ import unicode_literals
 from ..confounds import ACompCor
 
 

nipype/algorithms/tests/test_auto_AddCSVColumn.py

@@ -1,4 +1,5 @@
 # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT
+from __future__ import unicode_literals
 from ..misc import AddCSVColumn
 
 

nipype/algorithms/tests/test_auto_AddCSVRow.py

@@ -1,4 +1,5 @@
 # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT
+from __future__ import unicode_literals
 from ..misc import AddCSVRow
 
 

nipype/algorithms/tests/test_auto_AddNoise.py

@@ -1,4 +1,5 @@
 # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT
+from __future__ import unicode_literals
 from ..misc import AddNoise
 
 

nipype/algorithms/tests/test_auto_ArtifactDetect.py

@@ -1,4 +1,5 @@
 # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT
+from __future__ import unicode_literals
 from ..rapidart import ArtifactDetect
 
 
@@ -16,7 +17,7 @@ def test_ArtifactDetect_inputs():
     mask_type=dict(mandatory=True,
     ),
     norm_threshold=dict(mandatory=True,
-    xor=[u'rotation_threshold', u'translation_threshold'],
+    xor=['rotation_threshold', 'translation_threshold'],
     ),
     parameter_source=dict(mandatory=True,
     ),
@@ -27,18 +28,18 @@ def test_ArtifactDetect_inputs():
     realignment_parameters=dict(mandatory=True,
     ),
     rotation_threshold=dict(mandatory=True,
-    xor=[u'norm_threshold'],
+    xor=['norm_threshold'],
     ),
     save_plot=dict(usedefault=True,
     ),
     translation_threshold=dict(mandatory=True,
-    xor=[u'norm_threshold'],
+    xor=['norm_threshold'],
     ),
     use_differences=dict(maxlen=2,
     minlen=2,
     usedefault=True,
     ),
-    use_norm=dict(requires=[u'norm_threshold'],
+    use_norm=dict(requires=['norm_threshold'],
     usedefault=True,
     ),
     zintensity_threshold=dict(mandatory=True,

nipype/algorithms/tests/test_auto_CalculateNormalizedMoments.py

@@ -1,4 +1,5 @@
 # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT
+from __future__ import unicode_literals
 from ..misc import CalculateNormalizedMoments
 
 

nipype/algorithms/tests/test_auto_CompCor.py

@@ -0,0 +1,37 @@
+# AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT
+from __future__ import unicode_literals
+from ..confounds import CompCor
+
+
+def test_CompCor_inputs():
+    input_map = dict(components_file=dict(usedefault=True,
+    ),
+    header=dict(),
+    ignore_exception=dict(nohash=True,
+    usedefault=True,
+    ),
+    mask_file=dict(),
+    num_components=dict(usedefault=True,
+    ),
+    realigned_file=dict(mandatory=True,
+    ),
+    regress_poly_degree=dict(usedefault=True,
+    ),
+    use_regress_poly=dict(usedefault=True,
+    ),
+    )
+    inputs = CompCor.input_spec()
+
+    for key, metadata in list(input_map.items()):
+        for metakey, value in list(metadata.items()):
+            assert getattr(inputs.traits()[key], metakey) == value
+
+
+def test_CompCor_outputs():
+    output_map = dict(components_file=dict(),
+    )
+    outputs = CompCor.output_spec()
+
+    for key, metadata in list(output_map.items()):
+        for metakey, value in list(metadata.items()):
+            assert getattr(outputs.traits()[key], metakey) == value

nipype/algorithms/tests/test_auto_ComputeDVARS.py

@@ -1,4 +1,5 @@
 # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT
+from __future__ import unicode_literals
 from ..confounds import ComputeDVARS
 
 

nipype/algorithms/tests/test_auto_ComputeMeshWarp.py

@@ -1,4 +1,5 @@
 # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT
+from __future__ import unicode_literals
 from ..mesh import ComputeMeshWarp