Skip to content

Commit bc51628

Browse files
authored
Merge pull request numpy#15059 from charris/prepare-1.18.0-release
REL: Prepare for NumPy 1.18.0 release.
2 parents 790965f + 0b2081a commit bc51628

File tree

3 files changed

+622
-58
lines changed

3 files changed

+622
-58
lines changed

.mailmap

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ Christopher Hanley <chanley@gmail.com> chanley <chanley@gmail.com>
6363
Christoph Gohlke <cgohlke@uci.edu> cgholke <?@?>
6464
Christoph Gohlke <cgohlke@uci.edu> cgohlke <cgohlke@uci.edu>
6565
Christoph Gohlke <cgohlke@uci.edu> Christolph Gohlke <cgohlke@uci.edu>
66+
Colin Snyder <47012605+colinsnyder@users.noreply.github.com> colinsnyder <47012605+colinsnyder@users.noreply.github.com>
6667
Daniel B Allan <daniel.b.allan@gmail.com> danielballan <daniel.b.allan@gmail.com>
6768
Daniel da Silva <mail@danieldasilva.org> Daniel da Silva <daniel@meltingwax.net>
6869
Daniel da Silva <mail@danieldasilva.org> Daniel da Silva <var.mail.daniel@gmail.com>
@@ -126,6 +127,7 @@ Jérémie du Boisberranger <jeremie.du-boisberranger@inria.fr> jeremiedbb <34657
126127
Jerome Kelleher <jerome.kelleher@ed.ac.uk> jeromekelleher <jerome.kelleher@ed.ac.uk>
127128
Johannes Hampp <johannes.hampp@zeu.uni-giessen.de> euronion <42553970+euronion@users.noreply.github.com>
128129
Johannes Schönberger <hannesschoenberger@gmail.com> Johannes Schönberger <jschoenberger@demuc.de>
130+
Johann Faouzi <johann.faouzi@gmail.com> johann.faouzi <johann.faouzi@icm-institute.org>
129131
John Darbyshire <24256554+attack68@users.noreply.github.com> attack68 <24256554+attack68@users.noreply.github.com>
130132
Joseph Fox-Rabinovitz <jfoxrabinovitz@gmail.com> Joseph Fox-Rabinovitz <joseph.r.fox-rabinovitz@nasa.gov>
131133
Joseph Fox-Rabinovitz <jfoxrabinovitz@gmail.com> Joseph Fox-Rabinovitz <madphysicist@users.noreply.github.com>
@@ -135,6 +137,7 @@ Julian Taylor <juliantaylor108@gmail.com> Julian Taylor <jtaylor.debian@googlema
135137
Julian Taylor <juliantaylor108@gmail.com> Julian Taylor <juliantaylor108@googlemail.com>
136138
Julien Lhermitte <jrmlhermitte@gmail.com> Julien Lhermitte <lhermitte@bnl.gov>
137139
Julien Schueller <julien.schueller@gmail.com> jschueller <julien.schueller@gmail.com>
140+
Justus Magin <keewis@posteo.de> keewis <keewis@users.noreply.github.com>
138141
Kai Striega <kaistriega@gmail.com> kai <kaistriega@gmail.com>
139142
Kai Striega <kaistriega@gmail.com> kai-striega <kaistriega@gmail.com>
140143
Kai Striega <kaistriega@gmail.com> kai-striega <kaistriega+github@gmail.com>
@@ -149,6 +152,8 @@ Lars Buitinck <larsmans@gmail.com> Lars Buitinck <L.J.Buitinck@uva.nl>
149152
Lars Grüter <lagru@mailbox.org> Lars G <lagru@mailbox.org>
150153
Luis Pedro Coelho <luis@luispedro.org> Luis Pedro Coelho <lpc@cmu.edu>
151154
Luke Zoltan Kelley <lkelley@cfa.harvard.edu> lzkelley <lkelley@cfa.harvard.edu>
155+
Magdalena Proszewska <magdalena.proszewska@gmail.com> mpro <magdalena.proszewska@gmail.com>
156+
Magdalena Proszewska <magdalena.proszewska@gmail.com> mproszewska <38814059+mproszewska@users.noreply.github.com>
152157
Manoj Kumar <manojkumarsivaraj334@gmail.com> MechCoder <manojkumarsivaraj334@gmail.com>
153158
Mark DePristo <mdepristo@synapdx.com> markdepristo <mdepristo@synapdx.com>
154159
Mark Weissman <mw9050@gmail.com> m-d-w <mw9050@gmail.com>
@@ -157,6 +162,7 @@ Mark Wiebe <mwwiebe@gmail.com> Mark Wiebe <mwiebe@continuum.io>
157162
Mark Wiebe <mwwiebe@gmail.com> Mark Wiebe <mwiebe@enthought.com>
158163
Mark Wiebe <mwwiebe@gmail.com> Mark Wiebe <mwiebe@georg.(none)>
159164
Martin Goodson <martingoodson@gmail.com> martingoodson <martingoodson@gmail.com>
165+
Martin Reinecke <martin@mpa-garching.mpg.de> mreineck <martin@mpa-garching.mpg.de>
160166
Martin Teichmann <martin.teichmann@xfel.eu> Martin Teichmann <lkb.teichmann@gmail.com>
161167
Martino Sorbaro <martino.sorbaro@ed.ac.uk> martinosorb <martino.sorbaro@ed.ac.uk>
162168
Mattheus Ueckermann <empeeu@yahoo.com> empeeu <empeeu@yahoo.com>
@@ -232,7 +238,12 @@ Wojtek Ruszczewski <git@wr.waw.pl> wrwrwr <git@wr.waw.pl>
232238
Yuji Kanagawa <yuji.kngw.80s.revive@gmail.com> kngwyu <yuji.kngw.80s.revive@gmail.com>
233239
Yury Kirienko <yury.kirienko@gmail.com> kirienko <yury.kirienko@gmail.com>
234240
Zixu Zhao <zixu.zhao.tireless@gmail.com> ZZhaoTireless <zixu.zhao.tireless@gmail.com>
235-
Ziyan Zhou<ziyan.zhou@mujin.co.jp> Ziyan <ziyan.zhou@mujin.co.jp>
241+
Ziyan Zhou <ziyan.zhou@mujin.co.jp> Ziyan <ziyan.zhou@mujin.co.jp>
242+
Zieji Pohz <poh.ziji@gmail.com> jpoh <poh.zijie@gmail.com>
243+
Zieji Pohz <poh.ziji@gmail.com> zjpoh <poh.zijie@gmail.com>
244+
Zieji Pohz <poh.ziji@gmail.com> Zijie (ZJ) Poh <8103276+zjpoh@users.noreply.github.com>
245+
Zolisa Bleki <zolisa.bleki@gmail.com> zoj613 <44142765+zoj613@users.noreply.github.com>
246+
Zolisa Bleki <zolisa.bleki@gmail.com> RedRuM <44142765+zoj613@users.noreply.github.com>
236247
luzpaz <kunda@scribus.net> luz.paz <luzpaz@users.noreply.github.com>
237248
luzpaz <kunda@scribus.net> luzpaz <luzpaz@users.noreply.github.com>
238249
spacescientist <aspacescientist@protonmail.com> spacescientist <spacescientist@pm.me>

0 commit comments

Comments
 (0)