Merge 24.1.x into main
#5163
Merged
Merge 24.1.x into main
#5163
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
Co-authored-by: Bianca Henderson <bhenderson@anaconda.com>
Co-authored-by: Jannis Leidel <jannis@leidel.info> Co-authored-by: Marcel Bargull <marcel.bargull@udo.edu>
* Copy over Dist and related functions from conda * Copy over plan instructions from conda * Remove Dist * Inline one-off execute_/install_actions functions * Simplify _plan_from_actions * Collapse _plan_from_actions into execute_actions * Remove unused args for execute/install_actions * Use PackageRecord "prec" naming when unambiguous * Move install actions to .environ * Mark functions from conda.plan as non-public These will be changed/superseded/removed in a future version and thus should not be used elsewhere. --------- Signed-off-by: Marcel Bargull <marcel.bargull@udo.edu> Co-authored-by: Ken Odegard <kodegard@anaconda.com> Co-authored-by: Jannis Leidel <jannis@leidel.info>
* Fix entrypoint definition in pyproject.toml to match recipe/meta.yaml * Remove conda-index entrypoint --------- Signed-off-by: Marcel Bargull <marcel.bargull@udo.edu> Co-authored-by: Ken Odegard <kodegard@anaconda.com>
Co-authored-by: Ken Odegard <kodegard@anaconda.com>
conda-bot
added
the
cla-signed
jezdez
approved these changes
Feb 1, 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.
Xref #5134
Warning
DO NOT SQUASH MERGE!