Merge remote-tracking branch 'upstream/master' into pr/1487

Author: oesteban

Dockerfile

@@ -173,7 +173,7 @@ RUN pip install --no-cache-dir "templateflow>=0.1.3,<0.2.0a0" && \
 # Installing dev requirements (packages that are not in pypi)
 WORKDIR /src/
 COPY requirements.txt requirements.txt
-RUN pip install --no-cache-dir -U pip>=18.1 && \
+RUN pip install --no-cache-dir -U "pip==19.1" && \
     pip install --no-cache-dir -r requirements.txt
 
 # Installing FMRIPREP

docs/environment.yml

@@ -28,7 +28,7 @@ dependencies:
     - svgutils
     - nitime
     - nilearn!=0.5.0,!=0.5.1
-    - git+https://github.com/poldracklab/niworkflows.git@e8f677a0407fc312b7f3d87a4c47726ceb8cd975#egg=niworkflows
+    - niworkflows<0.10.0a0,>=0.9.1.post1
     - tedana>=0.0.5
     - smriprep<0.3.0a0,>=0.2.0
     - templateflow<0.2.0a0,>=0.1.3

fmriprep/__about__.py

@@ -89,8 +89,7 @@
     'nipype @ git+https://github.com/nipy/nipype.git@'
     'd353f0d879826031334b09d33e9443b8c9b3e7fe',
     'nitime',
-    'niworkflows @ git+https://github.com/poldracklab/niworkflows.git@'
-    'e8f677a0407fc312b7f3d87a4c47726ceb8cd975',
+    'niworkflows<0.10.0a0,>=0.9.1.post1',
     'numpy',
     'pandas',
     'psutil>=5.4',
@@ -107,8 +106,6 @@
 LINKS_REQUIRES = [
     'git+https://github.com/nipy/nipype.git@'
     'd353f0d879826031334b09d33e9443b8c9b3e7fe#egg=nipype',
-    'git+https://github.com/poldracklab/niworkflows.git@'
-    'e8f677a0407fc312b7f3d87a4c47726ceb8cd975#egg=niworkflows',
 ]
 
 TESTS_REQUIRES = [

requirements.txt

@@ -1,5 +1,5 @@
 nilearn!=0.5.0,!=0.5.1
 git+https://github.com/nipy/nipype.git@d353f0d879826031334b09d33e9443b8c9b3e7fe#egg=nipype
-git+https://github.com/poldracklab/niworkflows.git@e8f677a0407fc312b7f3d87a4c47726ceb8cd975#egg=niworkflows
+niworkflows<0.10.0a0,>=0.9.1.post1
 smriprep<0.3.0a0,>=0.2.0
 templateflow<0.2.0a0,>=0.1.3