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
Tobias-Fischer committed Mar 24, 2024
2 parents ce70f66 + ab137d2 commit 5a66529
Show file tree
Hide file tree
Showing 72 changed files with 1,274 additions and 670 deletions.
25 changes: 15 additions & 10 deletions .authors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@
aliases:
- MinRK
github: minrk
num_commits: 15
num_commits: 16
first_commit: 2014-02-13 19:43:59
- name: Matty G
email: meawoppl@gmail.com
Expand Down Expand Up @@ -612,7 +612,7 @@
first_commit: 2015-08-30 06:44:37
- name: Marcel Bargull
email: marcel.bargull@udo.edu
num_commits: 82
num_commits: 85
first_commit: 2016-09-26 11:45:54
github: mbargull
alternate_emails:
Expand Down Expand Up @@ -1202,7 +1202,7 @@
alternate_emails:
- clee@anaconda.com
- name: Ken Odegard
num_commits: 168
num_commits: 178
email: kodegard@anaconda.com
first_commit: 2020-09-08 19:53:41
github: kenodegard
Expand Down Expand Up @@ -1240,7 +1240,7 @@
github: pre-commit-ci[bot]
aliases:
- pre-commit-ci[bot]
num_commits: 61
num_commits: 64
first_commit: 2021-11-20 01:47:17
- name: Jacob Walls
email: jacobtylerwalls@gmail.com
Expand All @@ -1251,7 +1251,7 @@
github: beeankha
alternate_emails:
- beeankha@gmail.com
num_commits: 20
num_commits: 23
first_commit: 2022-01-19 16:40:06
- name: Conda Bot
email: 18747875+conda-bot@users.noreply.github.com
Expand All @@ -1262,7 +1262,7 @@
alternate_emails:
- ad-team+condabot@anaconda.com
- 18747875+conda-bot@users.noreply.github.com
num_commits: 44
num_commits: 96
first_commit: 2022-01-17 18:09:22
- name: Uwe L. Korn
email: xhochy@users.noreply.github.com
Expand All @@ -1271,7 +1271,7 @@
- name: Daniel Holth
email: dholth@anaconda.com
github: dholth
num_commits: 14
num_commits: 15
first_commit: 2022-04-28 05:22:14
- name: Rylan Chord
email: rchord@users.noreply.github.com
Expand All @@ -1281,7 +1281,7 @@
- name: Travis Hathaway
email: travis.j.hathaway@gmail.com
github: travishathaway
num_commits: 6
num_commits: 7
first_commit: 2022-05-12 05:53:02
- name: Kyle Leaders
email: remkade@users.noreply.github.com
Expand All @@ -1305,7 +1305,7 @@
- name: Katherine Kinnaman
email: kkinnaman@anaconda.com
github: kathatherine
num_commits: 2
num_commits: 3
first_commit: 2022-07-07 10:56:31
- name: dependabot[bot]
email: 49699333+dependabot[bot]@users.noreply.github.com
Expand Down Expand Up @@ -1376,7 +1376,7 @@
aliases:
- Ryan
github: ryanskeith
num_commits: 5
num_commits: 6
first_commit: 2023-03-22 03:11:02
- name: Rishabh Singh
email: 67859818+rishabh11336@users.noreply.github.com
Expand Down Expand Up @@ -1434,3 +1434,8 @@
- h-vetinari
num_commits: 1
first_commit: 2023-10-25 09:33:34
- name: Finn Womack
email: flan313@gmail.com
num_commits: 1
first_commit: 2024-02-06 11:43:45
github: finnagin
2 changes: 0 additions & 2 deletions ci/github/.condarc → .github/condarc
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,5 @@ auto_update_conda: False
auto_activate_base: True
notify_outdated_conda: False
changeps1: False
pkgs_dirs:
- /usr/share/miniconda/envs/test/pkgs
always_yes: True
local_repodata_ttl: 7200
Loading

0 comments on commit 5a66529

Please sign in to comment.