Merge branch 'main' into issue/4890

.authors.yml

@@ -21,7 +21,7 @@
   email: [email protected]
   alternate_emails:
   - [email protected]
-  num_commits: 84
+  num_commits: 86
   first_commit: 2017-06-16 15:14:34
   github: isuruf
 - name: Dan Blanchard
@@ -162,7 +162,7 @@
   aliases:
   - MinRK
   github: minrk
-  num_commits: 16
+  num_commits: 17
   first_commit: 2014-02-13 19:43:59
 - name: Matty G
   email: [email protected]
@@ -1121,7 +1121,7 @@
   alternate_emails:
   - [email protected]
   - [email protected]
-  num_commits: 19
+  num_commits: 21
   first_commit: 2019-10-17 23:05:16
   github: beckermr
 - name: Jinzhe Zeng
@@ -1202,7 +1202,7 @@
   alternate_emails:
   - [email protected]
 - name: Ken Odegard
-  num_commits: 204
+  num_commits: 213
   email: [email protected]
   first_commit: 2020-09-08 19:53:41
   github: kenodegard
@@ -1240,7 +1240,7 @@
   github: pre-commit-ci[bot]
   aliases:
   - pre-commit-ci[bot]
-  num_commits: 71
+  num_commits: 79
   first_commit: 2021-11-20 01:47:17
 - name: Jacob Walls
   email: [email protected]
@@ -1251,7 +1251,7 @@
   github: beeankha
   alternate_emails:
   - [email protected]
-  num_commits: 27
+  num_commits: 34
   first_commit: 2022-01-19 16:40:06
 - name: Conda Bot
   email: [email protected]
@@ -1262,7 +1262,7 @@
   alternate_emails:
   - [email protected]
   - [email protected]
-  num_commits: 53
+  num_commits: 58
   first_commit: 2022-01-17 18:09:22
 - name: Uwe L. Korn
   email: [email protected]
@@ -1271,7 +1271,7 @@
 - name: Daniel Holth
   email: [email protected]
   github: dholth
-  num_commits: 15
+  num_commits: 16
   first_commit: 2022-04-28 05:22:14
 - name: Rylan Chord
   email: [email protected]
@@ -1310,7 +1310,7 @@
 - name: dependabot[bot]
   email: 49699333+dependabot[bot]@users.noreply.github.com
   github: dependabot[bot]
-  num_commits: 19
+  num_commits: 34
   first_commit: 2022-05-31 04:34:40
 - name: Serhii Kupriienko
   email: [email protected]
@@ -1327,7 +1327,7 @@
 - name: Jaime Rodríguez-Guerra
   email: [email protected]
   github: jaimergp
-  num_commits: 13
+  num_commits: 17
   first_commit: 2022-11-02 19:34:51
 - name: Dave Clements
   email: [email protected]
@@ -1454,3 +1454,18 @@
   num_commits: 5
   first_commit: 2024-03-19 18:09:38
   github: ytausch
+- name: Tim Paine
+  email: [email protected]
+  num_commits: 1
+  first_commit: 2024-06-10 11:17:05
+  github: timkpaine
+- name: Klaus Zimmermann
+  email: [email protected]
+  num_commits: 2
+  first_commit: 2024-06-07 10:02:14
+  github: zklaus
+- name: Daniel Ching
+  email: [email protected]
+  num_commits: 1
+  first_commit: 2024-06-07 11:14:31
+  github: carterbox

.github/dependabot.yml

@@ -3,12 +3,20 @@ updates:
   - package-ecosystem: pip
     directory: /docs/
     schedule:
-      interval: weekly
+      interval: monthly
     allow:
       # Allow only production updates for Sphinx
       - dependency-name: sphinx
         dependency-type: production
+    groups:
+      docs:
+        patterns:
+          - '*'
   - package-ecosystem: github-actions
     directory: /.github/workflows
     schedule:
-      interval: weekly
+      interval: monthly
+    groups:
+      workflows:
+        patterns:
+          - '*'

.github/workflows/builds-review.yaml

@@ -48,7 +48,7 @@ jobs:
 
       # Clean checkout of specific git ref needed for package metadata version
       # which needs env vars GIT_DESCRIBE_TAG and GIT_BUILD_STR:
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
           ref: ${{ github.ref }}
           clean: true

.github/workflows/docs.yml

@@ -22,7 +22,7 @@ jobs:
     if: '!github.event.repository.fork'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
           fetch-depth: 0
       - name: Setup

.github/workflows/labels.yml

@@ -5,11 +5,15 @@ on:
   # https://docs.github.com/en/developers/webhooks-and-events/webhooks/webhook-events-and-payloads#workflow_dispatch
   workflow_dispatch:
     inputs:
-      dryrun:
-        description: 'dryrun: Preview changes to labels without editing them (true|false)'
-        required: true
+      delete-unmapped:
+        description: Delete labels not mapped in either global or local label configurations.
+        default: false
+        type: boolean
+
+      dry-run:
+        description: Run label synchronization workflow without making any changes.
+        default: false
         type: boolean
-        default: true
 
 jobs:
   sync:
@@ -19,24 +23,27 @@ jobs:
       GLOBAL: https://raw.githubusercontent.com/conda/infra/main/.github/global.yml
       LOCAL: .github/labels.yml
     steps:
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+
       - id: has_local
         uses: andstor/file-existence-action@076e0072799f4942c8bc574a82233e1e4d13e9d6 # v3.0.0
         with:
           files: ${{ env.LOCAL }}
+
       - name: Global Only
         uses: EndBug/label-sync@52074158190acb45f3077f9099fea818aa43f97a # v2.3.3
         if: steps.has_local.outputs.files_exists == 'false'
         with:
           config-file: ${{ env.GLOBAL }}
-          delete-other-labels: true
-          dry-run: ${{ github.event.inputs.dryrun }}
+          delete-other-labels: ${{ inputs.delete-unmapped }}
+          dry-run: ${{ inputs.dry-run }}
+
       - name: Global & Local
         uses: EndBug/label-sync@52074158190acb45f3077f9099fea818aa43f97a # v2.3.3
         if: steps.has_local.outputs.files_exists == 'true'
         with:
           config-file: |
             ${{ env.GLOBAL }}
             ${{ env.LOCAL }}
-          delete-other-labels: true
-          dry-run: ${{ github.event.inputs.dryrun }}
+          delete-other-labels: ${{ inputs.delete-unmapped }}
+          dry-run: ${{ inputs.dry-run }}

.github/workflows/project.yml

@@ -13,7 +13,7 @@ jobs:
     if: '!github.event.repository.fork'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/add-to-project@9bfe908f2eaa7ba10340b31e314148fcfe6a2458 # v1.0.1
+      - uses: actions/add-to-project@244f685bbc3b7adfa8466e08b698b5577571133e # v1.0.2
         with:
           # issues are added to the Planning project
           # PRs are added to the Review project