Include base installation directory in uv run PATH

astral-sh · Dec 2, 2024 · 6ca9e03 · 6ca9e03
1 parent ff91cf7
commit 6ca9e03
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/crates/uv/src/commands/project/run.rs b/crates/uv/src/commands/project/run.rs
@@ -1016,7 +1016,15 @@ pub(crate) async fn run(
             .as_ref()
             .map(PythonEnvironment::scripts)
             .into_iter()
+            .chain(
+                ephemeral_env
+                    .as_ref()
+                    .and_then(|env| env.python_executable().parent())
+                    .into_iter(),
+            )
             .chain(std::iter::once(base_interpreter.scripts()))
+            .chain(base_interpreter.sys_executable().parent().into_iter())
+            .dedup()
             .map(PathBuf::from)
             .chain(
                 std::env::var_os(EnvVars::PATH)

diff --git a/crates/uv/src/commands/tool/run.rs b/crates/uv/src/commands/tool/run.rs
@@ -153,12 +153,16 @@ pub(crate) async fn run(
 
     // Construct the `PATH` environment variable.
     let new_path = std::env::join_paths(
-        std::iter::once(environment.scripts().to_path_buf()).chain(
-            std::env::var_os(EnvVars::PATH)
-                .as_ref()
-                .iter()
-                .flat_map(std::env::split_paths),
-        ),
+        std::iter::once(environment.scripts())
+            .chain(environment.python_executable().parent().into_iter())
+            .dedup()
+            .map(PathBuf::from)
+            .chain(
+                std::env::var_os(EnvVars::PATH)
+                    .as_ref()
+                    .iter()
+                    .flat_map(std::env::split_paths),
+            ),
     )?;
     process.env(EnvVars::PATH, new_path);