Skip to content

Extract conda version where possible #23374

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

Merged
DonJayamanne merged 2 commits into from
May 8, 2024
Merged

Extract conda version where possible #23374

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef17653
Extract conda version where possible
DonJayamanne May 8, 2024
36cb2cc
Misc
DonJayamanne May 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions native_locator/src/conda.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,11 @@ pub fn find_conda_binary(environment: &impl known::Environment) -> Option<PathBu
}
}

pub fn get_conda_version(conda_binary: &PathBuf) -> Option<String> {
let conda_python_json_path = get_conda_package_json_path(&conda_binary.parent()?, "conda")?;
get_version_from_meta_json(&conda_python_json_path)
}

fn get_conda_envs_from_environment_txt(environment: &impl known::Environment) -> Vec<String> {
let mut envs = vec![];
let home = environment.get_user_home();
Expand Down Expand Up @@ -369,8 +374,10 @@ pub fn find_and_report(
let conda_binary = find_conda_binary(environment);
match conda_binary {
Some(conda_binary) => {
let params =
messaging::EnvManager::new(vec![conda_binary.to_string_lossy().to_string()], None);
let params = messaging::EnvManager::new(
vec![conda_binary.to_string_lossy().to_string()],
get_conda_version(&conda_binary),
);
dispatcher.report_environment_manager(params);

let envs = get_distinct_conda_envs(conda_binary.to_path_buf(), environment);
Expand Down