Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 23.9.x back into main post-release. #13155

Merged
merged 4 commits into from
Sep 29, 2023
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 56 additions & 24 deletions .authors.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- name: Michael Sarahan
email: msarahan@continuum.io
num_commits: 1330
num_commits: 665
first_commit: 2015-09-07 04:10:25
github: msarahan
aliases:
Expand All @@ -21,7 +21,7 @@
- Rachel
- name: Tian Zhang
email: zhangtian1000@gmail.com
num_commits: 278
num_commits: 139
first_commit: 2016-06-27 23:04:02
github: HugoTian
aliases:
Expand Down Expand Up @@ -127,7 +127,7 @@
first_commit: 2020-06-22 13:01:33
- name: Daniel Bast
email: 2790401+dbast@users.noreply.github.com
num_commits: 13
num_commits: 15
first_commit: 2021-04-08 13:00:55
github: dbast
- name: David Warde-Farley
Expand Down Expand Up @@ -169,7 +169,7 @@
email: clee@anaconda.com
alternate_emails:
- chenghlee@users.noreply.github.com
num_commits: 67
num_commits: 68
first_commit: 2020-04-28 19:44:22
github: chenghlee
- name: Guo Ci
Expand Down Expand Up @@ -361,7 +361,7 @@
alternate_emails:
- ni.huang@sanger.ac.uk
- nh3@users.noreply.github.com
num_commits: 14
num_commits: 7
first_commit: 2019-03-19 14:35:04
- name: Anže Starič
email: anze.staric@gmail.com
Expand Down Expand Up @@ -459,7 +459,7 @@
first_commit: 2019-12-03 15:22:09
- name: Bryan Van de Ven
email: bryanv@continuum.io
num_commits: 500
num_commits: 250
first_commit: 2012-10-17 04:24:05
aliases:
- bryanv@continuum.io
Expand Down Expand Up @@ -645,7 +645,7 @@
github: bradsaracik
- name: Jaime Rodríguez-Guerra
email: jaime.rogue@gmail.com
num_commits: 84
num_commits: 45
first_commit: 2016-04-18 20:12:46
github: jaimergp
aliases:
Expand Down Expand Up @@ -1005,7 +1005,7 @@
github: wojdyr
- name: Jacopo Sabbatini
email: dedalusj@gmail.com
num_commits: 18
num_commits: 9
first_commit: 2014-09-21 11:26:40
github: dedalusj
aliases:
Expand All @@ -1031,7 +1031,7 @@
github: okhoma
- name: Duncan Macleod
email: duncan.macleod@ligo.org
num_commits: 3
num_commits: 4
first_commit: 2019-04-02 13:17:47
github: duncanmmacleod
- name: Dzianis Shpektarau
Expand Down Expand Up @@ -1185,7 +1185,7 @@
- david.hirschfeld@gazprom-mt.com
- david.hirschfeld@stanwell.com
- dave.hirschfeld@gmail.com
num_commits: 24
num_commits: 12
first_commit: 2015-09-21 02:26:23
- name: Bernd Jünger
email: me@blindgaenger.net
Expand Down Expand Up @@ -1461,7 +1461,7 @@
github: MaxNoe
- name: Benjamin Bertrand
email: beenje@gmail.com
num_commits: 8
num_commits: 9
first_commit: 2019-08-09 09:05:36
github: beenje
- name: Alain Domissy
Expand All @@ -1479,7 +1479,7 @@
github: hartb
- name: Matthew R. Becker
email: becker.mr@gmail.com
num_commits: 22
num_commits: 11
aliases:
- Matthew R. Becker
- Matthew R Becker
Expand Down Expand Up @@ -1519,7 +1519,7 @@
first_commit: 2019-08-26 04:18:04
- name: Jannis Leidel
email: jannis@leidel.info
num_commits: 101
num_commits: 107
first_commit: 2021-06-07 16:46:45
github: jezdez
- name: Saranya Mahalingam
Expand Down Expand Up @@ -1643,7 +1643,7 @@
alternate_emails:
- kirkhamj@janelia.hhmi.org
- jakirkham@gmail.com
num_commits: 30
num_commits: 15
first_commit: 2015-07-28 20:41:54
- name: Alisue
email: lambdalisue@hashnote.net
Expand Down Expand Up @@ -1957,7 +1957,7 @@
first_commit: 2016-12-11 16:14:03
- name: Ken Odegard
email: kodegard@anaconda.com
num_commits: 566
num_commits: 302
first_commit: 2016-09-27 18:04:21
github: kenodegard
aliases:
Expand Down Expand Up @@ -2003,7 +2003,7 @@
- name: Daniel Holth
email: dholth@anaconda.com
github: dholth
num_commits: 70
num_commits: 87
first_commit: 2021-11-18 08:57:14
- name: John Flavin
email: flavinj@gmail.com
Expand All @@ -2022,7 +2022,7 @@
github: pre-commit-ci[bot]
aliases:
- pre-commit-ci[bot]
num_commits: 57
num_commits: 65
first_commit: 2021-11-16 10:37:29
- name: Yuvi Panda
email: yuvipanda@gmail.com
Expand All @@ -2041,7 +2041,7 @@
first_commit: 2021-11-29 23:03:32
- name: Conda Bot
email: 18747875+conda-bot@users.noreply.github.com
num_commits: 104
num_commits: 68
first_commit: 2022-01-17 20:22:29
github: conda-bot
aliases:
Expand Down Expand Up @@ -2083,7 +2083,7 @@
github: beeankha
alternate_emails:
- beeankha@gmail.com
num_commits: 29
num_commits: 30
first_commit: 2022-05-12 13:39:02
- name: Kian-Meng Ang
email: kianmeng.ang@gmail.com
Expand All @@ -2103,7 +2103,7 @@
- name: Travis Hathaway
email: travis.j.hathaway@gmail.com
github: travishathaway
num_commits: 26
num_commits: 31
first_commit: 2022-03-31 12:01:37
- name: Tom Hu
email: 88201630+thomasrockhu-codecov@users.noreply.github.com
Expand Down Expand Up @@ -2199,7 +2199,7 @@
github: pkmooreanaconda
- name: Mahe Iram Khan
email: 65779580+ForgottenProgramme@users.noreply.github.com
num_commits: 8
num_commits: 10
first_commit: 2022-10-07 23:21:54
github: ForgottenProgramme
- name: Erik Sundell
Expand Down Expand Up @@ -2275,12 +2275,12 @@
- name: Ikko Eltociear Ashimine
email: eltociear@gmail.com
github: eltociear
num_commits: 2
num_commits: 4
first_commit: 2023-02-22 08:09:10
- name: Gil Forsyth
email: gforsyth@users.noreply.github.com
github: gforsyth
num_commits: 1
num_commits: 2
first_commit: 2023-02-14 11:44:58
- name: Andrea Ghensi
email: andrea.ghensi@gmail.com
Expand All @@ -2295,7 +2295,7 @@
- name: Carlos H Brandt
email: 482051+chbrandt@users.noreply.github.com
github: chbrandt
num_commits: 1
num_commits: 2
first_commit: 2023-05-04 06:23:00
- name: Thomas Lam
email: 79589038+tl-hbk@users.noreply.github.com
Expand Down Expand Up @@ -2371,3 +2371,35 @@
- P. Talley
num_commits: 1
first_commit: 2023-08-25 20:43:39
alternate_emails:
- otaithleigh@users.noreply.github.com
- name: Wolf Vollprecht
email: w.vollprecht@gmail.com
github: wolfv
num_commits: 1
first_commit: 2023-09-13 11:05:49
- name: Sergio Oller
email: sergioller@gmail.com
github: zeehio
num_commits: 1
first_commit: 2023-09-21 09:31:47
- name: Tarcisio
email: tarcisioe@pm.me
github: tarcisioe
num_commits: 1
first_commit: 2023-08-22 05:16:15
- name: Jason Carpenter
email: jcarpenter@manifold.ai
github: jmcarpenter2
num_commits: 1
first_commit: 2023-08-29 05:59:42
- name: Udo-Peter Steyer
email: 35242265+psteyer@users.noreply.github.com
github: psteyer
num_commits: 1
first_commit: 2023-08-29 17:06:04
- name: Monius
email: m1105930979@gmail.com
github: Mon-ius
num_commits: 1
first_commit: 2023-07-20 21:22:41
8 changes: 7 additions & 1 deletion .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,7 @@ James Winegar <jameswinegar@users.noreply.github.com>
Jan-Benedikt Jagusch <jan.jagusch@gmail.com>
Jan-Philipp Igla <hello@jpigla.de>
Jannis Leidel <jannis@leidel.info>
Jason Carpenter <jcarpenter@manifold.ai>
Jason Grout <jgrout6@bloomberg.net>
Jason Vestuto <jvestuto@continuum.io>
Javier Rovegno <javier.rovegno@gmail.com> jrovegno <tatadeluxe@gmail.com>
Expand Down Expand Up @@ -361,6 +362,7 @@ Mika Fischer <mika.fischer@zoopnet.de>
Mike Croucher <michael.p.croucher@googlemail.com>
MinRK <benjaminrk@gmail.com>
Minh Phan <phanducnhatminh@gmail.com>
Monius <m1105930979@gmail.com>
Morgan Parry <mparry@users.noreply.github.com>
Morten Enemark Lund <melund@gmail.com>
Murray Read <read@ccdc.cam.ac.uk>
Expand Down Expand Up @@ -392,7 +394,7 @@ Paul Yim <pseudoyim@users.noreply.github.com>
Pavel Zwerschke <pavelzw@gmail.com>
Pete Bachant <petebachant@gmail.com>
Peter Cable <petercable@gmail.com>
Peter Talley <peterctalley@gmail.com> P. Talley <peterctalley@gmail.com>
Peter Talley <peterctalley@gmail.com> P. Talley <otaithleigh@users.noreply.github.com>
Peter Williams <peter@newton.cx>
Phil Elson <pelson.pub@gmail.com>
Philip Thomas <pthomas.v3@gmail.com> psthomas <pthomas.v3@gmail.com>
Expand Down Expand Up @@ -437,6 +439,7 @@ Sauco Cano Navarro <saucoide@gmail.com> saucoide <saucoide@gmail.com>
Scott Evtuch <scott@evtuch.net>
Sean Ross-Ross <srossross@gmail.com> srossross <srossross@gmail.com>
Sebastien Awwad <sebastien.awwad@gmail.com>
Sergio Oller <sergioller@gmail.com>
Shannon Green <sgreen@cochlear.com>
Shaun Thompson <shaun.b.thompson@gmail.com> autotmp <shaun.b.thompson@gmail.com>
Shaun Walbridge <shaun.walbridge@gmail.com>
Expand Down Expand Up @@ -466,6 +469,7 @@ Steven Engler <smengler3@gmail.com>
Stijn Verstraeten <stinos@users.noreply.github.com> stinos <stinos@users.noreply.github.com>
Stuart Berg <bergs@janelia.hhmi.org>
Tadeu Manoel <tadeu@esss.com.br>
Tarcisio <tarcisioe@pm.me>
Teake Nutma <t.a.nutma@rug.nl> Teake Nutma <teake.nutma@gmail.com>
Thomas Holder <thomas.holder@schrodinger.com>
Thomas Kluyver <takowl@gmail.com>
Expand Down Expand Up @@ -493,6 +497,7 @@ Trent Nelson <trent@trent.me>
Troy Powell <tpowell@MathBook Pro.(none)>
Tyler Kim <tkim139@illinois.edu> Tyler Kim <tyler.kimothy@gmail.com>
Tyrone Grandison <tgrandison@gmail.com>
Udo-Peter Steyer <35242265+psteyer@users.noreply.github.com>
Ullrich Koethe <ullrich.koethe@iwr.uni-heidelberg.de>
Uwe L. Korn <xhochy@users.noreply.github.com> Uwe L. Korn <uwe.korn@quantco.com>
Valentin Haenel <vhaenel@anaconda.com> esc <valentin@haenel.co>
Expand All @@ -507,6 +512,7 @@ Wes Turner <wes.turner@gmail.com>
Will Warner <electronwill@gmail.com> electronwill <electronwill@gmail.com>
Willy Chen <st40809@gmail.com>
Winston Sebastian Pais <51374812+WinstonPais@users.noreply.github.com>
Wolf Vollprecht <w.vollprecht@gmail.com>
Wolfgang Ulmer <wolfgang.ulmer@de.bosch.com> Wolfgang Ulmer <wulmer@web.de>
Xuehai Pan <XuehaiPan@outlook.com>
Xylar Asay-Davis <xylarstorm@gmail.com>
Expand Down
6 changes: 6 additions & 0 deletions AUTHORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@ Authors are sorted alphabetically.
* Jan-Benedikt Jagusch
* Jan-Philipp Igla
* Jannis Leidel
* Jason Carpenter
* Jason Grout
* Jason Vestuto
* Javier Rovegno
Expand Down Expand Up @@ -282,6 +283,7 @@ Authors are sorted alphabetically.
* Mike Croucher
* MinRK
* Minh Phan
* Monius
* Morgan Parry
* Morten Enemark Lund
* Murray Read
Expand Down Expand Up @@ -354,6 +356,7 @@ Authors are sorted alphabetically.
* Scott Evtuch
* Sean Ross-Ross
* Sebastien Awwad
* Sergio Oller
* Shannon Green
* Shaun Thompson
* Shaun Walbridge
Expand All @@ -378,6 +381,7 @@ Authors are sorted alphabetically.
* Stijn Verstraeten
* Stuart Berg
* Tadeu Manoel
* Tarcisio
* Teake Nutma
* Thomas Holder
* Thomas Kluyver
Expand All @@ -400,6 +404,7 @@ Authors are sorted alphabetically.
* Troy Powell
* Tyler Kim
* Tyrone Grandison
* Udo-Peter Steyer
* Ullrich Koethe
* Uwe L. Korn
* Valentin Haenel
Expand All @@ -411,6 +416,7 @@ Authors are sorted alphabetically.
* Will Warner
* Willy Chen
* Winston Sebastian Pais
* Wolf Vollprecht
* Wolfgang Ulmer
* Xuehai Pan
* Xylar Asay-Davis
Expand Down
Loading
Loading