Merge branch 'master' of github.com:ZhifangYe/fmriprep

zhifangy · zhifangy · commit d9db42a72400 · 2018-06-07T10:40:11.000+08:00
diff --git a/docs/environment.yml b/docs/environment.yml
@@ -28,4 +28,4 @@ dependencies:
     - svgutils
     - nitime
     - nilearn
-    - niworkflows>=0.4.0
+    - git+https://github.com/ZhifangYe/niworkflows.git@ea6550d1c045f5310e094928504b5866b94e3e73#egg=niworkflows
diff --git a/fmriprep/info.py b/fmriprep/info.py
@@ -81,6 +81,8 @@
 ]
 
 LINKS_REQUIRES = [
+    'git+https://github.com/ZhifangYe/niworkflows.git@'
+    'ea6550d1c045f5310e094928504b5866b94e3e73#egg=niworkflows',
 ]
 
 TESTS_REQUIRES = [
diff --git a/requirements.txt b/requirements.txt
@@ -1,2 +1,2 @@
-niworkflows>=0.4.0
+git+https://github.com/ZhifangYe/niworkflows.git@ea6550d1c045f5310e094928504b5866b94e3e73#egg=niworkflows
 versioneer

Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,8 @@`
`81`	`81`	`]`
`82`	`82`
`83`	`83`	`LINKS_REQUIRES = [`
	`84`	`+ 'git+https://github.com/ZhifangYe/niworkflows.git@'`
	`85`	`+ 'ea6550d1c045f5310e094928504b5866b94e3e73#egg=niworkflows',`
`84`	`86`	`]`
`85`	`87`
`86`	`88`	`TESTS_REQUIRES = [`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-niworkflows>=0.4.0`
	`1`	`+git+https://github.com/ZhifangYe/niworkflows.git@ea6550d1c045f5310e094928504b5866b94e3e73#egg=niworkflows`
`2`	`2`	`versioneer`