Skip to content

Commit

Permalink
Merge branch 'main' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
bskinn authored May 8, 2024
2 parents 32ec671 + cf7e02e commit 8c216cf
Show file tree
Hide file tree
Showing 322 changed files with 25,662 additions and 22,143 deletions.
159 changes: 132 additions & 27 deletions .authors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,24 @@
alternate_emails:
- [email protected]
- [email protected]
- [email protected]
aliases:
- Mike Sarahan
- Michael Sarahan
num_commits: 4000
num_commits: 2001
first_commit: 2015-09-04 21:31:08
- name: Jonathan J. Helmus
email: [email protected]
aliases:
- Jonathan Helmus
num_commits: 109
num_commits: 110
first_commit: 2014-06-09 17:25:05
github: jjhelmus
- name: Isuru Fernando
email: [email protected]
alternate_emails:
- [email protected]
num_commits: 82
num_commits: 84
first_commit: 2017-06-16 15:14:34
github: isuruf
- name: Dan Blanchard
Expand Down Expand Up @@ -63,7 +64,7 @@
alternate_emails:
- [email protected]
- [email protected]
num_commits: 86
num_commits: 43
first_commit: 2017-05-17 23:54:01
github: mandeep
- name: Filipe Fernandes
Expand Down Expand Up @@ -117,7 +118,7 @@
- [email protected]
aliases:
- heather999
num_commits: 4
num_commits: 2
first_commit: 2016-04-11 12:02:50
github: heather999
- name: Ryan Grout
Expand Down Expand Up @@ -161,7 +162,7 @@
aliases:
- MinRK
github: minrk
num_commits: 14
num_commits: 16
first_commit: 2014-02-13 19:43:59
- name: Matty G
email: [email protected]
Expand Down Expand Up @@ -571,7 +572,7 @@
alternate_emails:
- [email protected]
- [email protected]
num_commits: 196
num_commits: 98
first_commit: 2016-09-06 16:58:21
github: soapy1
- name: Bruno Oliveira
Expand Down Expand Up @@ -611,7 +612,7 @@
first_commit: 2015-08-30 06:44:37
- name: Marcel Bargull
email: [email protected]
num_commits: 70
num_commits: 85
first_commit: 2016-09-26 11:45:54
github: mbargull
alternate_emails:
Expand Down Expand Up @@ -754,7 +755,7 @@
alternate_emails:
- [email protected]
- [email protected]
num_commits: 136
num_commits: 74
first_commit: 2015-04-21 13:26:39
github: jakirkham
- name: Anthony Scopatz
Expand Down Expand Up @@ -873,7 +874,7 @@
alternate_emails:
- [email protected]
- [email protected]
num_commits: 12
num_commits: 6
first_commit: 2018-02-27 16:37:19
- name: David Li
email: [email protected]
Expand Down Expand Up @@ -967,7 +968,7 @@
first_commit: 2019-01-26 13:17:33
- name: Rachel Rigdon
email: [email protected]
num_commits: 268
num_commits: 134
first_commit: 2019-01-24 15:12:09
github: rrigdon
aliases:
Expand Down Expand Up @@ -1018,7 +1019,7 @@
github: theultimate1
- name: Kai Tietz
email: [email protected]
num_commits: 8
num_commits: 9
first_commit: 2019-04-04 02:38:29
github: katietz
alternate_emails:
Expand Down Expand Up @@ -1056,14 +1057,16 @@
github: spalmrot-tic
- name: Daniel Bast
email: [email protected]
num_commits: 14
num_commits: 16
first_commit: 2019-06-07 02:44:13
github: dbast
- name: Duncan Macleod
email: [email protected]
num_commits: 5
num_commits: 7
email: [email protected]
first_commit: 2019-06-13 08:07:25
github: duncanmmacleod
alternate_emails:
- [email protected]
- name: Chris Osborn
email: [email protected]
num_commits: 1
Expand Down Expand Up @@ -1118,7 +1121,7 @@
alternate_emails:
- [email protected]
- [email protected]
num_commits: 38
num_commits: 19
first_commit: 2019-10-17 23:05:16
github: beckermr
- name: Jinzhe Zeng
Expand Down Expand Up @@ -1199,7 +1202,7 @@
alternate_emails:
- [email protected]
- name: Ken Odegard
num_commits: 60
num_commits: 178
email: [email protected]
first_commit: 2020-09-08 19:53:41
github: kenodegard
Expand All @@ -1222,7 +1225,7 @@
first_commit: 2020-11-19 10:46:41
- name: Jannis Leidel
email: [email protected]
num_commits: 21
num_commits: 32
github: jezdez
first_commit: 2020-11-19 10:46:41
- name: Christof Kaufmann
Expand All @@ -1237,7 +1240,7 @@
github: pre-commit-ci[bot]
aliases:
- pre-commit-ci[bot]
num_commits: 27
num_commits: 64
first_commit: 2021-11-20 01:47:17
- name: Jacob Walls
email: [email protected]
Expand All @@ -1248,7 +1251,7 @@
github: beeankha
alternate_emails:
- [email protected]
num_commits: 5
num_commits: 23
first_commit: 2022-01-19 16:40:06
- name: Conda Bot
email: [email protected]
Expand All @@ -1259,7 +1262,7 @@
alternate_emails:
- [email protected]
- [email protected]
num_commits: 36
num_commits: 96
first_commit: 2022-01-17 18:09:22
- name: Uwe L. Korn
email: [email protected]
Expand All @@ -1268,7 +1271,7 @@
- name: Daniel Holth
email: [email protected]
github: dholth
num_commits: 3
num_commits: 15
first_commit: 2022-04-28 05:22:14
- name: Rylan Chord
email: [email protected]
Expand All @@ -1278,7 +1281,7 @@
- name: Travis Hathaway
email: [email protected]
github: travishathaway
num_commits: 2
num_commits: 7
first_commit: 2022-05-12 05:53:02
- name: Kyle Leaders
email: [email protected]
Expand All @@ -1294,18 +1297,20 @@
first_commit: 2022-04-18 12:03:05
- name: Jürgen Gmach
email: [email protected]
alternate_emails:
- [email protected]
github: jugmac00
num_commits: 2
num_commits: 3
first_commit: 2022-05-31 07:52:17
- name: Katherine Kinnaman
email: [email protected]
github: kathatherine
num_commits: 1
num_commits: 3
first_commit: 2022-07-07 10:56:31
- name: dependabot[bot]
email: 49699333+dependabot[bot]@users.noreply.github.com
github: dependabot[bot]
num_commits: 1
num_commits: 4
first_commit: 2022-05-31 04:34:40
- name: Serhii Kupriienko
email: [email protected]
Expand All @@ -1322,7 +1327,7 @@
- name: Jaime Rodríguez-Guerra
email: [email protected]
github: jaimergp
num_commits: 2
num_commits: 10
first_commit: 2022-11-02 19:34:51
- name: Dave Clements
email: [email protected]
Expand All @@ -1334,3 +1339,103 @@
github: brettcannon
num_commits: 1
first_commit: 2022-11-16 21:54:14
- name: Srivas Venkatesh
email: [email protected]
num_commits: 2
first_commit: 2022-12-14 19:50:36
github: sven6002
- name: Ernst Luring
email: [email protected]
num_commits: 1
first_commit: 2023-02-23 20:40:15
github: ernstluring
- name: Felix Kühnl
email: [email protected]
num_commits: 2
first_commit: 2023-03-07 22:37:07
github: xileF1337
- name: T Coxon
email: [email protected]
num_commits: 1
first_commit: 2023-02-24 01:34:03
github: tttc3
- name: Peet Whittaker
email: [email protected]
num_commits: 1
first_commit: 2023-02-24 01:35:43
github: peetw
- name: Johnny
email: [email protected]
alternate_emails:
- [email protected]
num_commits: 2
first_commit: 2023-03-22 00:34:22
github: johnnynunez
- name: Ryan Keith
email: [email protected]
aliases:
- Ryan
github: ryanskeith
num_commits: 6
first_commit: 2023-03-22 03:11:02
- name: Rishabh Singh
email: [email protected]
aliases:
- rishabh11336
github: rishabh11336
num_commits: 2
first_commit: 2023-05-15 11:19:48
- name: Ferry Firmansjah
email: [email protected]
github: ffirmanff
num_commits: 1
first_commit: 2023-04-14 11:54:03
- name: Riadh Fezzani
email: [email protected]
github: rfezzani
num_commits: 1
first_commit: 2023-05-23 13:46:49
- name: Jose Diaz-Gonzalez
email: [email protected]
github: josegonzalez
num_commits: 1
first_commit: 2023-06-14 16:02:40
- name: Jack Olivieri
email: [email protected]
github: boldorider4
num_commits: 1
first_commit: 2023-08-30 10:32:34
- name: Wolf Vollprecht
email: [email protected]
github: wolfv
num_commits: 1
first_commit: 2023-09-22 07:01:49
- name: Dave Karetnyk
email: [email protected]
github: DaveKaretnyk
num_commits: 1
first_commit: 2023-09-16 05:21:09
- name: Shaun Walbridge
email: [email protected]
github: scdub
num_commits: 2
first_commit: 2023-08-18 02:53:28
- name: Daniel Petry
email: [email protected]
github: danpetry
aliases:
- danpetry
num_commits: 1
first_commit: 2023-11-02 13:57:57
- name: H. Vetinari
email: [email protected]
github: h-vetinari
aliases:
- h-vetinari
num_commits: 1
first_commit: 2023-10-25 09:33:34
- name: Finn Womack
email: [email protected]
num_commits: 1
first_commit: 2024-02-06 11:43:45
github: finnagin
3 changes: 0 additions & 3 deletions .coveragerc

This file was deleted.

5 changes: 5 additions & 0 deletions .devcontainer/apt-deps.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
git
less
htop
nano
ssh
38 changes: 38 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
// For format details, see https://aka.ms/devcontainer.json
{
"name": "Miniconda (default-channel=defaults)",
"image": "continuumio/miniconda3:latest",

// Features to add to the dev container. More info: https://containers.dev/features.
// "features": {},

// Use 'forwardPorts' to make a list of ports inside the container available locally.
// "forwardPorts": [],
// Use 'postCreateCommand' to run commands after the container is created.
"postCreateCommand": "bash /workspaces/conda-build/.devcontainer/post_create.sh",
// Use 'postStartCommand' to run commands after the container is started.
"postStartCommand": "bash /workspaces/conda-build/.devcontainer/post_start.sh",

// Configure tool-specific properties.
"customizations": {
"vscode": {
"settings": {
"python.defaultInterpreterPath": "/opt/conda/bin/python",
"python.testing.pytestArgs": [
"tests"
],
"python.testing.unittestEnabled": false,
"python.testing.pytestEnabled": true
},
"extensions": [
"charliermarsh.ruff",
"eamodio.gitlens",
"ms-toolsai.jupyter"
]
}
}

// Adjust to connect as non-root instead. More info: https://aka.ms/dev-containers-non-root.
// "remoteUser": "root",

}
Loading

0 comments on commit 8c216cf

Please sign in to comment.