Merge 24.5.x back into main
#13911
Merged
Merge 24.5.x back into main
#13911
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Modularize config * Add set_keys test * Add remaining unittests * Fix tests
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>
* 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>
conda-bot
added
the
cla-signed
CodSpeed Performance ReportMerging #13911 will not alter performanceComparing Summary
|
jezdez
approved these changes
May 10, 2024
beeankha
approved these changes
May 12, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Xref #13870
Warning
DO NOT SQUASH MERGE!