Merge remote-tracking branch 'upstream/master' into oesteban-patch-1

Author: oesteban

.travis.yml

@@ -87,8 +87,7 @@ before_install:
 
 - travis_retry pip install -r requirements.txt
 - travis_retry pip install grabbit==0.1.2
-- travis_retry git clone https://github.com/INCF/pybids.git ${HOME}/pybids &&
-  pip install -e ${HOME}/pybids
+- travis_retry git clone -b 0.6.5 https://github.com/INCF/pybids.git ${HOME}/pybids && pip install -e ${HOME}/pybids
 
 install:
 - travis_retry pip install $EXTRA_PIP_FLAGS -e .[$NIPYPE_EXTRAS]

nipype/info.py

@@ -154,7 +154,7 @@ def get_nipype_gitversion():
 if sys.version_info <= (3, 4):
     REQUIRES.append('configparser')
 
-TESTS_REQUIRES = ['pytest-cov', 'codecov', 'pytest-env']
+TESTS_REQUIRES = ['pytest-cov', 'codecov', 'pytest-env', 'coverage<5']
 
 EXTRA_REQUIRES = {
     'doc': ['Sphinx>=1.4', 'numpydoc', 'matplotlib', 'pydotplus', 'pydot>=1.2.3'],
@@ -164,7 +164,7 @@ def get_nipype_gitversion():
     'profiler': ['psutil>=5.0'],
     'duecredit': ['duecredit'],
     'xvfbwrapper': ['xvfbwrapper'],
-    'pybids': ['pybids'],
+    'pybids': ['pybids==0.6.5'],
     'ssh': ['paramiko'],
     # 'mesh': ['mayavi']  # Enable when it works
 }