Merge remote-tracking branch 'upstream/master' into fix/openfmri

* upstream/master:
  tst: generate melodic commandline
  Readout time got truncated in automatic encfile generation
  doc: fix link to 0.9.2 tar.gz release

Author: satra

doc/users/install.rst

@@ -10,7 +10,7 @@ Download
 --------
 
 Release 0.9.2: [`zip <https://github.com/nipy/nipype/archive/0.9.2.zip>`__ `tar.gz
-<https://github.com/nipy/nipype/archive/0.9.1.tar.gz>`__]
+<https://github.com/nipy/nipype/archive/0.9.2.tar.gz>`__]
 
 Development: [`zip <http://github.com/nipy/nipype/zipball/master>`__ `tar.gz
 <http://github.com/nipy/nipype/tarball/master>`__]

nipype/interfaces/fsl/epi.py

@@ -252,7 +252,7 @@ def _generate_encfile(self):
             line = [float(val[0] == encdir[0]) * direction
                     for val in ['x', 'y', 'z']] + [durations[idx]]
             lines.append(line)
-        np.savetxt(out_file, np.array(lines), fmt='%d %d %d %.3f')
+        np.savetxt(out_file, np.array(lines), fmt='%d %d %d %.8f')
         return out_file
 
     def _overload_extension(self, value, name=None):
@@ -408,11 +408,11 @@ def _format_arg(self, name, spec, value):
         if name == 'in_topup_fieldcoef':
             return spec.argstr % value.split('_fieldcoef')[0]
         return super(Eddy, self)._format_arg(name, spec, value)
-    
+
     def _parse_inputs( self, skip=None ):
         if skip is None:
             skip = []
-        
+
         if not isdefined(self.inputs.out_base ):
             self.inputs.out_base = os.path.abspath( './eddy_corrected' )
         return super(Eddy, self)._parse_inputs(skip=skip)

nipype/interfaces/fsl/model.py

@@ -1376,6 +1376,8 @@ class MELODIC(FSLCommand):
     >>> melodic_setup.inputs.s_des = 'subjectDesign.mat'
     >>> melodic_setup.inputs.s_con = 'subjectDesign.con'
     >>> melodic_setup.inputs.out_dir = 'groupICA.out'
+    >>> melodic_setup.cmdline
+    'melodic -i functional.nii,functional2.nii,functional3.nii -a tica --bgthreshold=10.000000 --mmthresh=0.500000 --nobet -o groupICA.out --Ostats --Scon=subjectDesign.con --Sdes=subjectDesign.mat --Tcon=timeDesign.con --Tdes=timeDesign.mat --tr=1.500000'
     >>> melodic_setup.run() # doctest: +SKIP