Merge branch 'main' into deduplicate-global-paths

Author: DonJayamanne

Cargo.lock

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-use std::path::Path;
+use std::path::{Path, PathBuf};
 
 use pet_core::{
     env::PythonEnv,
@@ -40,6 +40,19 @@ pub fn is_virtualenv_dir(path: &Path) -> bool {
             path = path.join("bin");
         }
     }
+
+    // Never consider global locations to be virtualenvs
+    // in case there is a false positive match from checks below.
+    if [
+        PathBuf::from(r"/bin"),
+        PathBuf::from(r"/usr/bin"),
+        PathBuf::from(r"/usr/local/bin"),
+    ]
+    .contains(&path)
+    {
+        return false;
+    }
+
     // Check if there are any activate.* files in the same directory as the interpreter.
     //
     // env
@@ -62,7 +75,7 @@ pub fn is_virtualenv_dir(path: &Path) -> bool {
                 .unwrap_or_default()
                 .to_str()
                 .unwrap_or_default()
-                .starts_with("activate")
+                .starts_with("activate.")
             {
                 return true;
             }

crates/pet-virtualenv/src/lib.rs

@@ -49,12 +49,15 @@ impl Locator for VirtualEnvWrapper {
             },
         };
         let mut symlinks = vec![];
+        let mut name = None;
         if let Some(ref prefix) = env.prefix {
             symlinks.append(&mut find_executables(prefix));
+            name = prefix.file_name().and_then(|f| f.to_str());
         }
 
         Some(
             PythonEnvironmentBuilder::new(Some(PythonEnvironmentKind::VirtualEnvWrapper))
+                .name(name.map(String::from))
                 .executable(Some(env.executable.clone()))
                 .version(version)
                 .prefix(env.prefix.clone())

crates/pet-virtualenvwrapper/src/lib.rs

@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [target.'cfg(windows)'.dependencies]
-winreg = "0.52.0"
+winreg = "0.55.0"
 
 [target.'cfg(target_os = "windows")'.dependencies]
 msvc_spectre_libs = { version = "0.1.1", features = ["error"] }
@@ -18,4 +18,4 @@ pet-fs = { path = "../pet-fs" }
 pet-conda = { path = "../pet-conda" }
 log = "0.4.21"
 lazy_static = "1.4.0"
-regex = "1.10.4"
+regex = "1.10.4"

crates/pet-windows-registry/Cargo.toml

@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [target.'cfg(windows)'.dependencies]
-winreg = "0.52.0"
+winreg = "0.55.0"
 
 [target.'cfg(target_os = "windows")'.dependencies]
 msvc_spectre_libs = { version = "0.1.1", features = ["error"] }

crates/pet-windows-store/Cargo.toml

@@ -161,6 +161,7 @@ fn check_if_virtualenvwrapper_exists() {
             |env| env.kind == Some(PythonEnvironmentKind::VirtualEnvWrapper)
                 && env.executable.is_some()
                 && env.prefix.is_some()
+                && env.name == Some("venv_wrapper_env1".to_string())
                 && env
                     .executable
                     .clone()