Skip to content

Fix micromamba not initializing shell #44646

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
Merged
Veykril merged 8 commits into from
Dec 15, 2025
Merged

Fix micromamba not initializing shell #44646

Veykril merged 8 commits into from
Dec 15, 2025

Conversation

@cvanelteren
Copy link
Contributor

@cvanelteren cvanelteren commented Dec 11, 2025 •
edited
Loading

Closes #44645

This is a continuation of #40577

Release Notes:

  • initializes micromamba based on the shell
@cla-bot cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label Dec 11, 2025
@cvanelteren cvanelteren changed the title Fix mamba Dec 11, 2025
@Veykril Veykril self-assigned this Dec 11, 2025
@cvanelteren
Copy link
Contributor Author

cvanelteren commented Dec 11, 2025

I branched from my previous commit, but I am seeing that they are not merged on main yet which is why the history is there. You can ignore it and just focus on the latest commit.
@Veykril
Copy link
Member

Veykril commented Dec 11, 2025

You'll need to rebase this onto main, we use a squash workflow so the history changes after a merge
@zed-industries-bot
Copy link

zed-industries-bot commented Dec 11, 2025 •
edited
Loading

Warnings
⚠️

This PR is missing release notes.

Please add a "Release Notes" section that describes the change:

Release Notes:

- Added/Fixed/Improved ...

If your change is not user-facing, you can use "N/A" for the entry:

Release Notes:

- N/A

Generated by 🚫 dangerJS against 71a04bc

@cvanelteren
Copy link
Contributor Author

cvanelteren commented Dec 11, 2025

I made a big mess but restored it now I think. Changes are minor.
@cvanelteren
Copy link
Contributor Author

cvanelteren commented Dec 11, 2025

I will rebase -- one moment please.
@cvanelteren
Copy link
Contributor Author

cvanelteren commented Dec 11, 2025

Sorry for the mess the changes are clean now -- need to get some coffee -_-
Veykril
Veykril reviewed Dec 12, 2025
View reviewed changes
crates/languages/src/python.rs Outdated
Comment on lines 1332 to 1336
let env_name = toolchain.environment.name.as_deref().unwrap_or("base");
activation_script.push(format!("{manager} activate {env_name}"));

if let Some(name) = &toolchain.environment.name {
activation_script.push(format!("{manager} activate {name}"));
Copy link
Member

@Veykril Veykril Dec 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That change looks unnecessary, we already push that activate invocation here after all
Copy link
Contributor Author

@cvanelteren cvanelteren Dec 15, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You are right -- think this is a remnant of the rebase shenaningans. Will fix
Copy link
Contributor Author

@cvanelteren cvanelteren Dec 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be good @Veykril
Veykril
Veykril approved these changes Dec 15, 2025
View reviewed changes
Copy link
Member

@Veykril Veykril left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!
@Veykril Veykril merged commit 969e9a6 into zed-industries:main Dec 15, 2025
23 checks passed
@github-project-automation github-project-automation bot moved this from Community PRs to Done in Quality Week – December 2025 Dec 15, 2025
CherryWorm pushed a commit to CherryWorm/zed that referenced this pull request Dec 16, 2025
@cvanelteren @CherryWorm
Fix micromamba not initializing shell (zed-industries#44646)
5485cbe 
Closes zed-industries#44645

This is a continuation of zed-industries#40577

Release Notes:
- initializes micromamba based on the shell
@rgbkrk
Copy link
Collaborator

rgbkrk commented Dec 16, 2025

@Klaim - might want to check this out for micromamba and conda support in Zed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cla-signed The user has signed the Contributor License Agreement

4 participants

@cvanelteren @Veykril @zed-industries-bot @rgbkrk