fix: install venv before pip

aminya · Jan 12, 2025 · 770dfb4 · 770dfb4
1 parent 025098a
commit 770dfb4
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/dist/legacy/setup-cpp.js b/dist/legacy/setup-cpp.js
diff --git a/dist/legacy/setup-cpp.js.map b/dist/legacy/setup-cpp.js.map
diff --git a/dist/modern/setup-cpp.mjs b/dist/modern/setup-cpp.mjs
diff --git a/dist/modern/setup-cpp.mjs.map b/dist/modern/setup-cpp.mjs.map
diff --git a/src/python/python.ts b/src/python/python.ts
@@ -36,14 +36,16 @@ export async function setupPython(
   assert(installInfo.bin !== undefined)
   const foundPython = installInfo.bin
 
+  // setup venv
+  await setupVenv(foundPython)
+
   // setup pip
   const foundPip = await findOrSetupPip(foundPython)
   if (foundPip === undefined) {
     throw new Error("pip was not installed correctly")
   }
 
   await setupPipx(foundPython)
-
   await setupWheel(foundPython)
 
   return installInfo as InstallationInfo & { bin: string }
@@ -61,19 +63,17 @@ async function setupPipx(foundPython: string) {
       }
     }
     await execa(foundPython, ["-m", "pipx", "ensurepath"], { stdio: "inherit" })
-    await setupVenv(foundPython)
   } catch (err) {
     notice(`Failed to install pipx: ${(err as Error).toString()}. Ignoring...`)
   }
 }
 
 async function setupVenv(foundPython: string) {
   if (await hasVenv(foundPython)) {
+    info("venv module already installed.")
     return
   }
 
-  info("venv module not found. Installing it...")
-
   try {
     await setupPipPackSystem("venv")
   } catch (err) {