Merge pull request #178 from aminya/python-is-python3 [skip ci]

src/python/python.ts

@@ -3,7 +3,7 @@ import { getExecOutput } from "@actions/exec"
 import assert from "assert"
 import { GITHUB_ACTIONS } from "ci-info"
 import { info, warning } from "ci-log"
-import { execaSync } from "execa"
+import { execa } from "execa"
 import memoize from "micro-memoize"
 import { addExeExt, dirname, join } from "patha"
 import which from "which"
@@ -21,6 +21,7 @@ import { isBinUptoDate } from "../utils/setup/version"
 import { unique } from "../utils/std"
 import { MinVersions } from "../versions/default_versions"
 import { pathExists } from "path-exists"
+import { setupPipPackWithPython } from "../utils/setup/setupPipPack"
 
 export async function setupPython(version: string, setupDir: string, arch: string): Promise<InstallationInfo> {
   const installInfo = await findOrSetupPython(version, setupDir, arch)
@@ -33,11 +34,12 @@ export async function setupPython(version: string, setupDir: string, arch: strin
     throw new Error("pip was not installed correctly")
   }
 
-  // setup wheel
+  // setup wheel and setuptools
   try {
-    setupWheel(foundPython)
+    await setupPipPackWithPython(foundPython, "setuptools", undefined, true)
+    await setupPipPackWithPython(foundPython, "wheel", undefined, true)
   } catch (err) {
-    warning(`Failed to install wheels: ${(err as Error).toString()}. Ignoring...`)
+    warning(`Failed to install setuptools or wheel: ${(err as Error).toString()}. Ignoring...`)
   }
 
   return installInfo
@@ -99,6 +101,11 @@ async function setupPythonSystem(setupDir: string, version: string) {
     }
     case "darwin": {
       installInfo = await setupBrewPack("python3", version)
+      // add the python and pip binaries to the path
+      const brewPythonPrefix = await execa("brew", ["--prefix", "python"], { stdio: "pipe" })
+      const brewPythonBin = join(brewPythonPrefix.stdout, "libexec", "bin")
+      await addPath(brewPythonBin)
+
       break
     }
     case "linux": {
@@ -107,7 +114,7 @@ async function setupPythonSystem(setupDir: string, version: string) {
       } else if (hasDnf()) {
         installInfo = setupDnfPack("python3", version)
       } else if (isUbuntu()) {
-        installInfo = await setupAptPack([{ name: "python3", version }])
+        installInfo = await setupAptPack([{ name: "python3", version }, { name: "python-is-python3" }])
       } else {
         throw new Error("Unsupported linux distributions")
       }
@@ -194,23 +201,23 @@ async function isPipUptoDate(pip: string) {
 }
 
 async function setupPip(foundPython: string) {
-  const upgraded = ensurePipUpgrade(foundPython)
+  const upgraded = await ensurePipUpgrade(foundPython)
   if (!upgraded) {
     await setupPipSystem()
     // upgrade pip
-    ensurePipUpgrade(foundPython)
+    await ensurePipUpgrade(foundPython)
   }
 }
 
-function ensurePipUpgrade(foundPython: string) {
+async function ensurePipUpgrade(foundPython: string) {
   try {
-    execaSync(foundPython, ["-m", "ensurepip", "-U", "--upgrade"], { stdio: "inherit" })
+    await execa(foundPython, ["-m", "ensurepip", "-U", "--upgrade"], { stdio: "inherit" })
     return true
   } catch (err1) {
     info((err1 as Error)?.toString?.())
     try {
       // ensure pip is disabled on Ubuntu
-      execaSync(foundPython, ["-m", "pip", "install", "--upgrade", "pip"], { stdio: "inherit" })
+      await execa(foundPython, ["-m", "pip", "install", "--upgrade", "pip"], { stdio: "inherit" })
       return true
     } catch (err2) {
       info((err2 as Error)?.toString?.())
@@ -235,11 +242,6 @@ function setupPipSystem() {
   throw new Error(`Could not install pip on ${process.platform}`)
 }
 
-/** Install wheel (required for Conan, Meson, etc.) */
-function setupWheel(foundPython: string) {
-  execaSync(foundPython, ["-m", "pip", "install", "-U", "wheel"], { stdio: "inherit" })
-}
-
 async function addPythonBaseExecPrefix_raw(python: string) {
   const dirs: string[] = []
 

src/utils/setup/setupPipPack.ts

@@ -8,30 +8,45 @@ import { addPath } from "../env/addEnv"
 import { InstallationInfo } from "./setupBin"
 import { getVersion } from "../../versions/versions"
 import { ubuntuVersion } from "../env/ubuntu_version"
-
-/* eslint-disable require-atomic-updates */
-let python: string | undefined
+import memoize from "micro-memoize"
 
 /** A function that installs a package using pip */
-export async function setupPipPack(name: string, version?: string): Promise<InstallationInfo> {
+export async function setupPipPack(name: string, version?: string, upgrade = false): Promise<InstallationInfo> {
+  return setupPipPackWithPython(await getPython(), name, version, upgrade)
+}
+
+export async function setupPipPackWithPython(
+  givenPython: string,
+  name: string,
+  version?: string,
+  upgrade = false
+): Promise<InstallationInfo> {
   info(`Installing ${name} ${version ?? ""} via pip`)
 
-  if (python === undefined) {
-    python = (await setupPython(getVersion("python", undefined, await ubuntuVersion()), "", process.arch)).bin!
-  }
+  const nameAndVersion = version !== undefined && version !== "" ? `${name}==${version}` : name
+  const upgradeFlag = upgrade === true ? ["--upgrade"] : []
 
-  execaSync(python, ["-m", "pip", "install", version !== undefined && version !== "" ? `${name}==${version}` : name], {
+  execaSync(givenPython, ["-m", "pip", "install", ...upgradeFlag, nameAndVersion], {
     stdio: "inherit",
   })
 
-  const execPaths = await addPythonBaseExecPrefix(python)
+  const execPaths = await addPythonBaseExecPrefix(givenPython)
   const binDir = await findBinDir(execPaths, name)
 
   await addPath(binDir)
 
   return { binDir }
 }
 
+async function getPython_raw(): Promise<string> {
+  const pythonBin = (await setupPython(getVersion("python", undefined, await ubuntuVersion()), "", process.arch)).bin
+  if (pythonBin === undefined) {
+    throw new Error("Python binary was not found")
+  }
+  return pythonBin
+}
+const getPython = memoize(getPython_raw)
+
 async function findBinDir(dirs: string[], name: string) {
   const exists = await Promise.all(dirs.map((dir) => pathExists(join(dir, addExeExt(name)))))
   const dirIndex = exists.findIndex((exist) => exist)