Merge branch 'main' into patch-1

conda · Sep 3, 2024 · ee6a891 · ee6a891
2 parents 8c216cf + a666e34
commit ee6a891
Show file tree

Hide file tree

Showing 114 changed files with 2,696 additions and 1,636 deletions.
diff --git a/.authors.yml b/.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]
@@ -612,7 +612,7 @@
  first_commit: 2015-08-30 06:44:37
 - name: Marcel Bargull
  email: [email protected]
- num_commits: 85
+ num_commits: 88
  first_commit: 2016-09-26 11:45:54
  github: mbargull
  alternate_emails:
@@ -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: 178
+ 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: 64
+ 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: 23
+ 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: 96
+ 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: 4
+ 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: 10
+ num_commits: 17
  first_commit: 2022-11-02 19:34:51
 - name: Dave Clements
  email: [email protected]
@@ -1439,3 +1439,33 @@
  num_commits: 1
  first_commit: 2024-02-06 11:43:45
  github: finnagin
+- name: Justin Wood (Callek)
+ email: [email protected]
+ num_commits: 1
+ first_commit: 2024-04-29 16:21:41
+ github: Callek
+- name: Tobias Fischer
+ email: [email protected]
+ num_commits: 1
+ first_commit: 2024-03-25 13:13:16
+ github: Tobias-Fischer
+- name: Yannik Tausch
+ email: [email protected]
+ 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
diff --git a/.github/ISSUE_TEMPLATE/0_bug.yml b/.github/ISSUE_TEMPLATE/0_bug.yml
@@ -1,3 +1,5 @@
+# edit this in https://github.com/conda/infrastructure
+
 name: Bug Report
 description: Create a bug report.
 labels:
@@ -13,7 +15,7 @@ body:
 
  Since there are already a lot of open issues, please also take a moment to search existing ones to see if your bug has already been reported. If you find something related, please upvote that issue and provide additional details as necessary.
 
- 💐 Thank you for helping to make Conda better. We would be unable to improve Conda without our community!
+ 💐 Thank you for helping to make `conda/conda-build` better. We would be unable to improve `conda/conda-build` without our community!
  - type: checkboxes
  id: checks
  attributes:
@@ -70,6 +72,7 @@ body:
  conda list --show-channel-urls
  ```
  render: shell
+
  - type: textarea
  id: context
  attributes:

diff --git a/.github/ISSUE_TEMPLATE/1_feature.yml b/.github/ISSUE_TEMPLATE/1_feature.yml
@@ -1,3 +1,5 @@
+# edit this in https://github.com/conda/infrastructure
+
 name: Feature Request
 description: Create a feature request.
 labels:
@@ -13,7 +15,7 @@ body:
 
  Since there are already a lot of open issues, please also take a moment to search existing ones to see if your feature request has already been submitted. If you find something related, please upvote that issue and provide additional details as necessary.
 
- 💐 Thank you for helping to make Conda better. We would be unable to improve Conda without our community!
+ 💐 Thank you for helping to make `conda/conda-build` better. We would be unable to improve `conda/conda-build` without our community!
  - type: checkboxes
  id: checks
  attributes:

diff --git a/.github/ISSUE_TEMPLATE/2_documentation.yml b/.github/ISSUE_TEMPLATE/2_documentation.yml
@@ -1,3 +1,5 @@
+# edit this in https://github.com/conda/infrastructure
+
 name: Documentation
 description: Create a documentation related issue.
 labels:

diff --git a/.github/ISSUE_TEMPLATE/epic.yml b/.github/ISSUE_TEMPLATE/epic.yml
@@ -1,3 +1,5 @@
+# edit this in https://github.com/conda/infrastructure
+
 name: Epic
 description: A collection of related tickets.
 labels:
@@ -15,7 +17,8 @@ body:
 
  Since there are already a lot of open issues, please also take a moment to search existing ones to see if a similar epic has already been opened. If you find something related, please upvote that issue and provide additional details as necessary.
 
- 💐 Thank you for helping to make Conda better. We would be unable to improve Conda without our community!
+ 💐 Thank you for helping to make `conda/conda-build` better. We would be unable to improve `conda/conda-build` without our community!
+
  - type: checkboxes
  id: checks
  attributes:

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -11,18 +11,20 @@
 ### Checklist - did you ...
 
 <!-- If any of the following items aren't relevant to your contribution,
- please still tick them so we know you've gone through the checklist. -->
+ please either tick them or use ~strikethrough~ so we know you've gone
+ through the checklist. -->
 
-- [ ] Add a file to the `news` directory ([using the template](../blob/main/news/TEMPLATE)) for the next release's release notes?
+- [ ] Add a file to the `news` directory ([using the template](https://github.com/conda/conda-build/blob/main/news/TEMPLATE)) for the next release's release notes?
  <!-- All "significant" changes should get an entry:
  - user-facing changes or enhancements
  - bug fixes
  - deprecations
  - documentation updates
- - other changes -->
+ - etc -->
 - [ ] Add / update necessary tests?
 - [ ] Add / update outdated documentation?
 
+
 <!-- Just as a reminder, everyone in all conda org spaces (including PRs)
  must follow the Conda Org Code of Conduct (link below).
 
@@ -31,5 +33,5 @@
  let us know!
 
  Helpful links:
- - Conda Org COC: https://github.com/conda-incubator/governance/blob/main/CODE_OF_CONDUCT.md
- - Contributing docs: ../blob/main/CONTRIBUTING.md -->
+ - Conda Org COC: https://github.com/conda/conda-build/blob/main/CODE_OF_CONDUCT.md
+ - Contributing docs: https://github.com/conda/conda-build/blob/main/CONTRIBUTING.md -->
diff --git a/.github/dependabot.yml b/.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:
+ - '*'
diff --git a/.github/template-files/config.yml b/.github/template-files/config.yml
@@ -0,0 +1,54 @@
+conda/governance:
+ # [required] community files
+ - CODE_OF_CONDUCT.md
+
+conda/conda:
+ # issue template details for templates/issues/bug.yml template
+ - .github/template-files/templates/issue_template_details.yml
+
+conda/infrastructure:
+ # [required] general workflows
+ - .github/workflows/cla.yml
+ - .github/workflows/update.yml
+
+ # [optional] to include repo in https://github.com/orgs/conda/projects/2
+ - .github/workflows/issues.yml
+ - .github/workflows/labels.yml
+ - .github/workflows/project.yml
+
+ # [optional] stale bot workflows
+ - .github/workflows/stale.yml
+ - .github/workflows/lock.yml
+
+ # [optional] general processes for the conda org
+ - src: templates/HOW_WE_USE_GITHUB.md
+ dst: HOW_WE_USE_GITHUB.md
+
+ # [optional] standard issue templates
+ - src: templates/issues/bug.yml
+ dst: .github/ISSUE_TEMPLATE/0_bug.yml
+
+ - src: templates/issues/feature.yml
+ dst: .github/ISSUE_TEMPLATE/1_feature.yml
+
+ - src: templates/issues/documentation.yml
+ dst: .github/ISSUE_TEMPLATE/2_documentation.yml
+
+ - src: templates/issues/epic.yml
+ dst: .github/ISSUE_TEMPLATE/epic.yml
+
+ # [optional] standard PR template
+ - src: templates/pull_requests/news_tests_docs.md
+ dst: .github/template-files/templates/pull_request_template_details.md
+ - src: templates/pull_requests/base.md
+ dst: .github/PULL_REQUEST_TEMPLATE.md
+
+ # [optional] rever release files
+ - src: templates/releases/RELEASE.md
+ dst: RELEASE.md
+ with:
+ placeholder: YY.M
+ - src: templates/releases/rever.xsh
+ dst: rever.xsh
+ - src: templates/releases/TEMPLATE
+ dst: news/TEMPLATE
diff --git a/.github/template-files/templates/issue_template_details.yml b/.github/template-files/templates/issue_template_details.yml
@@ -0,0 +1,39 @@
+ - type: textarea
+ id: info
+ attributes:
+ label: Conda Info
+ description: |
+ Let's collect some basic information about your conda install.
+
+ Please run the following command from your command line and paste the output below.
+
+ ```bash
+ conda info
+ ```
+ render: shell
+ - type: textarea
+ id: config
+ attributes:
+ label: Conda Config
+ description: |
+ Let's collect any customizations you may have for your conda install.
+
+ Please run the following command from your command line and paste the output below.
+
+ ```bash
+ conda config --show-sources
+ ```
+ render: shell
+ - type: textarea
+ id: list
+ attributes:
+ label: Conda list
+ description: |
+ The packages installed into your environment can offer clues as to the problem you are facing.
+
+ Please activate the environment within which you are encountering this bug, run the following command from your command line, and paste the output below.
+
+ ```bash
+ conda list --show-channel-urls
+ ```
+ render: shell
diff --git a/.github/template-files/templates/pull_request_template_details.md b/.github/template-files/templates/pull_request_template_details.md
@@ -0,0 +1,15 @@
+### Checklist - did you ...
+
+<!-- If any of the following items aren't relevant to your contribution,
+ please either tick them or use ~strikethrough~ so we know you've gone
+ through the checklist. -->
+
+- [ ] Add a file to the `news` directory ([using the template](https://github.com/conda/conda-build/blob/main/news/TEMPLATE)) for the next release's release notes?
+ <!-- All "significant" changes should get an entry:
+ - user-facing changes or enhancements
+ - bug fixes
+ - deprecations
+ - documentation updates
+ - etc -->
+- [ ] Add / update necessary tests?
+- [ ] Add / update outdated documentation?
diff --git a/.github/workflows/builds-review.yaml b/.github/workflows/builds-review.yaml
@@ -48,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@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
+ - 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@1e442e090ad28c9b0f85697105703a303320ffd1
+ 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
@@ -18,7 +18,7 @@ jobs:
  runs-on: ubuntu-latest
  steps:
  - name: Check CLA
- uses: conda/actions/check-cla@1e442e090ad28c9b0f85697105703a303320ffd1
+ uses: conda/actions/check-cla@15f883f14f4232f83658e3609c3316d58905138f # v24.8.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
@@ -22,7 +22,7 @@ jobs:
  if: '!github.event.repository.fork'
  runs-on: ubuntu-latest
  steps:
- - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
+ - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
  with:
  fetch-depth: 0
  - name: Setup