fix: resolved conflict

Author: satra

doc/devel/provenance.rst

@@ -5,7 +5,7 @@ W3C PROV support
 Overview
 --------
 
-We're using the the `W3C PROV data model <http://www.w3.org/TR/prov-dm/`_ to
+We're using the the `W3C PROV data model <http://www.w3.org/TR/prov-dm/>`_ to
 capture and represent provenance in Nipype.
 
 For an overview see:

nipype/interfaces/afni/preprocess.py

@@ -4,10 +4,11 @@
 <http://www.fmrib.ox.ac.uk/fsl/index.html>`_ command line tools.  This
 was written to work with FSL version 5.0.4.
 
-Examples
---------
-See the docstrings of the individual classes for examples.
-
+    Change directory to provide relative paths for doctests
+    >>> import os
+    >>> filepath = os.path.dirname( os.path.realpath( __file__ ) )
+    >>> datadir = os.path.realpath(os.path.join(filepath, '../../testing/data'))
+    >>> os.chdir(datadir)
 """
 
 import os

nipype/interfaces/camino2trackvis/convert.py

@@ -1702,9 +1702,10 @@ def _list_outputs(self):
 class GLMInputSpec(FSLCommandInputSpec):
     in_file = File(exists=True, argstr='-i %s', mandatory=True, position=1,
                    desc='input file name (text matrix or 3D/4D image file)')
-    out_file = File(argstr='-o %s', genfile=True, position=3,
+    out_file = File(name_template="%s_glm.txt", argstr='-o %s', position=3,
                     desc=('filename for GLM parameter estimates'
-                          + ' (GLM betas)'))
+                          + ' (GLM betas)'),
+                    name_source="in_file", keep_extension=True)
     design = File(exists=True, argstr='-d %s', mandatory=True, position=2,
                   desc=('file name of the GLM design matrix (text time'
                         + ' courses for temporal regression or an image'
@@ -1800,7 +1801,7 @@ class GLM(FSLCommand):
     >>> import nipype.interfaces.fsl as fsl
     >>> glm = fsl.GLM(in_file='functional.nii', design='maps.nii')
     >>> glm.cmdline
-    'fsl_glm -d maps.nii -i functional.nii -o functional_glm.txt'
+    'fsl_glm -i functional.nii -d maps.nii -o functional_glm.txt'
 
     """
     _cmd = 'fsl_glm'
@@ -1852,7 +1853,3 @@ def _list_outputs(self):
 
         return outputs
 
-    def _gen_filename(self, name):
-        if name in ['out_file']:
-            return self._gen_fname(self.inputs.in_file, suffix='_glm')
-        return None