Merge pull request #1070 from chrisfilo/enh/terminal_output

Make terminal_output not mandatory (since it has a silent default).

Author: chrisgorgo

CHANGES

@@ -1,6 +1,6 @@
 Next release
 ============
-
+* FIX: terminal_output is not mandatory anymore (https://github.com/nipy/nipype/pull/1070)
 * FIX: Fixed Camino output naming (https://github.com/nipy/nipype/pull/1061)
 * ENH: Add the average distance to ErrorMap (https://github.com/nipy/nipype/pull/1039)
 * ENH: Inputs with name_source can be now chained in cascade (https://github.com/nipy/nipype/pull/938)

nipype/algorithms/tests/test_auto_ErrorMap.py

@@ -16,8 +16,7 @@ def test_AFNICommand_inputs():
     name_template='%s_afni',
     ),
     outputtype=dict(),
-    terminal_output=dict(mandatory=True,
-    nohash=True,
+    terminal_output=dict(nohash=True,
     ),
     )
     inputs = AFNICommand.input_spec()

nipype/algorithms/tests/test_auto_Overlap.py

@@ -21,8 +21,7 @@ def test_AFNItoNIFTI_inputs():
     name_template='%s.nii',
     ),
     outputtype=dict(),
-    terminal_output=dict(mandatory=True,
-    nohash=True,
+    terminal_output=dict(nohash=True,
     ),
     )
     inputs = AFNItoNIFTI.input_spec()

nipype/interfaces/afni/tests/test_auto_AFNICommand.py

@@ -83,8 +83,7 @@ def test_Allineate_inputs():
     ),
     source_mask=dict(argstr='-source_mask %s',
     ),
-    terminal_output=dict(mandatory=True,
-    nohash=True,
+    terminal_output=dict(nohash=True,
     ),
     two_best=dict(argstr='-twobest %d',
     ),

nipype/interfaces/afni/tests/test_auto_AFNItoNIFTI.py

@@ -33,8 +33,7 @@ def test_AutoTcorrelate_inputs():
     outputtype=dict(),
     polort=dict(argstr='-polort %d',
     ),
-    terminal_output=dict(mandatory=True,
-    nohash=True,
+    terminal_output=dict(nohash=True,
     ),
     )
     inputs = AutoTcorrelate.input_spec()

nipype/interfaces/afni/tests/test_auto_Allineate.py

@@ -23,8 +23,7 @@ def test_Autobox_inputs():
     outputtype=dict(),
     padding=dict(argstr='-npad %d',
     ),
-    terminal_output=dict(mandatory=True,
-    nohash=True,
+    terminal_output=dict(nohash=True,
     ),
     )
     inputs = Autobox.input_spec()

nipype/interfaces/afni/tests/test_auto_AutoTcorrelate.py

@@ -31,8 +31,7 @@ def test_Automask_inputs():
     name_template='%s_mask',
     ),
     outputtype=dict(),
-    terminal_output=dict(mandatory=True,
-    nohash=True,
+    terminal_output=dict(nohash=True,
     ),
     )
     inputs = Automask.input_spec()

nipype/interfaces/afni/tests/test_auto_Autobox.py

@@ -54,8 +54,7 @@ def test_Bandpass_inputs():
     position=1,
     ),
     outputtype=dict(),
-    terminal_output=dict(mandatory=True,
-    nohash=True,
+    terminal_output=dict(nohash=True,
     ),
     tr=dict(argstr='-dt %f',
     ),