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

Merge 23.7.x branch back into main #12931

Merged
merged 2 commits into from
Jul 27, 2023
Merged

Merge 23.7.x branch back into main #12931

merged 2 commits into from
Jul 27, 2023

Conversation

kenodegard
Copy link
Contributor

Description

Merged hotfix (#12929) back into main.

Xref #12849

Warning
DO NOT SQUASH MERGE!

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?

kenodegard and others added 2 commits July 26, 2023 18:24
@kenodegard @jezdez
Patch 2-phase parser to preserve pre_args (#12929)
075743c 
* Update conda_cli to use main_subshell instead of mocking it
* Add `conda info --json` test
* Populate arguments shared between pre and main parser.

---------

Co-authored-by: Jannis Leidel <jannis@leidel.info>
@kenodegard
Release 23.7.1 (#12930)
7964b95
@kenodegard kenodegard requested a review from a team as a code owner July 27, 2023 00:01
@kenodegard kenodegard mentioned this pull request Jul 27, 2023
Closed
62 tasks
@conda-bot conda-bot added the cla-signed [bot] added once the contributor has signed the CLA label Jul 27, 2023
@kenodegard kenodegard merged commit 1b53c20 into main Jul 27, 2023
138 checks passed
@jezdez jezdez mentioned this pull request Sep 26, 2023
Closed
92 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@beeankha beeankha beeankha approved these changes

Assignees
No one assigned
Labels
cla-signed [bot] added once the contributor has signed the CLA
Projects
🔎 Review
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@kenodegard @beeankha @conda-bot