Updates

Author: DonJayamanne

crates/pet-conda/src/lib.rs

@@ -8,7 +8,7 @@ use environment_locations::{
     get_environments,
 };
 use environments::{get_conda_environment_info, CondaEnvironment};
-use log::error;
+use log::{error, trace};
 use manager::CondaManager;
 use pet_core::{
     env::PythonEnv,
@@ -155,8 +155,11 @@ impl CondaLocator for Conda {
         if !is_conda_install(conda_dir) {
             return;
         }
+        trace!("2. Find and report conda environments in {:?}", conda_dir);
         if let Some(manager) = CondaManager::from(conda_dir) {
             if let Some(conda_dir) = manager.conda_dir.clone() {
+                trace!("2. Found conda manager in {:?} {:?}", manager, conda_dir);
+                trace!("2. Find and report conda environments in {:?}", conda_dir);
                 // Keep track to search again later.
                 // Possible we'll find environments in other directories created using this manager
                 let mut managers = self.managers.lock().unwrap();
@@ -169,6 +172,12 @@ impl CondaLocator for Conda {
                 for conda_env in
                     get_conda_environments(&get_environments(&conda_dir), &manager.clone().into())
                 {
+                    trace!(
+                        "2. Found conda environment {:?} in {:?} for {:?}",
+                        conda_env,
+                        conda_dir,
+                        manager
+                    );
                     // If reported earlier, no point processing this again.
                     let mut environments = self.environments.lock().unwrap();
                     if environments.contains_key(&conda_env.prefix) {
@@ -247,7 +256,14 @@ impl Locator for Conda {
             }
             if let Some(env) = get_conda_environment_info(path, &None) {
                 if let Some(conda_dir) = &env.conda_dir {
+                    trace!("4. Found conda env {:?} in {:?}", env, path);
                     if let Some(manager) = self.get_manager(conda_dir) {
+                        trace!(
+                            "4. Found conda manager {:?} for env {:?} in {:?}",
+                            manager,
+                            env,
+                            path
+                        );
                         let env = env.to_python_environment(
                             Some(conda_dir.clone()),
                             Some(manager.to_manager()),
@@ -329,8 +345,10 @@ impl Locator for Conda {
                     drop(managers);
 
                     if manager.is_none() {
+                        trace!("3.1 Finding conda manager for {:?} for path: {:?}", env, conda_dir);
                         // 4.1 Build the manager from the conda dir if we do not have it.
                         if let Some(conda_manager) = CondaManager::from(conda_dir) {
+                            trace!("3.1 Found conda manager {:?} for {:?} for path: {:?}", conda_manager,env, conda_dir);
                             let mut managers = self.managers.lock().unwrap();
                             managers.insert(conda_dir.to_path_buf().clone(), conda_manager.clone());
                             manager = Some(conda_manager);

crates/pet-conda/src/manager.rs

@@ -2,10 +2,13 @@
 // Licensed under the MIT License.
 
 use crate::{
-    conda_info::CondaInfo, env_variables::EnvVariables,
-    environments::get_conda_installation_used_to_create_conda_env, package::CondaPackageInfo,
-    utils::is_conda_env,
+    conda_info::CondaInfo,
+    env_variables::EnvVariables,
+    environments::get_conda_installation_used_to_create_conda_env,
+    package::CondaPackageInfo,
+    utils::{is_conda_env, is_conda_install},
 };
+use log::trace;
 use pet_core::{manager::EnvManager, manager::EnvManagerType};
 use std::{
     env,
@@ -75,24 +78,33 @@ impl CondaManager {
         }
     }
     pub fn from(path: &Path) -> Option<CondaManager> {
+        trace!("1. Finding conda manager for path: {:?}", path);
         if !is_conda_env(path) {
             return None;
         }
+
+        // If this environment is in a folder named `envs`, then the parent directory of `envs` is the root conda install folder.
+        if let Some(parent) = path.ancestors().nth(2) {
+            trace!("1. Finding conda manager from parent path: {:?}", parent);
+            if is_conda_install(parent) {
+                if let Some(manager) = get_conda_manager(parent) {
+                    trace!("1. Found conda manager from parent path: {:?}", parent);
+                    return Some(manager);
+                }
+            }
+        }
+
         if let Some(manager) = get_conda_manager(path) {
+            trace!("1. Found conda manager from path: {:?}", path);
             Some(manager)
         } else {
-            // Possible this is a conda environment in the `envs` folder
-            let path = path.parent()?.parent()?;
-            if let Some(manager) = get_conda_manager(path) {
-                Some(manager)
-            } else {
-                // Possible this is a conda environment in some other location
-                // Such as global env folders location configured via condarc file
-                // Or a conda env created using `-p` flag.
-                // Get the conda install folder from the history file.
-                let conda_install_folder = get_conda_installation_used_to_create_conda_env(path)?;
-                get_conda_manager(&conda_install_folder)
-            }
+            // Possible this is a conda environment in some other location
+            // Such as global env folders location configured via condarc file
+            // Or a conda env created using `-p` flag.
+            // Get the conda install folder from the history file.
+            trace!("1. Find conda manager from install path: {:?}", path);
+            let conda_install_folder = get_conda_installation_used_to_create_conda_env(path)?;
+            get_conda_manager(&conda_install_folder)
         }
     }
     pub fn from_info(executable: &Path, info: &CondaInfo) -> Option<CondaManager> {