Merge pull request conda#13155 from conda/23.9.x

.authors.yml

@@ -1,6 +1,6 @@
 - name: Michael Sarahan
   email: [email protected]
-  num_commits: 1330
+  num_commits: 665
   first_commit: 2015-09-07 04:10:25
   github: msarahan
   aliases:
@@ -21,7 +21,7 @@
   - Rachel
 - name: Tian Zhang
   email: [email protected]
-  num_commits: 278
+  num_commits: 139
   first_commit: 2016-06-27 23:04:02
   github: HugoTian
   aliases:
@@ -127,7 +127,7 @@
   first_commit: 2020-06-22 13:01:33
 - name: Daniel Bast
   email: [email protected]
-  num_commits: 13
+  num_commits: 15
   first_commit: 2021-04-08 13:00:55
   github: dbast
 - name: David Warde-Farley
@@ -169,7 +169,7 @@
   email: [email protected]
   alternate_emails:
   - [email protected]
-  num_commits: 67
+  num_commits: 68
   first_commit: 2020-04-28 19:44:22
   github: chenghlee
 - name: Guo Ci
@@ -361,7 +361,7 @@
   alternate_emails:
   - [email protected]
   - [email protected]
-  num_commits: 14
+  num_commits: 7
   first_commit: 2019-03-19 14:35:04
 - name: Anže Starič
   email: [email protected]
@@ -459,7 +459,7 @@
   first_commit: 2019-12-03 15:22:09
 - name: Bryan Van de Ven
   email: [email protected]
-  num_commits: 500
+  num_commits: 250
   first_commit: 2012-10-17 04:24:05
   aliases:
   - [email protected]
@@ -645,7 +645,7 @@
   github: bradsaracik
 - name: Jaime Rodríguez-Guerra
   email: [email protected]
-  num_commits: 84
+  num_commits: 45
   first_commit: 2016-04-18 20:12:46
   github: jaimergp
   aliases:
@@ -1005,7 +1005,7 @@
   github: wojdyr
 - name: Jacopo Sabbatini
   email: [email protected]
-  num_commits: 18
+  num_commits: 9
   first_commit: 2014-09-21 11:26:40
   github: dedalusj
   aliases:
@@ -1031,7 +1031,7 @@
   github: okhoma
 - name: Duncan Macleod
   email: [email protected]
-  num_commits: 3
+  num_commits: 4
   first_commit: 2019-04-02 13:17:47
   github: duncanmmacleod
 - name: Dzianis Shpektarau
@@ -1185,7 +1185,7 @@
   - [email protected]
   - [email protected]
   - [email protected]
-  num_commits: 24
+  num_commits: 12
   first_commit: 2015-09-21 02:26:23
 - name: Bernd Jünger
   email: [email protected]
@@ -1461,7 +1461,7 @@
   github: MaxNoe
 - name: Benjamin Bertrand
   email: [email protected]
-  num_commits: 8
+  num_commits: 9
   first_commit: 2019-08-09 09:05:36
   github: beenje
 - name: Alain Domissy
@@ -1479,7 +1479,7 @@
   github: hartb
 - name: Matthew R. Becker
   email: [email protected]
-  num_commits: 22
+  num_commits: 11
   aliases:
   - Matthew R. Becker
   - Matthew R Becker
@@ -1519,7 +1519,7 @@
   first_commit: 2019-08-26 04:18:04
 - name: Jannis Leidel
   email: [email protected]
-  num_commits: 101
+  num_commits: 107
   first_commit: 2021-06-07 16:46:45
   github: jezdez
 - name: Saranya Mahalingam
@@ -1643,7 +1643,7 @@
   alternate_emails:
   - [email protected]
   - [email protected]
-  num_commits: 30
+  num_commits: 15
   first_commit: 2015-07-28 20:41:54
 - name: Alisue
   email: [email protected]
@@ -1957,7 +1957,7 @@
   first_commit: 2016-12-11 16:14:03
 - name: Ken Odegard
   email: [email protected]
-  num_commits: 566
+  num_commits: 302
   first_commit: 2016-09-27 18:04:21
   github: kenodegard
   aliases:
@@ -2003,7 +2003,7 @@
 - name: Daniel Holth
   email: [email protected]
   github: dholth
-  num_commits: 70
+  num_commits: 87
   first_commit: 2021-11-18 08:57:14
 - name: John Flavin
   email: [email protected]
@@ -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: [email protected]
@@ -2041,7 +2041,7 @@
   first_commit: 2021-11-29 23:03:32
 - name: Conda Bot
   email: [email protected]
-  num_commits: 104
+  num_commits: 68
   first_commit: 2022-01-17 20:22:29
   github: conda-bot
   aliases:
@@ -2083,7 +2083,7 @@
   github: beeankha
   alternate_emails:
   - [email protected]
-  num_commits: 29
+  num_commits: 30
   first_commit: 2022-05-12 13:39:02
 - name: Kian-Meng Ang
   email: [email protected]
@@ -2103,7 +2103,7 @@
 - name: Travis Hathaway
   email: [email protected]
   github: travishathaway
-  num_commits: 26
+  num_commits: 31
   first_commit: 2022-03-31 12:01:37
 - name: Tom Hu
   email: [email protected]
@@ -2199,7 +2199,7 @@
   github: pkmooreanaconda
 - name: Mahe Iram Khan
   email: [email protected]
-  num_commits: 8
+  num_commits: 10
   first_commit: 2022-10-07 23:21:54
   github: ForgottenProgramme
 - name: Erik Sundell
@@ -2275,12 +2275,12 @@
 - name: Ikko Eltociear Ashimine
   email: [email protected]
   github: eltociear
-  num_commits: 2
+  num_commits: 4
   first_commit: 2023-02-22 08:09:10
 - name: Gil Forsyth
   email: [email protected]
   github: gforsyth
-  num_commits: 1
+  num_commits: 2
   first_commit: 2023-02-14 11:44:58
 - name: Andrea Ghensi
   email: [email protected]
@@ -2295,7 +2295,7 @@
 - name: Carlos H Brandt
   email: [email protected]
   github: chbrandt
-  num_commits: 1
+  num_commits: 2
   first_commit: 2023-05-04 06:23:00
 - name: Thomas Lam
   email: [email protected]
@@ -2371,3 +2371,35 @@
   - P. Talley
   num_commits: 1
   first_commit: 2023-08-25 20:43:39
+  alternate_emails:
+  - [email protected]
+- name: Wolf Vollprecht
+  email: [email protected]
+  github: wolfv
+  num_commits: 1
+  first_commit: 2023-09-13 11:05:49
+- name: Sergio Oller
+  email: [email protected]
+  github: zeehio
+  num_commits: 1
+  first_commit: 2023-09-21 09:31:47
+- name: Tarcisio
+  email: [email protected]
+  github: tarcisioe
+  num_commits: 1
+  first_commit: 2023-08-22 05:16:15
+- name: Jason Carpenter
+  email: [email protected]
+  github: jmcarpenter2
+  num_commits: 1
+  first_commit: 2023-08-29 05:59:42
+- name: Udo-Peter Steyer
+  email: [email protected]
+  github: psteyer
+  num_commits: 1
+  first_commit: 2023-08-29 17:06:04
+- name: Monius
+  email: [email protected]
+  github: Mon-ius
+  num_commits: 1
+  first_commit: 2023-07-20 21:22:41

.mailmap

@@ -227,6 +227,7 @@ James Winegar <[email protected]>
 Jan-Benedikt Jagusch <[email protected]>
 Jan-Philipp Igla <[email protected]>
 Jannis Leidel <[email protected]>
+Jason Carpenter <[email protected]>
 Jason Grout <[email protected]>
 Jason Vestuto <[email protected]>
 Javier Rovegno <[email protected]> jrovegno <[email protected]>
@@ -361,6 +362,7 @@ Mika Fischer <[email protected]>
 Mike Croucher <[email protected]>
 MinRK <[email protected]>
 Minh Phan <[email protected]>
+Monius <[email protected]>
 Morgan Parry <[email protected]>
 Morten Enemark Lund <[email protected]>
 Murray Read <[email protected]>
@@ -392,7 +394,7 @@ Paul Yim <[email protected]>
 Pavel Zwerschke <[email protected]>
 Pete Bachant <[email protected]>
 Peter Cable <[email protected]>
-Peter Talley <[email protected]> P. Talley <peterctalley@gmail.com>
+Peter Talley <[email protected]> P. Talley <[email protected].com>
 Peter Williams <[email protected]>
 Phil Elson <[email protected]>
 Philip Thomas <[email protected]> psthomas <[email protected]>
@@ -437,6 +439,7 @@ Sauco Cano Navarro <[email protected]> saucoide <[email protected]>
 Scott Evtuch <[email protected]>
 Sean Ross-Ross <[email protected]> srossross <[email protected]>
 Sebastien Awwad <[email protected]>
+Sergio Oller <[email protected]>
 Shannon Green <[email protected]>
 Shaun Thompson <[email protected]> autotmp <[email protected]>
 Shaun Walbridge <[email protected]>
@@ -466,6 +469,7 @@ Steven Engler <[email protected]>
 Stijn Verstraeten <[email protected]> stinos <[email protected]>
 Stuart Berg <[email protected]>
 Tadeu Manoel <[email protected]>
+Tarcisio <[email protected]>
 Teake Nutma <[email protected]> Teake Nutma <[email protected]>
 Thomas Holder <[email protected]>
 Thomas Kluyver <[email protected]>
@@ -493,6 +497,7 @@ Trent Nelson <[email protected]>
 Troy Powell <tpowell@MathBook Pro.(none)>
 Tyler Kim <[email protected]> Tyler Kim <[email protected]>
 Tyrone Grandison <[email protected]>
+Udo-Peter Steyer <[email protected]>
 Ullrich Koethe <[email protected]>
 Uwe L. Korn <[email protected]> Uwe L. Korn <[email protected]>
 Valentin Haenel <[email protected]> esc <[email protected]>
@@ -507,6 +512,7 @@ Wes Turner <[email protected]>
 Will Warner <[email protected]> electronwill <[email protected]>
 Willy Chen <[email protected]>
 Winston Sebastian Pais <[email protected]>
+Wolf Vollprecht <[email protected]>
 Wolfgang Ulmer <[email protected]> Wolfgang Ulmer <[email protected]>
 Xuehai Pan <[email protected]>
 Xylar Asay-Davis <[email protected]>

AUTHORS.md

@@ -173,6 +173,7 @@ Authors are sorted alphabetically.
 * Jan-Benedikt Jagusch
 * Jan-Philipp Igla
 * Jannis Leidel
+* Jason Carpenter
 * Jason Grout
 * Jason Vestuto
 * Javier Rovegno
@@ -282,6 +283,7 @@ Authors are sorted alphabetically.
 * Mike Croucher
 * MinRK
 * Minh Phan
+* Monius
 * Morgan Parry
 * Morten Enemark Lund
 * Murray Read
@@ -354,6 +356,7 @@ Authors are sorted alphabetically.
 * Scott Evtuch
 * Sean Ross-Ross
 * Sebastien Awwad
+* Sergio Oller
 * Shannon Green
 * Shaun Thompson
 * Shaun Walbridge
@@ -378,6 +381,7 @@ Authors are sorted alphabetically.
 * Stijn Verstraeten
 * Stuart Berg
 * Tadeu Manoel
+* Tarcisio
 * Teake Nutma
 * Thomas Holder
 * Thomas Kluyver
@@ -400,6 +404,7 @@ Authors are sorted alphabetically.
 * Troy Powell
 * Tyler Kim
 * Tyrone Grandison
+* Udo-Peter Steyer
 * Ullrich Koethe
 * Uwe L. Korn
 * Valentin Haenel
@@ -411,6 +416,7 @@ Authors are sorted alphabetically.
 * Will Warner
 * Willy Chen
 * Winston Sebastian Pais
+* Wolf Vollprecht
 * Wolfgang Ulmer
 * Xuehai Pan
 * Xylar Asay-Davis