Merge pull request #492 from effigies/fix/check_expert_options

effigies · web-flow · commit ca47a9b48f91 · 2017-04-29T11:43:45.000-04:00
[RTM] FIX: Check for expert options file
diff --git a/docs/environment.yml b/docs/environment.yml
@@ -28,5 +28,5 @@ dependencies:
     - svgutils
     - nitime
     - nilearn
-    - git+https://github.com/nipy/nipype.git@ccd0527d65c63b22b86b8e7df0d3103e4f4fe743#egg=nipype
+    - git+https://github.com/nipy/nipype.git@5a88840c31836d393cf8fea28de0777e4d4922c3#egg=nipype
     - git+https://github.com/poldracklab/niworkflows.git@d6612ceb1e44ca2df30b404ef853d136ede277bb#egg=niworkflows
diff --git a/requirements.txt b/requirements.txt
@@ -1,2 +1,2 @@
-git+https://github.com/nipy/nipype.git@ccd0527d65c63b22b86b8e7df0d3103e4f4fe743#egg=nipype
+git+https://github.com/nipy/nipype.git@5a88840c31836d393cf8fea28de0777e4d4922c3#egg=nipype
 git+https://github.com/poldracklab/niworkflows.git@d6612ceb1e44ca2df30b404ef853d136ede277bb#egg=niworkflows

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-git+https://github.com/nipy/nipype.git@ccd0527d65c63b22b86b8e7df0d3103e4f4fe743#egg=nipype`
	`1`	`+git+https://github.com/nipy/nipype.git@5a88840c31836d393cf8fea28de0777e4d4922c3#egg=nipype`
`2`	`2`	`git+https://github.com/poldracklab/niworkflows.git@d6612ceb1e44ca2df30b404ef853d136ede277bb#egg=niworkflows`