Merge 23.7.x branch back into main
#12921
Merged
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: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Ken Odegard <kodegard@anaconda.com> Co-authored-by: Bianca Henderson <bhenderson@anaconda.com>
Implement a 2-phase parser so we can properly intercept `--no-plugins` before loading the subcommand plugins. In addition to the 2-phase parser we add a new subparser that greedily consumes all unknown arguments to be passed to the subcommand plugins. These changes allows a simplification of how third-party subcommands are detected and displayed in the help text (whether subcommand plugins or legacy executables) so all subcommands are now processed via conda's argparse parser instead of hijacking argparse's error handling. --------- Co-authored-by: Jannis Leidel <jannis@leidel.info>
Co-authored-by: Ken Odegard <kodegard@anaconda.com> Co-authored-by: Jannis Leidel <jannis@leidel.info>
jezdez
approved these changes
Jul 25, 2023
conda-bot
added
the
cla-signed
beeankha
approved these changes
Jul 25, 2023
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
Merges release branch (with changelog changes, plugins disabling patch, and 2-phase parser/greedy subparser) back into
main.Xref #12849
Checklist - did you ...
Add a file to thenewsdirectory (using the template) for the next release's release notes?Add / update necessary tests?Add / update outdated documentation?