Merge branch 'ds005/fix-master' into rmaster

Author: oesteban

docs/environment.yml

@@ -27,7 +27,7 @@ dependencies:
     - doctest-ignore-unicode
     - svgutils
     - nitime
-    - nilearn
+    - nilearn!=0.5.0,!=0.5.1
     - niworkflows<0.9.0a0,>=0.8.1
     - smriprep
     - tedana>=0.0.5

fmriprep/__about__.py

@@ -86,7 +86,7 @@
 REQUIRES = [
     'indexed_gzip>=0.8.8',
     'nibabel>=2.2.1',
-    'nilearn',
+    'nilearn!=0.5.0,!=0.5.1',
     'nipype',
     'nitime',
     'niworkflows',

requirements.txt

@@ -1,4 +1,5 @@
-git+https://github.com/poldracklab/smriprep.git@423bcc43ab7300177eb3b98da62817b2cad8eb87#egg=smriprep-0.1.0
+nilearn!=0.5.0,!=0.5.1
 git+https://github.com/rciric/nipype.git@4c1af8aca7191aff7568ef0a8009144839759f5c#egg=nipype
 git+https://github.com/rciric/niworkflows.git@a7d976dddb0d7e266822cecc16c9ee3a2c3ba1cf#egg=niworkflows
+git+https://github.com/poldracklab/smriprep.git@423bcc43ab7300177eb3b98da62817b2cad8eb87#egg=smriprep-0.1.0
 templateflow<0.2.0a0,>=0.1.3