Skip to content

Fallback to finding conda install dir if not found #159

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
merged 2 commits into from
Oct 1, 2024
Merged

Fallback to finding conda install dir if not found #159

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f16b437
Fallback to finding conda install dir if not found
DonJayamanne Oct 1, 2024
3afcf2e
Fixes
DonJayamanne Oct 1, 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
22 changes: 16 additions & 6 deletions crates/pet-conda/src/environments.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use crate::{
package::{CondaPackageInfo, Package},
utils::{is_conda_env, is_conda_install},
};
use log::warn;
use log::{trace, warn};
use pet_core::{
arch::Architecture,
manager::EnvManager,
Expand Down Expand Up @@ -76,20 +76,30 @@ pub fn get_conda_environment_info(
return None;
}
// If we know the conda install folder, then we can use it.
let mut conda_install_folder = match manager {
Some(manager) => manager.conda_dir.clone(),
None => get_conda_installation_used_to_create_conda_env(env_path),
};
let mut conda_install_folder = manager
.clone()
.and_then(|m| m.conda_dir)
.or_else(|| get_conda_installation_used_to_create_conda_env(env_path));

if let Some(conda_dir) = &conda_install_folder {
if !conda_dir.exists() {
if conda_dir.exists() {
trace!(
"Conda install folder {}, found, & will not be used for the Conda Env: {}",
env_path.display(),
conda_dir.display()
);
} else {
warn!(
"Conda install folder {}, does not exist, hence will not be used for the Conda Env: {}",
env_path.display(),
conda_dir.display()
);
conda_install_folder = None;
}
} else {
trace!("Conda install folder not found for {}", env_path.display());
}

if let Some(python_binary) = find_executable(env_path) {
if let Some(package_info) = CondaPackageInfo::from(env_path, &Package::Python) {
Some(CondaEnvironment {
Expand Down