Add python version to hash key

astral-sh · Dec 13, 2024 · 4d46f4b · 4d46f4b
1 parent e3017a7
commit 4d46f4b
Show file tree

Hide file tree

Showing 8 changed files with 141 additions and 3 deletions.
diff --git a/.github/workflows/test-cache.yml b/.github/workflows/test-cache.yml
@@ -214,3 +214,14 @@ jobs:
       - name: Remove cache dependency glob file
         run: rm -f ~/uv-cache.glob
         shell: bash
+
+  test-no-python-version:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup with cache
+        uses: ./
+        with:
+          enable-cache: true
+      - run: uv sync
+        working-directory: __tests__/fixtures/old-python-constraint-project
diff --git a/__tests__/fixtures/old-python-constraint-project/README.md b/__tests__/fixtures/old-python-constraint-project/README.md
diff --git a/__tests__/fixtures/old-python-constraint-project/pyproject.toml b/__tests__/fixtures/old-python-constraint-project/pyproject.toml
@@ -0,0 +1,13 @@
+[project]
+name = "old-python-constraint-project"
+version = "0.1.0"
+description = "Add your description here"
+readme = "README.md"
+requires-python = ">=3.8,<=3.9"
+dependencies = [
+    "ruff>=0.6.2",
+]
+
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
diff --git a/...ts__/fixtures/old-python-constraint-project/src/old_python_constraint_project/__init__.py b/...ts__/fixtures/old-python-constraint-project/src/old_python_constraint_project/__init__.py
@@ -0,0 +1,2 @@
+def hello() -> str:
+    return "Hello from uv-project!"
diff --git a/__tests__/fixtures/old-python-constraint-project/uv.lock b/__tests__/fixtures/old-python-constraint-project/uv.lock
diff --git a/dist/save-cache/index.js b/dist/save-cache/index.js
diff --git a/dist/setup/index.js b/dist/setup/index.js
diff --git a/src/cache/restore-cache.ts b/src/cache/restore-cache.ts
@@ -4,9 +4,11 @@ import {
   cacheDependencyGlob,
   cacheLocalPath,
   cacheSuffix,
+  pythonVersion as pythonVersionInput,
 } from "../utils/inputs";
 import { getArch, getPlatform } from "../utils/platforms";
 import { hashFiles } from "../hash/hash-files";
+import * as exec from "@actions/exec";
 
 export const STATE_CACHE_KEY = "cache-key";
 export const STATE_CACHE_MATCHED_KEY = "cache-matched-key";
@@ -49,7 +51,31 @@ async function computeKeys(version: string): Promise<string> {
     cacheDependencyPathHash += "no-dependency-glob";
   }
   const suffix = cacheSuffix ? `-${cacheSuffix}` : "";
-  return `setup-uv-${CACHE_VERSION}-${getArch()}-${getPlatform()}-${version}${cacheDependencyPathHash}${suffix}`;
+  const pythonVersion = await getPythonVersion();
+  return `setup-uv-${CACHE_VERSION}-${getArch()}-${getPlatform()}-${version}-${pythonVersion}${cacheDependencyPathHash}${suffix}`;
+}
+
+async function getPythonVersion(): Promise<string> {
+  if (pythonVersionInput !== "") {
+    return pythonVersionInput;
+  }
+
+  const options: exec.ExecOptions = {
+    silent: !core.isDebug(),
+  };
+  const execArgs = ["python", "find"];
+
+  let output = "";
+  options.listeners = {
+    stdout: (data: Buffer) => {
+      output += data.toString();
+    },
+  };
+  await exec.exec("uv", execArgs, options);
+  const pythonPath = output.trim();
+  output = "";
+  await exec.exec(pythonPath, ["--version"], options);
+  return output.trim();
 }
 
 function handleMatchResult(
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		def hello() -> str:
		return "Hello from uv-project!"