Fix paths.

moonrepo · Dec 9, 2024 · da25c67 · da25c67
1 parent 717e6e9
commit da25c67
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## Unreleased
+
+#### 🐞 Fixes
+
+- Fixed Python virtual env bin path not being available for tasks when `python.version` is not
+  defined.
+
 ## 1.30.4
 
 #### 🐞 Fixes

diff --git a/legacy/python/platform/src/python_platform.rs b/legacy/python/platform/src/python_platform.rs
@@ -239,6 +239,7 @@ impl Platform for PythonPlatform {
         _hasher_config: &HasherConfig,
     ) -> miette::Result<()> {
         let deps = BTreeMap::from_iter(load_lockfile_dependencies(manifest_path.to_path_buf())?);
+
         hasher.hash_content(PythonToolchainHash {
             version: self
                 .config
@@ -261,9 +262,11 @@ impl Platform for PythonPlatform {
         _hasher_config: &HasherConfig,
     ) -> miette::Result<()> {
         let mut deps = BTreeMap::new();
+
         if let Some(pip_requirements) = find_requirements_txt(&project.root, &self.workspace_root) {
             deps = BTreeMap::from_iter(load_lockfile_dependencies(pip_requirements)?);
         }
+
         hasher.hash_content(PythonToolchainHash {
             version: self
                 .config
@@ -295,15 +298,16 @@ impl Platform for PythonPlatform {
         if let Ok(python) = self.toolchain.get_for_version(&runtime.requirement) {
             if let Some(version) = get_proto_version_env(&python.tool) {
                 command.env("PROTO_PYTHON_VERSION", version);
-                command.env(
-                    "PATH",
-                    prepend_path_env_var(get_python_tool_paths(
-                        python,
-                        working_dir,
-                        &self.workspace_root,
-                    )),
-                );
             }
+
+            command.env(
+                "PATH",
+                prepend_path_env_var(get_python_tool_paths(
+                    python,
+                    working_dir,
+                    &self.workspace_root,
+                )),
+            );
         }
 
         Ok(command)

diff --git a/legacy/python/tool/src/python_tool.rs b/legacy/python/tool/src/python_tool.rs
@@ -25,13 +25,17 @@ pub fn get_python_tool_paths(
     working_dir: &Path,
     workspace_root: &Path,
 ) -> Vec<PathBuf> {
+    let mut paths = vec![];
+
     if let Some(venv_root) =
         fs::find_upwards_until(&python_tool.config.venv_name, working_dir, workspace_root)
     {
-        vec![venv_root.join("Scripts"), venv_root.join("bin")]
-    } else {
-        get_proto_paths(&python_tool.proto_env)
+        paths.push(venv_root.join("Scripts"));
+        paths.push(venv_root.join("bin"));
     }
+
+    paths.extend(get_proto_paths(&python_tool.proto_env));
+    paths
 }
 
 pub struct PythonTool {