Merge pull request #117 from effigies/nipype_typo

oesteban · web-flow · commit 3d8b6de0bbd9 · 2017-02-13T11:51:12.000-08:00
[RTM] Typo fixed in nipype
diff --git a/niworkflows/info.py b/niworkflows/info.py
@@ -49,7 +49,7 @@
     'Programming Language :: Python :: 3.5',
 ]
 
-REQUIRES = ['nipype>=0.13.0rc1', 'future', 'nilearn>=0.2.6', 'sklearn', 'pandas', 'matplotlib',
+REQUIRES = ['nipype', 'future', 'nilearn>=0.2.6', 'sklearn', 'pandas', 'matplotlib',
             'jinja2', 'svgutils', 'tinycss']
 SETUP_REQUIRES = []
 REQUIRES += SETUP_REQUIRES
diff --git a/niworkflows/interfaces/segmentation.py b/niworkflows/interfaces/segmentation.py
@@ -52,9 +52,7 @@ class ReconAllInputSpecRPT(nrc.ReportCapableInputSpec,
     pass
 
 class ReconAllOutputSpecRPT(nrc.ReportCapableOutputSpec,
-                            freesurfer.preprocess.ReconAllIOutputSpec):
-    # Note typo in fsl.preprocess.ReconAllIOutputSpec.
-    # Can fix when the pinned nipype includes 36e6c17
+                            freesurfer.preprocess.ReconAllOutputSpec):
     pass
 
 class ReconAllRPT(nrc.SurfaceSegmentationRC, freesurfer.preprocess.ReconAll):
diff --git a/requirements.txt b/requirements.txt
@@ -0,0 +1 @@
+-e git+https://github.com/nipy/nipype.git@61978ad#egg=nipype

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@`
`49`	`49`	`'Programming Language :: Python :: 3.5',`
`50`	`50`	`]`
`51`	`51`
`52`		`-REQUIRES = ['nipype>=0.13.0rc1', 'future', 'nilearn>=0.2.6', 'sklearn', 'pandas', 'matplotlib',`
	`52`	`+REQUIRES = ['nipype', 'future', 'nilearn>=0.2.6', 'sklearn', 'pandas', 'matplotlib',`
`53`	`53`	`'jinja2', 'svgutils', 'tinycss']`
`54`	`54`	`SETUP_REQUIRES = []`
`55`	`55`	`REQUIRES += SETUP_REQUIRES`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+-e git+https://github.com/nipy/nipype.git@61978ad#egg=nipype`