From 1035104a2be40c2914eb55183b5beb049708c510 Mon Sep 17 00:00:00 2001 From: Matthew R Becker Date: Fri, 3 Jul 2020 10:35:54 -0500 Subject: [PATCH] Updated authorship for 3.7.4 --- .authors.yml | 25 ++++++++++++++++++------- .mailmap | 14 +++++++++----- AUTHORS.rst | 12 ++++++++---- 3 files changed, 35 insertions(+), 16 deletions(-) diff --git a/.authors.yml b/.authors.yml index bbd90526f..5316d83a1 100644 --- a/.authors.yml +++ b/.authors.yml @@ -27,7 +27,7 @@ aliases: - John Kirkham - jakirkham - num_commits: 8 + num_commits: 9 first_commit: 2016-03-17 21:05:53 github: jakirkham - name: Daniel Bast @@ -235,7 +235,7 @@ email: uwe.korn@quantco.com alternate_emails: - xhochy@users.noreply.github.com - num_commits: 9 + num_commits: 13 first_commit: 2019-06-27 08:26:49 github: xhochy - name: C.A.M. Gerlach @@ -251,7 +251,7 @@ github: isuruf - name: Julian Rüth email: julian.rueth@fsfe.org - num_commits: 9 + num_commits: 18 first_commit: 2019-01-14 22:53:11 github: saraedum - name: cshaley @@ -298,7 +298,7 @@ github: jschueller - name: Duncan Macleod email: duncan.macleod@ligo.org - num_commits: 1 + num_commits: 2 first_commit: 2018-12-21 09:06:21 github: duncanmmacleod - name: Peter Killick @@ -357,7 +357,7 @@ - cjwright4242@gmail.com aliases: - christopher - num_commits: 99 + num_commits: 101 first_commit: 2017-01-05 19:25:16 github: CJ-Wright - name: Jason Grout @@ -391,12 +391,12 @@ github: shadowwalkersb - name: Matthew R Becker email: becker.mr@gmail.com - num_commits: 141 + num_commits: 156 first_commit: 2020-01-07 17:44:33 github: beckermr - name: Matthew R. Becker email: beckermr@users.noreply.github.com - num_commits: 24 + num_commits: 25 first_commit: 2020-01-19 19:32:30 github: beckermr - name: Natasha Pavlovikj @@ -429,11 +429,22 @@ github: leofang - name: Stuart Berg email: bergs@janelia.hhmi.org + num_commits: 1 + first_commit: 2020-06-28 13:24:33 + github: stuarteberg - name: Axel Huebl email: axel.huebl@plasma.ninja + num_commits: 2 + first_commit: 2020-06-06 15:29:37 + github: ax3l - name: Hadrien Mary email: hadrien.mary@gmail.com alternate_emails: - hadim@users.noreply.github.com + num_commits: 21 + first_commit: 2020-05-27 07:53:50 + github: hadim - name: Thomas Hopkins email: thomashopkins000@gmail.com + num_commits: 2 + first_commit: 2020-07-01 10:33:54 diff --git a/.mailmap b/.mailmap index 1165dbd18..d8f61c9cc 100644 --- a/.mailmap +++ b/.mailmap @@ -21,9 +21,12 @@ shadow_walker Michael Sarahan Mike Sarahan Min RK Matthew R. Becker +Hadrien Mary Hadrien Mary +Julian Rüth Mark Harfouche Eric Dill Eric Dill Eric Dill Eric Dill +Uwe L. Korn Uwe L. Korn Natasha Pavlovikj Chris Burr Chris Burr Jan Schulz @@ -32,13 +35,11 @@ Justin Calamari Jason Furmanek Patrick Sodré Maksim Rakitin Maksim Rakitin -Uwe L. Korn Uwe L. Korn +John Kirkham John Kirkham +John Kirkham jakirkham C.A.M. Gerlach -Julian Rüth refraction-ray Leo Fang -John Kirkham John Kirkham -John Kirkham jakirkham Leopold Talirz Gonzalo Pena-Castellanos Daniel Bast <2790401+dbast@users.noreply.github.com> @@ -71,9 +72,12 @@ Nicholas Bollweg Alex Goodman Lion Krischer ap-- +Duncan Macleod Peter Killick Henry Schreiner hajapy +Axel Huebl +Thomas Hopkins lorenz Tom Augspurger Ryan May @@ -88,8 +92,8 @@ Nathan Goldbaum cshaley <6740446+cshaley@users.noreply.github.com> David Brochart Julien Schueller -Duncan Macleod Jason Grout Tim Werner Dave Hirschfeld Nils Wentzell +Stuart Berg diff --git a/AUTHORS.rst b/AUTHORS.rst index 13ce66a05..bcefd4bd7 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -12,8 +12,11 @@ Authors are sorted by number of commits. * Michael Sarahan * Min RK * Matthew R. Becker +* Hadrien Mary +* Julian Rüth * Mark Harfouche * Eric Dill +* Uwe L. Korn * Natasha Pavlovikj * Chris Burr * Jan Schulz @@ -22,12 +25,10 @@ Authors are sorted by number of commits. * Jason Furmanek * Patrick Sodré * Maksim Rakitin -* Uwe L. Korn +* John Kirkham * C.A.M. Gerlach -* Julian Rüth * refraction-ray * Leo Fang -* John Kirkham * Leopold Talirz * Gonzalo Pena-Castellanos * Daniel Bast @@ -59,9 +60,12 @@ Authors are sorted by number of commits. * Alex Goodman * Lion Krischer * ap-- +* Duncan Macleod * Peter Killick * Henry Schreiner * hajapy +* Axel Huebl +* Thomas Hopkins * lorenz * Tom Augspurger * Ryan May @@ -76,8 +80,8 @@ Authors are sorted by number of commits. * cshaley * David Brochart * Julien Schueller -* Duncan Macleod * Jason Grout * Tim Werner * Dave Hirschfeld * Nils Wentzell +* Stuart Berg