Merge remote-tracking branch 'upstream/master' into enh/et

* upstream/master:
  Update heudiconv/info.py
  PIN: Track effigies/fix/heudiconv_issues
  PIN: Nipype master

Author: satra

heudiconv/info.py

@@ -11,7 +11,8 @@
 REQUIRES = [
     'nibabel',
     'pydicom',
-    'nipype>=1.0.0',
+    'nipype >=1.0.0; python_version > "3.0"',
+    'nipype >=1.0.0,!=1.2.1,!=1.2.2; python_version == "2.7"',
     'pathlib',
     'dcmstack>=0.7',
     'etelemetry',