Fixes

Author: DonJayamanne

crates/pet-conda/tests/conda_rc_test.rs

@@ -2,14 +2,13 @@
 // Licensed under the MIT License.
 
 mod common;
-use common::resolve_test_path;
-use pet_conda::conda_rc::Condarc;
-use std::path::PathBuf;
 
 #[cfg(unix)]
 #[test]
 fn no_conda_rc() {
     use common::create_env_variables;
+    use common::resolve_test_path;
+    use pet_conda::conda_rc::Condarc;
 
     let root = resolve_test_path(&["unix", "root_empty"]);
     let home = resolve_test_path(&["unix", "user_home_with_environments_txt"]);
@@ -24,6 +23,9 @@ fn no_conda_rc() {
 #[test]
 fn finds_conda_rc() {
     use common::create_env_variables;
+    use common::resolve_test_path;
+    use pet_conda::conda_rc::Condarc;
+    use std::path::PathBuf;
 
     let root = resolve_test_path(&["unix", "conda_rc", "root"]);
     let home = resolve_test_path(&["unix", "conda_rc", "user_home"]);
@@ -44,6 +46,9 @@ fn finds_conda_rc() {
 #[test]
 fn finds_conda_rc_from_conda_root_env_variable() {
     use common::create_env_variables;
+    use common::resolve_test_path;
+    use pet_conda::conda_rc::Condarc;
+    use std::path::PathBuf;
 
     let root = resolve_test_path(&["unix", "conda_rc_conda_root_var", "root"]);
     let home = resolve_test_path(&["unix", "conda_rc_conda_root_var", "user_home"]);
@@ -75,6 +80,9 @@ fn finds_conda_rc_from_conda_root_env_variable() {
 #[test]
 fn finds_conda_rc_from_root() {
     use common::create_env_variables;
+    use common::resolve_test_path;
+    use pet_conda::conda_rc::Condarc;
+    use std::path::PathBuf;
 
     let root = resolve_test_path(&["unix", "conda_rc_root", "root"]);
     let home = resolve_test_path(&["unix", "conda_rc_root", "user_home"]);

crates/pet-conda/tests/environment_locations_test.rs

@@ -2,15 +2,14 @@
 // Licensed under the MIT License.
 
 mod common;
-use common::{create_env_variables, resolve_test_path};
-use pet_conda::environment_locations::{
-    get_conda_envs_from_environment_txt, get_environments, get_known_conda_locations,
-};
-use std::path::PathBuf;
 
 #[cfg(unix)]
 #[test]
 fn read_environment_txt() {
+    use common::{create_env_variables, resolve_test_path};
+    use pet_conda::environment_locations::get_conda_envs_from_environment_txt;
+    use std::path::PathBuf;
+
     let root = resolve_test_path(&["unix", "root_empty"]).into();
     let home = resolve_test_path(&["unix", "user_home_with_environments_txt"]).into();
     let env = create_env_variables(home, root);
@@ -53,6 +52,9 @@ fn read_environment_txt() {
 #[cfg(unix)]
 #[test]
 fn non_existent_envrionments_txt() {
+    use common::{create_env_variables, resolve_test_path};
+    use pet_conda::environment_locations::get_conda_envs_from_environment_txt;
+
     let root = resolve_test_path(&["unix", "root_empty"]).into();
     let home = resolve_test_path(&["unix", "bogus directory"]).into();
     let env = create_env_variables(home, root);
@@ -65,6 +67,10 @@ fn non_existent_envrionments_txt() {
 #[cfg(unix)]
 #[test]
 fn known_install_locations() {
+    use common::{create_env_variables, resolve_test_path};
+    use pet_conda::environment_locations::get_known_conda_locations;
+    use std::path::PathBuf;
+
     let root = resolve_test_path(&["unix", "root_empty"]).into();
     let home = resolve_test_path(&["unix", "user_home"]).into();
     let env = create_env_variables(home, root);
@@ -102,6 +108,9 @@ fn known_install_locations() {
 #[cfg(unix)]
 #[test]
 fn list_conda_envs_in_install_location() {
+    use common::resolve_test_path;
+    use pet_conda::environment_locations::get_environments;
+
     let path = resolve_test_path(&["unix", "anaconda3-2023.03"]);
 
     let mut locations = get_environments(&path);

crates/pet-conda/tests/manager_test.rs

@@ -2,12 +2,13 @@
 // Licensed under the MIT License.
 
 mod common;
-use common::resolve_test_path;
-use pet_conda::manager::CondaManager;
 
 #[cfg(unix)]
 #[test]
 fn finds_manager_from_root_env() {
+    use common::resolve_test_path;
+    use pet_conda::manager::CondaManager;
+
     let path = resolve_test_path(&["unix", "anaconda3-2023.03"]);
 
     let manager = CondaManager::from(&path).unwrap();
@@ -19,6 +20,9 @@ fn finds_manager_from_root_env() {
 #[cfg(unix)]
 #[test]
 fn finds_manager_from_root_within_an_env() {
+    use common::resolve_test_path;
+    use pet_conda::manager::CondaManager;
+
     let conda_dir = resolve_test_path(&["unix", "anaconda3-2023.03"]);
     let path = resolve_test_path(&["unix", "anaconda3-2023.03", "envs", "env_python_3"]);
 
@@ -39,6 +43,9 @@ fn finds_manager_from_root_within_an_env() {
 #[cfg(unix)]
 #[test]
 fn does_not_find_conda_env_for_bogus_dirs() {
+    use common::resolve_test_path;
+    use pet_conda::manager::CondaManager;
+
     let path = resolve_test_path(&["unix", "bogus_directory"]);
 
     assert_eq!(CondaManager::from(&path).is_none(), true);

crates/pet-utils/src/env.rs

@@ -1,9 +1,8 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-use std::path::PathBuf;
-
 use crate::path::normalize;
+use std::path::PathBuf;
 
 #[derive(Debug)]
 pub struct PythonEnv {

crates/pet-windows-store/src/environments.rs

@@ -187,14 +187,13 @@ struct StorePythonInfo {
 #[cfg(windows)]
 fn get_package_display_name_and_location(name: &String, hkcu: &RegKey) -> Option<StorePythonInfo> {
     use log::trace;
-    use pet_utils::path::normalize;
 
     if let Some(name) = get_package_full_name_from_registry(name, hkcu) {
         let key = format!("Software\\Classes\\Local Settings\\Software\\Microsoft\\Windows\\CurrentVersion\\AppModel\\Repository\\Packages\\{}", name);
         trace!("Opening registry key {:?}", key);
         let package_key = hkcu.open_subkey(key).ok()?;
         let display_name = package_key.get_value("DisplayName").ok()?;
-        let env_path = normalize(package_key.get_value("PackageRootFolder").ok()?);
+        let env_path = package_key.get_value("PackageRootFolder").ok()?;
 
         return Some(StorePythonInfo {
             display_name,