rel(1.2.2): revise problems spotted by @effigies'

oesteban · oesteban · commit 7df091d26897 · 2019-09-06T14:39:31.000-07:00
diff --git a/.mailmap b/.mailmap
@@ -160,7 +160,8 @@ Pablo Polosecki <pipolose@us.ibm.com> pipolose <pipolose@pipoloses-air.watson.ib
 Paul Sharp <psharp1289@gmail.com> psharp1289 <psharp1289@gmail.com>
 Ranjit Khanuja <ranjit.jhu@gmail.com> RanjitK <ranjit.jhu@gmail.com>
 Rastko Ćirić <rc042010@mymail.pomona.edu> rciric <rc042010@mymail.pomona.edu>
-Rastko Ćirić <rc042010@mymail.pomona.edu> Rastko Ćirić <rciric@users.noreply.github.com> rciric <rastko@stanford.edu>
+Rastko Ćirić <rc042010@mymail.pomona.edu> Rastko Ćirić <rciric@users.noreply.github.com>
+Rastko Ćirić <rc042010@mymail.pomona.edu> rciric <rastko@stanford.edu>
 Ross Markello <rossmarkello@gmail.com> Ross Markello <rdm222@cornell.edu>
 Russell Poldrack <poldrack@gmail.com> Russ Poldrack <poldrack@gmail.com>
 Russell Poldrack <poldrack@gmail.com> poldrack <poldrack@gmail.com>
@@ -185,7 +186,9 @@ Steven Giavasis <sgiava77@gmail.com> sgiavasis <sgiava77@gmail.com>
 Steven Giavasis <sgiava77@gmail.com> sgiavasis <sgiavasis@ieee.org>
 Steven Tilley <stilley@hollandbloorview.ca> Steven Tilley <steve@steventilley.com>
 Tristan Glatard <tristan.glatard@mcgill.ca> Tristan Glatard <tristan.glatard@creatis.insa-lyon.fr>
-Victor Férat <victor.ferat@live.fr> Victor <victor.ferat@live.fr> Victor Ferat <vferat@fcbg.ch> Victor Férat <victor.ferat@live.Fr>
+Victor Férat <victor.ferat@live.fr> Victor <victor.ferat@live.fr>
+Victor Férat <victor.ferat@live.fr> Victor Ferat <vferat@fcbg.ch>
+Victor Férat <victor.ferat@live.fr> Victor Férat <victor.ferat@live.Fr>
 Victor Saase <victor@saase.net> vsaase <victor@saase.net>
 Weijie Huang <hwjbupt@gmail.com> forwho <hwjbupt@gmail.com>
 William Triplett <wtriplett@gmail.com> William Triplett <wtriplett@ufl.edu>
diff --git a/.zenodo.json b/.zenodo.json
@@ -693,6 +693,9 @@
       "name": "Mihai, Paul Glad",
       "orcid": "0000-0001-5715-6442"
     },
+    {
+      "name": "Lai, Jeff"
+    },
     {
       "affiliation": "MIT, HMS",
       "name": "Ghosh, Satrajit",
diff --git a/doc/changelog/1.X.X-changelog b/doc/changelog/1.X.X-changelog
@@ -1,6 +1,8 @@
 1.2.2 (September 05, 2019)
 ==========================
 
+##### [Full changelog](https://github.com/nipy/nipype/milestone/33?closed=1)
+
   * FIX: Update mne.WatershedBEM command line (https://github.com/nipy/nipype/pull/3007)
   * FIX: Specify correct stop criterion flag in PETPVC (https://github.com/nipy/nipype/pull/3010)
   * ENH: Additional arguments to ANTs N4BiasFieldCorrection (https://github.com/nipy/nipype/pull/3012)
diff --git a/tools/update_zenodo.py b/tools/update_zenodo.py
@@ -58,6 +58,7 @@
         "Leipzig, Germany.",
      "name": "Mihai, Paul Glad",
      "orcid": "0000-0001-5715-6442"},
+    {"name": "Lai, Jeff"}
 ]
 
 for entry in missing_entries:

-Original file line number
+Diff line change
 Paul Sharp <[email protected]> psharp1289 <[email protected]>
 Ranjit Khanuja <[email protected]> RanjitK <[email protected]>
 Rastko Ćirić <[email protected]> rciric <[email protected]>
 -Rastko Ćirić <[email protected]> Rastko Ćirić <[email protected]> rciric <[email protected]>
 +Rastko Ćirić <[email protected]> Rastko Ćirić <[email protected]>
 +Rastko Ćirić <[email protected]> rciric <[email protected]>
 Ross Markello <[email protected]> Ross Markello <[email protected]>
 Russell Poldrack <[email protected]> Russ Poldrack <[email protected]>
 Russell Poldrack <[email protected]> poldrack <[email protected]>
 Steven Giavasis <[email protected]> sgiavasis <[email protected]>
 Steven Tilley <[email protected]> Steven Tilley <[email protected]>
 Tristan Glatard <[email protected]> Tristan Glatard <[email protected]>
 -Victor Férat <[email protected]> Victor <[email protected]> Victor Ferat <[email protected]> Victor Férat <[email protected]>
 +Victor Férat <[email protected]> Victor <[email protected]>
 +Victor Férat <[email protected]> Victor Ferat <[email protected]>
 +Victor Férat <[email protected]> Victor Férat <[email protected]>
 Victor Saase <[email protected]> vsaase <[email protected]>
 Weijie Huang <[email protected]> forwho <[email protected]>
 William Triplett <[email protected]> William Triplett <[email protected]>
Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,7 @@`
`58`	`58`	`"Leipzig, Germany.",`
`59`	`59`	`"name": "Mihai, Paul Glad",`
`60`	`60`	`"orcid": "0000-0001-5715-6442"},`
	`61`	`+ {"name": "Lai, Jeff"}`
`61`	`62`	`]`
`62`	`63`
`63`	`64`	`for entry in missing_entries:`