Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update branch from main #13929

Merged
merged 45 commits into from
May 21, 2024
Merged

Update branch from main #13929

merged 45 commits into from
May 21, 2024
+8,014 −6,511

Conversation

ForgottenProgramme
Copy link
Contributor

Description

Checklist - did you ...

  • Add a file to the news directory (using the template) for the next release's release notes?
  • Add / update necessary tests?
  • Add / update outdated documentation?

dholth and others added 30 commits March 20, 2024 21:46
@dholth
Add missing news for #13653 (#13711)
7921682 
* add missing news for #13653
@Callek @beeankha
Provide codesigned stub exe's (#13721)
925a448 
Co-authored-by: Bianca Henderson <beeankha@gmail.com>
@jezdez
Changelog 24.4.0 (#13847)
0973db3 
* Update .authors.yml

* Update .mailmap

* Update news

* Updated authorship for 24.4.0

* Updated CHANGELOG for 24.4.0

* Add first-time contributions
@jezdez @pre-commit-ci
Disable anaconda-anon-usage for CI. (#13803) (#13848)
b6c1b42 
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
@jezdez @kenodegard
Fix pluggy 1.5.0 failure in tests (#13838) (#13849)
9e38ac2 
Co-authored-by: Ken Odegard <kodegard@anaconda.com>
@dependabot
Bump conda-incubator/setup-miniconda in /.github/workflows (#13855)
663dcd9 
Bumps [conda-incubator/setup-miniconda](https://github.com/conda-incubator/setup-miniconda) from 3.0.3 to 3.0.4.
- [Release notes](https://github.com/conda-incubator/setup-miniconda/releases)
- [Changelog](https://github.com/conda-incubator/setup-miniconda/blob/main/CHANGELOG.md)
- [Commits](conda-incubator/setup-miniconda@0301788...a426040)

---
updated-dependencies:
- dependency-name: conda-incubator/setup-miniconda
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump peter-evans/create-pull-request from 6.0.4 to 6.0.5 in /.github/…
1b76569 
…workflows (#13856)

Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 6.0.4 to 6.0.5.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](peter-evans/create-pull-request@9153d83...6d6857d)

---
updated-dependencies:
- dependency-name: peter-evans/create-pull-request
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@conda-bot
🔄 synced file(s) with conda/infrastructure (#13857)
0faca31 
Co-authored-by: Conda Bot <conda-bot@users.noreply.github.com>
@jaimergp
Explicitly use macos-13 for macOS Intel runners (#13836)
e85ef69
@dependabot
Bump conda/actions from 24.2.0 to 24.4.0 in /.github/workflows (#13858)
5b11a8c 
Bumps [conda/actions](https://github.com/conda/actions) from 24.2.0 to 24.4.0.
- [Release notes](https://github.com/conda/actions/releases)
- [Commits](conda/actions@f46142e...1e442e0)

---
updated-dependencies:
- dependency-name: conda/actions
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@jezdez @dependabot
Bump conda/actions from 24.2.0 to 24.4.0 in /.github/workflows (#13859)
a4a6d74 
Bumps [conda/actions](https://github.com/conda/actions) from 24.2.0 to 24.4.0.
- [Release notes](https://github.com/conda/actions/releases)
- [Commits](conda/actions@f46142e...1e442e0)

Refs #13858.

---
updated-dependencies:
- dependency-name: conda/actions
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@jaimergp @jezdez
Explicitly use macos-13 for macOS Intel runners (#13836)
9117ad7
@kenodegard
Add arm64 review builds (#13845)
514c647
@beeankha @kenodegard
Fix conda env create/update --json regression (#13860)
9edc502 
* Add test to check json output when creating envs with yaml file

* Add environment_with_pip.yml

* Reformat test, change import

---------

Co-authored-by: Ken Odegard <kodegard@anaconda.com>
@jezdez
Pass CODECOV_TOKEN to codecov GitHub Action step. (#13867)
ebeb91c
@conda-bot
Update test durations (#13873)
898543f
@jezdez
Merge pull request #13871 from conda/24.4.x
ad61575 
Merge `24.4.x` back into `main`
@pre-commit-ci @dbast
[pre-commit.ci] pre-commit autoupdate (#13876)
be5da40 
* [pre-commit.ci] pre-commit autoupdate

updates:
- [github.com/astral-sh/ruff-pre-commit: v0.3.7 → v0.4.2](astral-sh/ruff-pre-commit@v0.3.7...v0.4.2)

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Enable ruff --unsafe-fixes

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Disable ruff --unsafe-fixes again

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Daniel Bast <2790401+dbast@users.noreply.github.com>
@beeankha
Stop importing from conda/exports.py (#13869)
7f4ddde
@dependabot @kenodegard
Bump CodSpeedHQ/action from 2.3.1 to 2.4.0 in /.github/workflows (#13875
e0174e3 
)

* Bump CodSpeedHQ/action from 2.3.1 to 2.4.0 in /.github/workflows

Bumps [CodSpeedHQ/action](https://github.com/codspeedhq/action) from 2.3.1 to 2.4.0.
- [Release notes](https://github.com/codspeedhq/action/releases)
- [Changelog](https://github.com/CodSpeedHQ/action/blob/main/CHANGELOG.md)
- [Commits](CodSpeedHQ/action@aa99394...ac302de)

---
updated-dependencies:
- dependency-name: CodSpeedHQ/action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update .github/workflows/tests.yml

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Ken Odegard <kodegard@anaconda.com>
@kenodegard
Deprecate conda.plan (#13881)
e048f31
@kenodegard
Stop using make_temp_env (#13884)
b605aa0
@erik-whiting
Small typo fix (#13877)
6ffb7a4
@kenodegard
Fix conda info --all tests to reflect deprecation (#13885)
fd02b3d
@beeankha
24.5.x-related updates / corrections (#13888)
04308fe
@conda-bot
Update test durations (#13890)
b3fae94
@dependabot
Bump CodSpeedHQ/action from 2.4.0 to 2.4.1 in /.github/workflows (#13892
c1af45f 
)

Bumps [CodSpeedHQ/action](https://github.com/codspeedhq/action) from 2.4.0 to 2.4.1.
- [Release notes](https://github.com/codspeedhq/action/releases)
- [Changelog](https://github.com/CodSpeedHQ/action/blob/main/CHANGELOG.md)
- [Commits](CodSpeedHQ/action@ac302de...0b631f8)

---
updated-dependencies:
- dependency-name: CodSpeedHQ/action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@pre-commit-ci
[pre-commit.ci] pre-commit autoupdate (#13895)
f1b2f8b 
updates:
- [github.com/astral-sh/ruff-pre-commit: v0.4.2 → v0.4.3](astral-sh/ruff-pre-commit@v0.4.2...v0.4.3)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
@kathatherine @pre-commit-ci @jezdez
Update conda cheatsheet text (#13889)
34a10bf 
* Updated cheatsheet text to csv tables

* Deleted deprecated conda cheatsheet PDFs

* Update news item

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Apply suggestions from code review

Co-authored-by: Jannis Leidel <jannis@leidel.info>

* Moved cheatsheet CSVs to user-guide/cheatsheets folder

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Jannis Leidel <jannis@leidel.info>
@dependabot
Bump codecov/codecov-action from 4.3.0 to 4.3.1 in /.github/workflows (…
736f8fb 
…#13893)

Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 4.3.0 to 4.3.1.
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md)
- [Commits](codecov/codecov-action@8450866...5ecb98a)

---
updated-dependencies:
- dependency-name: codecov/codecov-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
kenodegard and others added 15 commits May 7, 2024 09:03
@kenodegard
Refactor main_config into a modular API (#13886)
30a0688 
* Modularize config

* Add set_keys test

* Add remaining unittests

* Fix tests
@conda-bot
🔄 synced file(s) with conda/infrastructure (#13899)
d955710 
Co-authored-by: Conda Bot <conda-bot@users.noreply.github.com>
@conda-bot
🔄 synced file(s) with conda/infrastructure (#13901)
d8b6774 
Co-authored-by: Conda Bot <conda-bot@users.noreply.github.com>
@conda-bot
🔄 synced file(s) with conda/infrastructure (#13902)
bfa8ccd 
Co-authored-by: Conda Bot <conda-bot@users.noreply.github.com>
@ifitchet @beeankha
@pre-commit-ci @kenodegard
Support multiple MSYS2 environments (#13649)
d8178c9 
Refactor MSYS2 environment handling, support multiple native compilation
environments, and introduce a new `unix_path_to_native` function (the
inverse of `native_path_to_unix`).

---------

Co-authored-by: Bianca Henderson <bhenderson@anaconda.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Ken Odegard <kodegard@anaconda.com>
@ifitchet @beeankha
@pre-commit-ci @kenodegard
Support multiple MSYS2 environments (#13649)
232a9f2 
Refactor MSYS2 environment handling, support multiple native compilation
environments, and introduce a new `unix_path_to_native` function (the
inverse of `native_path_to_unix`).

---------

Co-authored-by: Bianca Henderson <bhenderson@anaconda.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Ken Odegard <kodegard@anaconda.com>
@kenodegard @beeankha
Changelog 24.5.0 (#13906)
c934847 
* Update .authors.yml

* Update .mailmap

* Update news

* Updated authorship for 24.5.0

* Updated CHANGELOG for 24.5.0

* Add first-time contributions

* Apply suggestions from code review

Co-authored-by: Bianca Henderson <bhenderson@anaconda.com>

---------

Co-authored-by: Bianca Henderson <bhenderson@anaconda.com>
@kenodegard
Remove reporters from 24.5.0 changelog (#13910)
5ba24f4
@kenodegard
Merge remote-tracking branch 'upstream/main' into connector-24.5.x
6a8546a
@conda-bot
Update test durations (#13913)
f467a41
@kenodegard
Merge 24.5.x back into main
f799566
@conda-bot
🔄 synced file(s) with conda/infrastructure (#13918)
91418b2 
Co-authored-by: Conda Bot <conda-bot@users.noreply.github.com>
@dependabot @kenodegard
Bump actions/checkout from 4.1.4 to 4.1.5 in /.github/workflows (#13917)
c5c13df 
* Bump actions/checkout from 4.1.4 to 4.1.5 in /.github/workflows

Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.4 to 4.1.5.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@0ad4b8f...44c2b7a)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Apply suggestions from code review

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Ken Odegard <kodegard@anaconda.com>
@dependabot @kenodegard
Bump conda/actions from 24.4.0 to 24.5.0 in /.github/workflows (#13916)
eb45954 
* Bump conda/actions from 24.4.0 to 24.5.0 in /.github/workflows

Bumps [conda/actions](https://github.com/conda/actions) from 24.4.0 to 24.5.0.
- [Release notes](https://github.com/conda/actions/releases)
- [Commits](conda/actions@1e442e0...976289d)

---
updated-dependencies:
- dependency-name: conda/actions
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Apply suggestions from code review

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Ken Odegard <kodegard@anaconda.com>
@kathatherine
Added cheatsheet PDF download to cheatsheet page (#13909)
49f2614 
* Added cheatsheet PDF download to cheatsheet page

* Added news item

* Added version to original PDF and updated symlink

* Corrected cheatsheet naming convention

* Adding old PDFs and links back in to cheatsheet page
@ForgottenProgramme ForgottenProgramme requested a review from a team as a code owner May 21, 2024 08:10
@conda-bot conda-bot added the cla-signed [bot] added once the contributor has signed the CLA label May 21, 2024
@travishathaway travishathaway merged commit 1e196c4 into feature/reporters-backends May 21, 2024
90 of 92 checks passed
@codspeed-hq CodSpeed HQ
Copy link

codspeed-hq bot commented May 28, 2024 •
edited
Loading

CodSpeed Performance Report

Merging #13929 will not alter performance

Comparing main (d88fc15) with main (3ae5d7c)

Summary

✅ 21 untouched benchmarks

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
cla-signed [bot] added once the contributor has signed the CLA
Projects
🔎 Review
Status: 🏁 Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet