Merge remote-tracking branch 'upstream/master'

Author: oesteban

nipype/interfaces/freesurfer/utils.py

@@ -858,7 +858,7 @@ class MRIsConvertInputSpec(FSTraitedSpec):
                     xor=['out_datatype'], mandatory=True,
                     desc='output filename or True to generate one')
 
-    out_datatype = traits.Enum("ico", "tri", "stl", "vtk", "gii", "mgh", "mgz",
+    out_datatype = traits.Enum("asc", "ico", "tri", "stl", "vtk", "gii", "mgh", "mgz",
                                xor=['out_file'], mandatory=True,
                                desc="These file formats are supported:  ASCII:       .asc"
                                "ICO: .ico, .tri GEO: .geo STL: .stl VTK: .vtk GIFTI: .gii MGH surface-encoded 'volume': .mgh, .mgz")

nipype/interfaces/fsl/dti.py

@@ -579,10 +579,10 @@ class ProbTrackX(FSLCommand):
     >>> from nipype.interfaces import fsl
     >>> pbx = fsl.ProbTrackX(samples_base_name='merged', mask='mask.nii', \
     seed='MASK_average_thal_right.nii', mode='seedmask', \
-    xfm='trans.mat', n_samples=3, n_steps=10, force_dir=True, opd=True, \
-    os2t=True, target_masks = ['targets_MASK1.nii', 'targets_MASK2.nii'], \
-    thsamples='merged_thsamples.nii', fsamples='merged_fsamples.nii', \
-    phsamples='merged_phsamples.nii', out_dir='.')
+    xfm='trans.mat', n_samples=3, n_steps=10, force_dir=True, opd=True, os2t=True, \
+    target_masks = ['targets_MASK1.nii', 'targets_MASK2.nii'], \
+    thsamples='merged_thsamples.nii', fsamples='merged_fsamples.nii', phsamples='merged_phsamples.nii', \
+    out_dir='.')
     >>> pbx.cmdline # doctest: +IGNORE_UNICODE
     'probtrackx --forcedir -m mask.nii --mode=seedmask --nsamples=3 --nsteps=10 --opd --os2t --dir=. --samples=merged --seed=MASK_average_thal_right.nii --targetmasks=targets.txt --xfm=trans.mat'
 

setup.py

@@ -98,7 +98,10 @@ def run(self):
             cfg_parser.read(pjoin(pkg_dir, 'COMMIT_INFO.txt'))
             cfg_parser.set('commit hash', 'install_hash', repo_commit)
             out_pth = pjoin(self.build_lib, pkg_dir, 'COMMIT_INFO.txt')
-            cfg_parser.write(open(out_pth, 'wt'))
+            if PY3:
+                cfg_parser.write(open(out_pth, 'wt'))
+            else:
+                cfg_parser.write(open(out_pth, 'wb'))
     return MyBuildPy