From aa9072ae311933757b0555800fd23386638901ca Mon Sep 17 00:00:00 2001 From: Julfried Date: Sun, 16 Feb 2025 18:35:08 +0100 Subject: [PATCH 1/3] Add function to extract Python version constraint from pyproject.toml --- src/utils/pyproject.ts | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/src/utils/pyproject.ts b/src/utils/pyproject.ts index 9b00302..f7f816d 100644 --- a/src/utils/pyproject.ts +++ b/src/utils/pyproject.ts @@ -43,3 +43,31 @@ function getRequiredVersion(filePath: string): string | undefined { }; return tomlContent["required-version"]; } + +export function getPythonVersionFromPyProject( + filePath: string, +): string | undefined { + if (!fs.existsSync(filePath)) { + core.warning(`Could not find pyproject.toml file: ${filePath}`); + return undefined; + } + + let pythonVersionConstraint: string | undefined; + try { + const fileContent = fs.readFileSync(filePath, "utf-8"); + const tomlContent = toml.parse(fileContent) as { + tool?: { uv?: { "requires-python"?: string } }; + }; + + pythonVersionConstraint = tomlContent?.tool?.uv?.["requires-python"]; + + if (pythonVersionConstraint) { + core.info(`Extracted Python version constraint from ${filePath}: ${pythonVersionConstraint}`); + } + } catch (err) { + const message = (err as Error).message; + core.warning(`Error while parsing ${filePath} for Python version: ${message}`); + } + + return pythonVersionConstraint; +} From 1d0b806c474ae9450bc58c185ed673ef0b5c9f65 Mon Sep 17 00:00:00 2001 From: Julfried Date: Mon, 17 Feb 2025 11:18:37 +0100 Subject: [PATCH 2/3] Update setup uv with the 4 cases --- src/setup-uv.ts | 39 +++++++++++++++++++++++++++++++++------ 1 file changed, 33 insertions(+), 6 deletions(-) diff --git a/src/setup-uv.ts b/src/setup-uv.ts index a7ff66e..88773a8 100644 --- a/src/setup-uv.ts +++ b/src/setup-uv.ts @@ -27,7 +27,7 @@ import { } from "./utils/inputs"; import * as exec from "@actions/exec"; import fs from "node:fs"; -import { getUvVersionFromConfigFile } from "./utils/pyproject"; +import { getUvVersionFromConfigFile, getPythonVersionFromPyProject } from "./utils/pyproject"; async function run(): Promise { const platform = getPlatform(); @@ -146,15 +146,42 @@ function setToolDir(): void { } async function setupPython(): Promise { - if (pythonVersion !== "") { - core.exportVariable("UV_PYTHON", pythonVersion); - core.info(`Set UV_PYTHON to ${pythonVersion}`); + let pythonVersionToUse = undefined; // Python version to use for setup + + // Case (1): No Python version and no pyproject.toml file + if (pythonVersion === "" && pyProjectFile === "") { + return; + } + + // Case (2): Python version is provided and no pyproject.toml file + else if (pythonVersion !== "" && pyProjectFile === "") { + pythonVersionToUse = pythonVersion; + } + + // Case (3): No Python version and pyproject.toml file + else if (pythonVersion === "" && pyProjectFile !== "") { + pythonVersionToUse = getPythonVersionFromPyProject(pyProjectFile); + if (!pythonVersionToUse) { + core.info(`No valid Python version found in ${pyProjectFile}. Not able to setup Python.`); + return; + } + } + + // Case (4): Python version is provided and pyproject.toml file + else if (pythonVersion !== "" && pyProjectFile !== "") { + //TODO: Implement this case + } + + // If a valid Python version is found, setup Python + if (pythonVersionToUse) { + core.exportVariable("UV_PYTHON", pythonVersionToUse); + core.info(`Setting UV_PYTHON to ${pythonVersionToUse}`); const options: exec.ExecOptions = { silent: !core.isDebug(), }; - const execArgs = ["venv", "--python", pythonVersion]; + const execArgs = ["venv", "--python", pythonVersionToUse]; - core.info("Activating python venv..."); + core.info("Activating Python venv..."); await exec.exec("uv", execArgs, options); let venvBinPath = ".venv/bin"; From 5770883575756c372d09c3dd862ca9b114cd057f Mon Sep 17 00:00:00 2001 From: Julfried Date: Mon, 17 Feb 2025 11:53:54 +0100 Subject: [PATCH 3/3] Simplify setup-python --- src/setup-uv.ts | 89 ++++++++++++++++++++++++++++++++++--------------- 1 file changed, 62 insertions(+), 27 deletions(-) diff --git a/src/setup-uv.ts b/src/setup-uv.ts index 88773a8..bd8d9a4 100644 --- a/src/setup-uv.ts +++ b/src/setup-uv.ts @@ -146,50 +146,85 @@ function setToolDir(): void { } async function setupPython(): Promise { - let pythonVersionToUse = undefined; // Python version to use for setup + const options: exec.ExecOptions = { + silent: !core.isDebug(), + }; // Case (1): No Python version and no pyproject.toml file if (pythonVersion === "" && pyProjectFile === "") { + core.info("No Python setup required."); return; } // Case (2): Python version is provided and no pyproject.toml file else if (pythonVersion !== "" && pyProjectFile === "") { - pythonVersionToUse = pythonVersion; + const execArgs = ["pin", "python", pythonVersion]; + core.info(`Pinning Python version to ${pythonVersion}...`); + await exec.exec("uv", execArgs, options); } // Case (3): No Python version and pyproject.toml file else if (pythonVersion === "" && pyProjectFile !== "") { - pythonVersionToUse = getPythonVersionFromPyProject(pyProjectFile); - if (!pythonVersionToUse) { - core.info(`No valid Python version found in ${pyProjectFile}. Not able to setup Python.`); + const extractedPythonVersion = getPythonVersionFromPyProject(pyProjectFile); + + if (!extractedPythonVersion){ + core.warning( + `Could not find python version in pyproject.toml. Won't setup python.`, + ); return; } - } - // Case (4): Python version is provided and pyproject.toml file - else if (pythonVersion !== "" && pyProjectFile !== "") { - //TODO: Implement this case - } - - // If a valid Python version is found, setup Python - if (pythonVersionToUse) { - core.exportVariable("UV_PYTHON", pythonVersionToUse); - core.info(`Setting UV_PYTHON to ${pythonVersionToUse}`); - const options: exec.ExecOptions = { - silent: !core.isDebug(), - }; - const execArgs = ["venv", "--python", pythonVersionToUse]; - - core.info("Activating Python venv..."); + const execArgs = ["pin", "python", extractedPythonVersion, "--project", pyProjectFile]; + core.info(`Pinning Python version to ${extractedPythonVersion}...`); await exec.exec("uv", execArgs, options); + } - let venvBinPath = ".venv/bin"; - if (process.platform === "win32") { - venvBinPath = ".venv/Scripts"; - } - core.addPath(path.resolve(venvBinPath)); - core.exportVariable("VIRTUAL_ENV", path.resolve(".venv")); + // Case (4): Pin python version using uv pin if python version is provided and pyproject.toml file is present + if (pythonVersion !== "" && pyProjectFile !== "") { + const execArgs = ["pin", "python", pythonVersion, "--project", pyProjectFile]; + core.info(`Pinning Python version to ${pythonVersion}...`); + await exec.exec("uv", execArgs, options); + } + + // Extract the pinned python version + let pinnedPythonVersion = getPinnedPythonVersion(); + if (!pinnedPythonVersion) { + core.setFailed("Failed to determine pinned Python version after uv pin."); + return; + } + + // Setup and activate venv + // Set UV_PYHTON to the pinned python version + core.exportVariable("UV_PYTHON", pinnedPythonVersion); + core.info(`Setting UV_PYTHON to ${pinnedPythonVersion}`); + + core.info("Activating Python venv..."); + const execArgs = ["venv"]; + await exec.exec("uv", execArgs, options); + + let venvBinPath = ".venv/bin"; + if (process.platform === "win32") { + venvBinPath = ".venv/Scripts"; + } + core.addPath(path.resolve(venvBinPath)); + core.exportVariable("VIRTUAL_ENV", path.resolve(".venv")); +} + +function getPinnedPythonVersion(): string | undefined { + const pythonVersionFile = ".python-version"; + + if (!fs.existsSync(pythonVersionFile)) { + core.warning(`No .python-version file found after uv pin.`); + return undefined; + } + + try { + const version = fs.readFileSync(pythonVersionFile, "utf-8").trim(); + core.info(`Detected pinned Python version from .python-version: ${version}`); + return version; + } catch (error) { + core.warning(`Failed to read .python-version: ${error}`); + return undefined; } }