update relase toom and mailmap

.mailmap

@@ -1,164 +1,165 b''
 A. J. Holyoake <[e-mail]> ajholyoake <[e-mail]>
+Alok Singh <[e-mail]> Alok Singh <[e-mail]>
 Aaron Culich <[e-mail]> Aaron Culich <[e-mail]>
 Aron Ahmadia <[e-mail]> ahmadia <[e-mail]>
 Benjamin Ragan-Kelley <[e-mail]> <[e-mail]>
 Benjamin Ragan-Kelley <[e-mail]> Min RK
 Benjamin Ragan-Kelley <[e-mail]> MinRK <[e-mail]>
 Barry Wark <[e-mail]> Barry Wark <barrywarkatgmaildotcom>
 Ben Edwards <[e-mail]> Ben Edwards <bedwards@sausage.(none)>
 Bradley M. Froehle <[e-mail]> Bradley M. Froehle <[e-mail]>
 Bradley M. Froehle <[e-mail]> Bradley Froehle <[e-mail]>
 Brandon Parsons <[e-mail]> Brandon Parsons <[e-mail]>
 Brian E. Granger <[e-mail]> Brian Granger
 Brian E. Granger <[e-mail]> Brian Granger <>
 Brian E. Granger <[e-mail]> bgranger <>
 Brian E. Granger <[e-mail]> bgranger <bgranger@red>
 Christoph Gohlke <[e-mail]> cgohlke <[e-mail]>
 Cyrille Rossant <[e-mail]> rossant <rossant@github>
 Damián Avila <[e-mail]> damianavila <[e-mail]>
 Damián Avila <[e-mail]> damianavila <[e-mail]>
 Damon Allen <[e-mail]> damontallen <[e-mail]>
 Darren Dale <[e-mail]> darren.dale <>
 Darren Dale <[e-mail]> Darren Dale <>
 Dav Clark <[e-mail]> Dav Clark <>
 Dav Clark <[e-mail]> Dav Clark <[e-mail]>
 David Hirschfeld <[e-mail]> dhirschfeld <[e-mail]>
 David P. Sanders <[e-mail]> David P. Sanders <[e-mail]>
 David Warde-Farley <[e-mail]> David Warde-Farley <>
 Doug Blank <[e-mail]> Doug Blank <[e-mail]>
 Eugene Van den Bulke <[e-mail]> Eugene Van den Bulke <[e-mail]> 
 Evan Patterson <[e-mail]> <[e-mail]>
 Evan Patterson <[e-mail]> <[e-mail]>
 Evan Patterson <[e-mail]> <[e-mail]>
 Evan Patterson <[e-mail]> <[e-mail]>
 Evan Patterson <[e-mail]> epatters <[e-mail]>
 Evan Patterson <[e-mail]> epatters <[e-mail]>
 Ernie French <[e-mail]> Ernie French <[e-mail]>
 Ernie French <[e-mail]> ernie french <[e-mail]>
 Ernie French <[e-mail]> ernop <[e-mail]>
 Fernando Perez <[e-mail]> <[e-mail]>
 Fernando Perez <[e-mail]> Fernando Perez <[e-mail]>
 Fernando Perez <[e-mail]> fperez <>
 Fernando Perez <[e-mail]> fptest <>
 Fernando Perez <[e-mail]> fptest1 <>
 Fernando Perez <[e-mail]> Fernando Perez <[e-mail]>
 Fernando Perez <[e-mail]> Fernando Perez <>
 Fernando Perez <[e-mail]> Fernando Perez <fperez@maqroll>
 Frank Murphy <[e-mail]> Frank Murphy <[e-mail]>
 Gabriel Becker <[e-mail]> gmbecker <[e-mail]>
 Gael Varoquaux <[e-mail]> gael.varoquaux <>
 Gael Varoquaux <[e-mail]> gvaroquaux <gvaroquaux@gvaroquaux-desktop>
 Gael Varoquaux <[e-mail]> Gael Varoquaux <>
 Ingolf Becker <[e-mail]> watercrossing <[e-mail]>
 Jake Vanderplas <[e-mail]> Jake Vanderplas <[e-mail]>
 Jakob Gager <[e-mail]> jakobgager <[e-mail]>
 Jakob Gager <[e-mail]> jakobgager <[e-mail]>
 Jakob Gager <[e-mail]> jakobgager <[e-mail]>
 Jason Grout <[e-mail]> <[e-mail]>
 Jason Grout <[e-mail]> <[e-mail]>
 Jason Gors <[e-mail]> jason gors <[e-mail]>
 Jason Gors <[e-mail]> jgors <[e-mail]>
 Jens Hedegaard Nielsen <[e-mail]> Jens Hedegaard Nielsen <jhn@jhn-Znote.(none)>
 Jens Hedegaard Nielsen <[e-mail]> Jens H Nielsen <[e-mail]>
 Jens Hedegaard Nielsen <[e-mail]> Jens H. Nielsen <[e-mail]>
 Jez Ng <[e-mail]> Jez Ng <[e-mail]>
 Jonathan Frederic <[e-mail]> Jonathan Frederic <jonathan@LifebookMint.(none)>
 Jonathan Frederic <[e-mail]> Jonathan Frederic <[e-mail]>
 Jonathan Frederic <[e-mail]> Jonathan Frederic <[e-mail]>
 Jonathan Frederic <[e-mail]> jon <[e-mail]>
 Jonathan Frederic <[e-mail]> U-Jon-PC\Jon <Jon@Jon-PC.(none)>
 Jonathan March <[e-mail]> Jonathan March <[e-mail]>
 Jean Cruypenynck <[e-mail]> Jean Cruypenynck <[e-mail]>
 Jonathan March <[e-mail]> jdmarch <[e-mail]>
 Jörgen Stenarson <[e-mail]> Jörgen Stenarson <[e-mail]>
 Jörgen Stenarson <[e-mail]> Jorgen Stenarson <[e-mail]>
 Jörgen Stenarson <[e-mail]> Jorgen Stenarson <>
 Jörgen Stenarson <[e-mail]> jstenar <[e-mail]>
 Jörgen Stenarson <[e-mail]> jstenar <>
 Jörgen Stenarson <[e-mail]> Jörgen Stenarson <[e-mail]>
 Juergen Hasch <[e-mail]> juhasch <[e-mail]>
 Juergen Hasch <[e-mail]> juhasch <[e-mail]>
 Julia Evans <[e-mail]> Julia Evans <[e-mail]>
 Kester Tong <[e-mail]> KesterTong <[e-mail]>
 Kyle Kelley <[e-mail]> Kyle Kelley <[e-mail]>
 Kyle Kelley <[e-mail]> rgbkrk <[e-mail]>
 kd2718 <[e-mail]>
 Kory Donati <[e-mail]> kory donati <[e-mail]>
 Kory Donati <[e-mail]> Kory Donati <[e-mail]>
 Kory Donati <[e-mail]> koryd <[e-mail]>
 Laurent Dufréchou <[e-mail]> <[e-mail]>
 Laurent Dufréchou <[e-mail]> <laurent@Pep>
 Laurent Dufréchou <[e-mail]> laurent dufrechou <>
 Laurent Dufréchou <[e-mail]> laurent.dufrechou <>
 Laurent Dufréchou <[e-mail]> Laurent Dufrechou <>
 Laurent Dufréchou <[e-mail]> [e-mail] <>
 Laurent Dufréchou <[e-mail]> ldufrechou <ldufrechou@PEP>
 Luciana da Costa Marques <[e-mail]> luciana <[e-mail]>
 Lorena Pantano <[e-mail]> Lorena <[e-mail]>
 Luis Pedro Coelho <[e-mail]> Luis Pedro Coelho <[e-mail]>
 Marc Molla <[e-mail]> marcmolla <[e-mail]>
 Martín Gaitán <[e-mail]> Martín Gaitán <[e-mail]>
 Matthias Bussonnier <[e-mail]> Matthias BUSSONNIER <[e-mail]>
 Matthias Bussonnier <[e-mail]> Bussonnier Matthias <[e-mail]>
 Matthias Bussonnier <[e-mail]> Matthias BUSSONNIER <[e-mail]>
 Matthias Bussonnier <[e-mail]> Matthias Bussonnier <carreau@Aspire.(none)>
 Matthias Bussonnier <[e-mail]> Matthias Bussonnier <[e-mail]>
 Michael Droettboom <[e-mail]> Michael Droettboom <[e-mail]>
 Nicholas Bollweg <[e-mail]> Nicholas Bollweg (Nick) <[e-mail]>
 Nicolas Rougier <[e-mail]> <[e-mail]>
 Nikolay Koldunov <[e-mail]> Nikolay Koldunov <[e-mail]>
 Omar Andrés Zapata Mesa <[e-mail]> Omar Andres Zapata Mesa <[e-mail]>
 Omar Andrés Zapata Mesa <[e-mail]> Omar Andres Zapata Mesa <omazapa@tuxhome>
 Pankaj Pandey <[e-mail]> Pankaj Pandey <[e-mail]>
 Pascal Schetelat <[e-mail]> pascal-schetelat <[e-mail]>
 Paul Ivanov <[e-mail]> Paul Ivanov <[e-mail]>
 Paul Ivanov <[e-mail]> Paul Ivanov <[e-mail]>
 Pauli Virtanen <[e-mail]> Pauli Virtanen <>
 Pauli Virtanen <[e-mail]> Pauli Virtanen <[e-mail]>
 Pierre Gerold <[e-mail]> Pierre Gerold <[e-mail]>
 Pietro Berkes <[e-mail]> Pietro Berkes <[e-mail]>
 Piti Ongmongkolkul <[e-mail]> piti118 <[e-mail]>
 Prabhu Ramachandran <[e-mail]> Prabhu Ramachandran <>
 Puneeth Chaganti <[e-mail]> Puneeth Chaganti <[e-mail]>
 Robert Kern <[e-mail]> rkern <>
 Robert Kern <[e-mail]> Robert Kern <[e-mail]>
 Robert Kern <[e-mail]> Robert Kern <[e-mail]>
 Robert Kern <[e-mail]> Robert Kern <>
 Robert Marchman <[e-mail]> Robert Marchman <[e-mail]>
 Satrajit Ghosh <[e-mail]> Satrajit Ghosh <[e-mail]>
 Satrajit Ghosh <[e-mail]> Satrajit Ghosh <[e-mail]>
 Scott Sanderson <[e-mail]> Scott Sanderson <[e-mail]>
 smithj1 <[e-mail]> smithj1 <[e-mail]>
 smithj1 <[e-mail]> smithj1 <[e-mail]>
 Sang Min Park <[e-mail]> Sang Min Park <[e-mail]>
 Steven Johnson <[e-mail]> stevenJohnson <[e-mail]>
 Steven Silvester <[e-mail]> blink1073 <[e-mail]>
 S. Weber <[e-mail]> s8weber <[e-mail]>
 Stefan van der Walt <[e-mail]> Stefan van der Walt <[e-mail]>
 Silvia Vinyes <[e-mail]> Silvia <silvia@silvia-U44SG.(none)>
 Silvia Vinyes <[e-mail]> silviav12 <[e-mail]>
 Srinivas Reddy Thatiparthy <[e-mail]> Srinivas Reddy Thatiparthy <[e-mail]>
 Sylvain Corlay <[e-mail]> <[e-mail]>
 Sylvain Corlay <[e-mail]> sylvain.corlay <[e-mail]>
 Tamir Bahar <[e-mail]> Tamir Bahar <[e-mail]>
 Ted Drain <[e-mail]> TD22057 <[e-mail]>
 Théophile Studer <[e-mail]> Théophile Studer <[e-mail]>
 Thomas A Caswell <[e-mail]> Thomas A Caswell <[e-mail]> 
 Thomas Kluyver <[e-mail]> Thomas <[e-mail]>
 Thomas Kluyver <[e-mail]> Thomas Kluyver <[e-mail]>
 Thomas Spura <[e-mail]> Thomas Spura <[e-mail]>
 Timo Paulssen <[e-mail]> timo <[e-mail]>
 vds <vds@VIVIAN> vds2212 <vds2212@VIVIAN>
 vds <vds@VIVIAN> vds <vds@vivian>
 Ville M. Vainio <[e-mail]> <vivainio2@WN-W0941>
 Ville M. Vainio <[e-mail]> ville <ville@VILLE-PC>
 Ville M. Vainio <[e-mail]> ville <ville@ville-desktop>
 Ville M. Vainio <[e-mail]> vivainio <>
 Ville M. Vainio <[e-mail]> Ville M. Vainio <vivainio@villev>
 Ville M. Vainio <[e-mail]> Ville M. Vainio <vivainio@ville_vmw>
 Walter Doerwald <[e-mail]> walter.doerwald <>
 Walter Doerwald <[e-mail]> Walter Doerwald <>
 Wieland Hoffmann <[e-mail]> Wieland Hoffmann <[e-mail]>
 W. Trevor King <[e-mail]> W. Trevor King <[e-mail]>
 Yoval P. <[e-mail]> y-p <[e-mail]>
 

tools/release_helper.sh

@@ -1,57 +1,57 b''
 # Simple tool to help for release
 # when releasing with bash, simplei source it to get asked questions. 
 
-echo -n PREV_RELEASE:
+echo -n 'PREV_RELEASE (X.y.z):'
 read PREV_RELEASE
-echo -n MILESTONE:
+echo -n 'MILESTONE (X.y):'
 read MILESTONE
-echo -n VERSION:
+echo -n 'VERSION (X.y.z):'
 read VERSION
-echo -n branch:
+echo -n 'branch (master|X.y):'
 read branch
 
 echo 
 echo "updating what's new with informations from docs/source/whatsnew/pr"
 python tools/update_whatsnew.py
 
 echo
 echo "please move the contents of "docs/source/whatsnew/development.rst" to version-X.rst"
 echo "Press enter to continue"
 read
 
 echo 
 echo "here are all the authors that contributed to this release:"
 git log --format="%aN <%aE>" $PREV_RELEASE... | sort -u -f
 
 echo 
 echo "If you see any duplicates cancel (Ctrl-C), then edit .mailmap" Press enter to continue
 read
 
 echo "generating stats"
 python tools/github_stats.py --milestone $MILESTONE > stats.rst
 
 echo "stats.rst files generated. Please merge it with the right file (github-stats-X.rst)"
 echo "press enter to continue."
 read
 
 echo "Cleaning repository"
 git clean -xfdi
 
 echo "please update version number in IPython/core/release.py"
 
 echo "Press enter to continue"
 read
 
 echo 
 echo "Attempting to build the docs.."
 make html -C docs
 
 echo 
 echo "Check the docs, press enter to continue"
 read
 
 echo
 echo "Attempting to build package..."
 
 tools/build_release