From e23da5b315b14db73aaf672a205d2a0d3f0edd5a Mon Sep 17 00:00:00 2001
From: Zanie Blue <contact@zanie.dev>
Date: Thu, 18 Sep 2025 07:52:23 -0500
Subject: [PATCH] Use `EnvVars` for Conda variables in tests (#15930)

---
 crates/uv-python/src/lib.rs | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/crates/uv-python/src/lib.rs b/crates/uv-python/src/lib.rs
index f5da2caa3..6c313e3de 100644
--- a/crates/uv-python/src/lib.rs
+++ b/crates/uv-python/src/lib.rs
@@ -1208,8 +1208,8 @@ mod tests {
         // But not if it's a base environment
         let result = context.run_with_vars(
             &[
-                ("CONDA_PREFIX", Some(baseenv.as_os_str())),
-                ("CONDA_DEFAULT_ENV", Some(&OsString::from("base"))),
+                (EnvVars::CONDA_PREFIX, Some(baseenv.as_os_str())),
+                (EnvVars::CONDA_DEFAULT_ENV, Some(&OsString::from("base"))),
                 (EnvVars::CONDA_ROOT, None),
             ],
             || {
@@ -1232,8 +1232,8 @@ mod tests {
         let python = context
             .run_with_vars(
                 &[
-                    ("CONDA_PREFIX", Some(baseenv.as_os_str())),
-                    ("CONDA_DEFAULT_ENV", Some(&OsString::from("base"))),
+                    (EnvVars::CONDA_PREFIX, Some(baseenv.as_os_str())),
+                    (EnvVars::CONDA_DEFAULT_ENV, Some(&OsString::from("base"))),
                     (EnvVars::CONDA_ROOT, None),
                 ],
                 || {
@@ -1258,8 +1258,11 @@ mod tests {
         let python = context
             .run_with_vars(
                 &[
-                    ("CONDA_PREFIX", Some(condaenv.as_os_str())),
-                    ("CONDA_DEFAULT_ENV", Some(&OsString::from("condaenv"))),
+                    (EnvVars::CONDA_PREFIX, Some(condaenv.as_os_str())),
+                    (
+                        EnvVars::CONDA_DEFAULT_ENV,
+                        Some(&OsString::from("condaenv")),
+                    ),
                 ],
                 || {
                     find_python_installation(
@@ -1282,8 +1285,8 @@ mod tests {
         // When CONDA_DEFAULT_ENV is "base", it should always be treated as base environment
         let result = context.run_with_vars(
             &[
-                ("CONDA_PREFIX", Some(condaenv.as_os_str())),
-                ("CONDA_DEFAULT_ENV", Some(&OsString::from("base"))),
+                (EnvVars::CONDA_PREFIX, Some(condaenv.as_os_str())),
+                (EnvVars::CONDA_DEFAULT_ENV, Some(&OsString::from("base"))),
             ],
             || {
                 find_python_installation(
@@ -1307,8 +1310,8 @@ mod tests {
         let python = context
             .run_with_vars(
                 &[
-                    ("CONDA_PREFIX", Some(myenv_dir.as_os_str())),
-                    ("CONDA_DEFAULT_ENV", Some(&OsString::from("myenv"))),
+                    (EnvVars::CONDA_PREFIX, Some(myenv_dir.as_os_str())),
+                    (EnvVars::CONDA_DEFAULT_ENV, Some(&OsString::from("myenv"))),
                 ],
                 || {
                     find_python_installation(