Skip to content

Commit

Permalink
Merge branch 'main' into msvc-env-cmd
Browse files Browse the repository at this point in the history
  • Loading branch information
jezdez authored Sep 29, 2023
2 parents b2c65e4 + bb0ca2a commit b0ebefe
Show file tree
Hide file tree
Showing 91 changed files with 1,870 additions and 1,985 deletions.
97 changes: 74 additions & 23 deletions .authors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,20 @@
aliases:
- Mike Sarahan
- Michael Sarahan
num_commits: 4000
num_commits: 2000
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: 83
first_commit: 2017-06-16 15:14:34
github: isuruf
- name: Dan Blanchard
Expand Down Expand Up @@ -63,7 +63,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 +117,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 @@ -571,7 +571,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 @@ -754,7 +754,7 @@
alternate_emails:
- [email protected]
- [email protected]
num_commits: 140
num_commits: 73
first_commit: 2015-04-21 13:26:39
github: jakirkham
- name: Anthony Scopatz
Expand Down Expand Up @@ -873,7 +873,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 +967,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 +1018,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,12 +1056,12 @@
github: spalmrot-tic
- name: Daniel Bast
email: [email protected]
num_commits: 15
num_commits: 16
first_commit: 2019-06-07 02:44:13
github: dbast
- name: Duncan Macleod
email: [email protected]
num_commits: 5
num_commits: 6
first_commit: 2019-06-13 08:07:25
github: duncanmmacleod
- name: Chris Osborn
Expand Down Expand Up @@ -1118,7 +1118,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 +1199,7 @@
alternate_emails:
- [email protected]
- name: Ken Odegard
num_commits: 106
num_commits: 133
email: [email protected]
first_commit: 2020-09-08 19:53:41
github: kenodegard
Expand All @@ -1222,7 +1222,7 @@
first_commit: 2020-11-19 10:46:41
- name: Jannis Leidel
email: [email protected]
num_commits: 33
num_commits: 30
github: jezdez
first_commit: 2020-11-19 10:46:41
- name: Christof Kaufmann
Expand All @@ -1237,7 +1237,7 @@
github: pre-commit-ci[bot]
aliases:
- pre-commit-ci[bot]
num_commits: 38
num_commits: 52
first_commit: 2021-11-20 01:47:17
- name: Jacob Walls
email: [email protected]
Expand All @@ -1248,7 +1248,7 @@
github: beeankha
alternate_emails:
- [email protected]
num_commits: 14
num_commits: 20
first_commit: 2022-01-19 16:40:06
- name: Conda Bot
email: [email protected]
Expand All @@ -1259,7 +1259,7 @@
alternate_emails:
- [email protected]
- [email protected]
num_commits: 42
num_commits: 38
first_commit: 2022-01-17 18:09:22
- name: Uwe L. Korn
email: [email protected]
Expand All @@ -1268,7 +1268,7 @@
- name: Daniel Holth
email: [email protected]
github: dholth
num_commits: 6
num_commits: 12
first_commit: 2022-04-28 05:22:14
- name: Rylan Chord
email: [email protected]
Expand All @@ -1294,8 +1294,10 @@
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]
Expand All @@ -1305,7 +1307,7 @@
- name: dependabot[bot]
email: 49699333+dependabot[bot]@users.noreply.github.com
github: dependabot[bot]
num_commits: 2
num_commits: 4
first_commit: 2022-05-31 04:34:40
- name: Serhii Kupriienko
email: [email protected]
Expand All @@ -1322,7 +1324,7 @@
- name: Jaime Rodríguez-Guerra
email: [email protected]
github: jaimergp
num_commits: 2
num_commits: 4
first_commit: 2022-11-02 19:34:51
- name: Dave Clements
email: [email protected]
Expand All @@ -1336,7 +1338,7 @@
first_commit: 2022-11-16 21:54:14
- name: Srivas Venkatesh
email: [email protected]
num_commits: 1
num_commits: 2
first_commit: 2022-12-14 19:50:36
github: sven6002
- name: Ernst Luring
Expand Down Expand Up @@ -1364,3 +1366,52 @@
num_commits: 1
first_commit: 2023-03-22 00:34:22
github: johnnynunez
- name: Ryan Keith
email: [email protected]
aliases:
- Ryan
github: ryanskeith
num_commits: 5
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
3 changes: 0 additions & 3 deletions .coveragerc

This file was deleted.

File renamed without changes.
15 changes: 15 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates

version: 2
updates:
- package-ecosystem: "pip"
directory: "/docs/"
schedule:
interval: "weekly"
allow:
# Allow only production updates for Sphinx
- dependency-name: "sphinx"
dependency-type: "production"
6 changes: 6 additions & 0 deletions .github/labels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,9 @@
- name: knowledge-medium
description: "[deprecated]"
color: "888888"

# Tags
- name: tag::noarch
description: related to noarch builds
color: "86C579"
aliases: []
4 changes: 2 additions & 2 deletions .github/workflows/cla.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check CLA
uses: conda/actions/check-cla@v23.5.1
uses: conda/actions/check-cla@v23.7.0
with:
# [required]
# A token with ability to comment, label, and modify the commit status
# (`pull_request: write` and `statuses: write` for fine-grained PAT; `repo` for classic PAT)
# (default: secrets.GITHUB_TOKEN)
token: ${{ secrets.CLA_ACTION_TOKEN }}
# [required]
# Label to apply to contributor's PR once CLA is singed
# Label to apply to contributor's PR once CLA is signed
label: cla-signed

# [required]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/labels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
GLOBAL: https://raw.githubusercontent.com/conda/infra/main/.github/global.yml
LOCAL: .github/labels.yml
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- id: has_local
uses: andstor/[email protected]
with:
Expand Down
8 changes: 3 additions & 5 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ jobs:
days-before-issue-close: 30
# [type::support] issues have a more aggressive stale/close timeline
- only-issue-labels: type::support
days-before-issue-stale: 21
days-before-issue-close: 7
days-before-issue-stale: 90
days-before-issue-close: 21
steps:
- uses: conda/actions/read-yaml@v23.4.0
- uses: conda/actions/read-yaml@v23.7.0
id: read_yaml
with:
path: https://raw.githubusercontent.com/conda/infra/main/.github/messages.yml
Expand Down Expand Up @@ -69,8 +69,6 @@ jobs:
stale-pr-label: stale
# Label to apply on closed PRs
close-pr-label: stale::closed
# Reason to use when closing PRs
close-pr-reason: not_planned

# Remove stale label from issues/PRs on updates/comments
remove-stale-when-updated: true
Expand Down
Loading

0 comments on commit b0ebefe

Please sign in to comment.