Merge branch 'main' into pickle-vs-deepcopy

conda · Jun 21, 2024 · cf5f903 · cf5f903
2 parents 380a41c + 4457362
commit cf5f903
Show file tree

Hide file tree

Showing 139 changed files with 3,135 additions and 2,981 deletions.
diff --git a/.authors.yml b/.authors.yml
@@ -612,7 +612,7 @@
   first_commit: 2015-08-30 06:44:37
 - name: Marcel Bargull
   email: marcel.bargull@udo.edu
-  num_commits: 85
+  num_commits: 88
   first_commit: 2016-09-26 11:45:54
   github: mbargull
   alternate_emails:
@@ -1202,7 +1202,7 @@
   alternate_emails:
   - clee@anaconda.com
 - name: Ken Odegard
-  num_commits: 178
+  num_commits: 204
   email: kodegard@anaconda.com
   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: 64
+  num_commits: 71
   first_commit: 2021-11-20 01:47:17
 - name: Jacob Walls
   email: jacobtylerwalls@gmail.com
@@ -1251,7 +1251,7 @@
   github: beeankha
   alternate_emails:
   - beeankha@gmail.com
-  num_commits: 23
+  num_commits: 27
   first_commit: 2022-01-19 16:40:06
 - name: Conda Bot
   email: 18747875+conda-bot@users.noreply.github.com
@@ -1262,7 +1262,7 @@
   alternate_emails:
   - ad-team+condabot@anaconda.com
   - 18747875+conda-bot@users.noreply.github.com
-  num_commits: 96
+  num_commits: 53
   first_commit: 2022-01-17 18:09:22
 - name: Uwe L. Korn
   email: xhochy@users.noreply.github.com
@@ -1310,7 +1310,7 @@
 - name: dependabot[bot]
   email: 49699333+dependabot[bot]@users.noreply.github.com
   github: dependabot[bot]
-  num_commits: 4
+  num_commits: 19
   first_commit: 2022-05-31 04:34:40
 - name: Serhii Kupriienko
   email: 79282962+skupr-anaconda@users.noreply.github.com
@@ -1327,7 +1327,7 @@
 - name: Jaime Rodríguez-Guerra
   email: jaimergp@users.noreply.github.com
   github: jaimergp
-  num_commits: 10
+  num_commits: 13
   first_commit: 2022-11-02 19:34:51
 - name: Dave Clements
   email: tnabtaf@gmail.com
@@ -1439,3 +1439,18 @@
   num_commits: 1
   first_commit: 2024-02-06 11:43:45
   github: finnagin
+- name: Justin Wood (Callek)
+  email: callek@gmail.com
+  num_commits: 1
+  first_commit: 2024-04-29 16:21:41
+  github: Callek
+- name: Tobias Fischer
+  email: info@tobiasfischer.info
+  num_commits: 1
+  first_commit: 2024-03-25 13:13:16
+  github: Tobias-Fischer
+- name: Yannik Tausch
+  email: dev@ytausch.de
+  num_commits: 5
+  first_commit: 2024-03-19 18:09:38
+  github: ytausch
diff --git a/.devcontainer/post_create.sh b/.devcontainer/post_create.sh
@@ -24,4 +24,4 @@ echo "Installing dev dependencies"
     --file "$SRC_CONDA_BUILD/tests/requirements.txt" \
     --file "$SRC_CONDA_BUILD/tests/requirements-Linux.txt" \
     --file "$SRC_CONDA_BUILD/tests/requirements-ci.txt" \
-    "conda>=23.5.0"
+    "conda>=23.7.0"
diff --git a/.github/ISSUE_TEMPLATE/0_bug.yml b/.github/ISSUE_TEMPLATE/0_bug.yml
@@ -1,4 +1,3 @@
----
 name: Bug Report
 description: Create a bug report.
 labels:

diff --git a/.github/ISSUE_TEMPLATE/1_feature.yml b/.github/ISSUE_TEMPLATE/1_feature.yml
@@ -1,4 +1,3 @@
----
 name: Feature Request
 description: Create a feature request.
 labels:

diff --git a/.github/ISSUE_TEMPLATE/2_documentation.yml b/.github/ISSUE_TEMPLATE/2_documentation.yml
@@ -1,4 +1,3 @@
----
 name: Documentation
 description: Create a documentation related issue.
 labels:

diff --git a/.github/ISSUE_TEMPLATE/epic.yml b/.github/ISSUE_TEMPLATE/epic.yml
@@ -1,4 +1,3 @@
----
 name: Epic
 description: A collection of related tickets.
 labels:

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,15 +1,14 @@
-# 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/"
+  - package-ecosystem: pip
+    directory: /docs/
     schedule:
-      interval: "weekly"
+      interval: weekly
     allow:
       # Allow only production updates for Sphinx
-      - dependency-name: "sphinx"
-        dependency-type: "production"
+      - dependency-name: sphinx
+        dependency-type: production
+  - package-ecosystem: github-actions
+    directory: /.github/workflows
+    schedule:
+      interval: weekly
diff --git a/.github/labels.yml b/.github/labels.yml
@@ -1,39 +1,9 @@
 # Builds
-- name: build::review
-  description: trigger a build for this PR
-  color: "7B4052"
+  - name: build::review
+    description: trigger a build for this PR
+    color: '#7b4052'
 
 # Tags
-- name: tag::noarch
-  description: related to noarch builds
-  color: "86C579"
-  aliases: []
-
-# Deprecated
-- name: 3_In_Progress
-  description: "[deprecated] use milestones/project boards"
-  color: "888888"
-- name: 4_Needs_Review
-  description: "[deprecated] use milestones/project boards"
-  color: "888888"
-- name: effort-high
-  description: "[deprecated]"
-  color: "888888"
-- name: effort-low
-  description: "[deprecated] use good-first-issue"
-  color: "888888"
-- name: effort-medium
-  description: "[deprecated]"
-  color: "888888"
-- name: in_progress
-  description: "[deprecated] use milestones/project boards"
-  color: "888888"
-- name: knowledge-high
-  description: "[deprecated]"
-  color: "888888"
-- name: knowledge-low
-  description: "[deprecated] use good-first-issue"
-  color: "888888"
-- name: knowledge-medium
-  description: "[deprecated]"
-  color: "888888"
+  - name: tag::noarch
+    description: related to noarch builds
+    color: '#86c579'
diff --git a/.github/workflows/builds-review.yaml b/.github/workflows/builds-review.yaml
@@ -17,14 +17,16 @@ jobs:
         include:
           - runner: ubuntu-latest
             subdir: linux-64
-          - runner: macos-latest
+          - runner: macos-14
+            subdir: osx-arm64
+          - runner: macos-13
             subdir: osx-64
           - runner: windows-latest
             subdir: win-64
     runs-on: ${{ matrix.runner }}
     steps:
       - name: Remove build label
-        uses: actions/github-script@v6
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea
         with:
           github-token: ${{ secrets.CANARY_ACTION_TOKEN }}
           script: |
@@ -46,14 +48,14 @@ 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@v3
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
           ref: ${{ github.ref }}
           clean: true
           fetch-depth: 0
 
       - name: Create and upload review build
-        uses: conda/actions/canary-release@v23.7.0
+        uses: conda/actions/canary-release@976289d0cfd85139701b26ddd133abdd025a7b5f # v24.5.0
         with:
           package-name: ${{ github.event.repository.name }}
           subdir: ${{ matrix.subdir }}

diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml
@@ -1,4 +1,3 @@
----
 name: CLA
 
 on:
@@ -19,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check CLA
-        uses: conda/actions/check-cla@f46142e89fa703cc69f0421ca1d313ab2d5bfff6
+        uses: conda/actions/check-cla@976289d0cfd85139701b26ddd133abdd025a7b5f # v24.5.0
         with:
           # [required]
           # A token with ability to comment, label, and modify the commit status

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -7,28 +7,28 @@ on:
     branches:
       - main
     paths:
-      - '.github/workflows/docs.yml'
-      - 'docs/**'
+      - .github/workflows/docs.yml
+      - docs/**
 
   # NOTE: github.event context is pull_request payload:
   # https://docs.github.com/en/developers/webhooks-and-events/webhooks/webhook-events-and-payloads#pull_request
   pull_request:
     paths:
-      - '.github/workflows/docs.yml'
-      - 'docs/**'
+      - .github/workflows/docs.yml
+      - docs/**
 
 jobs:
   docs:
     if: '!github.event.repository.fork'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
           fetch-depth: 0
       - name: Setup
-        run : |
+        run: |
           make env-docs
       - name: Build the docs
-        run : |
+        run: |
           cd docs
           conda run --name conda-build-docs make html
diff --git a/.github/workflows/issues.yml b/.github/workflows/issues.yml
@@ -1,4 +1,3 @@
----
 name: Automate Issues
 
 on:
@@ -24,12 +23,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       # remove [pending::feedback]
-      - uses: actions-ecosystem/action-remove-labels@2ce5d41b4b6aa8503e285553f75ed56e0a40bae0
+      - uses: actions-ecosystem/action-remove-labels@2ce5d41b4b6aa8503e285553f75ed56e0a40bae0 # v1.3.0
         with:
           labels: ${{ env.FEEDBACK_LBL }}
           github_token: ${{ secrets.PROJECT_TOKEN }}
       # add [pending::support], if still open
-      - uses: actions-ecosystem/action-add-labels@18f1af5e3544586314bbe15c0273249c770b2daf
+      - uses: actions-ecosystem/action-add-labels@18f1af5e3544586314bbe15c0273249c770b2daf # v1.1.3
         if: github.event.issue.state == 'open'
         with:
           labels: ${{ env.SUPPORT_LBL }}

diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
@@ -1,4 +1,3 @@
----
 name: Sync Labels
 
 on:
@@ -20,20 +19,20 @@ jobs:
       GLOBAL: https://raw.githubusercontent.com/conda/infra/main/.github/global.yml
       LOCAL: .github/labels.yml
     steps:
-      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       - id: has_local
-        uses: andstor/file-existence-action@076e0072799f4942c8bc574a82233e1e4d13e9d6
+        uses: andstor/file-existence-action@076e0072799f4942c8bc574a82233e1e4d13e9d6 # v3.0.0
         with:
           files: ${{ env.LOCAL }}
       - name: Global Only
-        uses: EndBug/label-sync@52074158190acb45f3077f9099fea818aa43f97a
+        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 }}
       - name: Global & Local
-        uses: EndBug/label-sync@52074158190acb45f3077f9099fea818aa43f97a
+        uses: EndBug/label-sync@52074158190acb45f3077f9099fea818aa43f97a # v2.3.3
         if: steps.has_local.outputs.files_exists == 'true'
         with:
           config-file: |

diff --git a/.github/workflows/lock.yml b/.github/workflows/lock.yml
@@ -1,4 +1,3 @@
----
 name: Lock
 
 on:
@@ -18,7 +17,7 @@ jobs:
     if: '!github.event.repository.fork'
     runs-on: ubuntu-latest
     steps:
-      - uses: dessant/lock-threads@1bf7ec25051fe7c00bdd17e6a7cf3d7bfb7dc771
+      - uses: dessant/lock-threads@1bf7ec25051fe7c00bdd17e6a7cf3d7bfb7dc771 # v5.0.1
         with:
           # Number of days of inactivity before a closed issue is locked
           issue-inactive-days: 365

diff --git a/.github/workflows/project.yml b/.github/workflows/project.yml
@@ -1,4 +1,3 @@
----
 name: Add to Project
 
 on:
@@ -14,7 +13,7 @@ jobs:
     if: '!github.event.repository.fork'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/add-to-project@2e5cc851ca7162e9eb510e6da6a5c64022e606a7
+      - uses: actions/add-to-project@9bfe908f2eaa7ba10340b31e314148fcfe6a2458 # v1.0.1
         with:
           # issues are added to the Planning project
           # PRs are added to the Review project

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -1,4 +1,3 @@
----
 name: Stale
 
 on:
@@ -34,12 +33,12 @@ jobs:
             days-before-issue-stale: 90
             days-before-issue-close: 21
     steps:
-      - uses: conda/actions/read-yaml@f46142e89fa703cc69f0421ca1d313ab2d5bfff6
+      - uses: conda/actions/read-yaml@976289d0cfd85139701b26ddd133abdd025a7b5f # v24.5.0
         id: read_yaml
         with:
           path: https://raw.githubusercontent.com/conda/infra/main/.github/messages.yml
 
-      - uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e
+      - uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e # v9.0.0
         id: stale
         with:
           # Only issues with these labels are checked whether they are stale