removing gen_file and using a default value in ICA_AROMA

Author: djarecka

nipype/interfaces/fsl/aroma.py

@@ -28,7 +28,7 @@ class ICA_AROMAInputSpec(CommandLineInputSpec):
         xor=['feat_dir'],
         desc='volume to be denoised')
     out_dir = Directory(
-        'out', usedefault=True, genfile=True,
+        'out', usedefault=True, mandatory=True,
         argstr='-o %s', desc='output directory')
     mask = File(
         exists=True,
@@ -129,10 +129,7 @@ class ICA_AROMA(CommandLine):
 
     def _list_outputs(self):
         outputs = self.output_spec().get()
-        if isdefined(self.inputs.out_dir):
-            outputs['out_dir'] = os.path.abspath(self.inputs.out_dir)
-        else:
-            outputs['out_dir'] = self._gen_filename('out_dir')
+        outputs['out_dir'] = os.path.abspath(self.inputs.out_dir)
         out_dir = outputs['out_dir']
 
         if self.inputs.denoise_type in ('aggr', 'both'):
@@ -142,7 +139,3 @@ def _list_outputs(self):
             outputs['nonaggr_denoised_file'] = os.path.join(
                 out_dir, 'denoised_func_data_nonaggr.nii.gz')
         return outputs
-
-    def _gen_filename(self, name):
-        if name == 'out_dir':
-            return os.getcwd()

nipype/interfaces/fsl/tests/test_auto_ICA_AROMA.py

@@ -54,7 +54,7 @@ def test_ICA_AROMA_inputs():
         ),
         out_dir=dict(
             argstr='-o %s',
-            genfile=True,
+            mandatory=True,
             usedefault=True,
         ),
         terminal_output=dict(