Merge pull request #199 from aminya/setup-python-bundle [skip ci]

aminya · Sep 8, 2023 · 4ca8d58 · 4ca8d58
2 parents ffff3ab + 96396ce
commit 4ca8d58
Show file tree

Hide file tree

Showing 27 changed files with 65 additions and 62 deletions.
diff --git a/dist/actions/actions_python.3d3da518.js b/dist/actions/actions_python.3d3da518.js
diff --git a/dist/actions/actions_python.3d3da518.js.map b/dist/actions/actions_python.3d3da518.js.map
diff --git a/dist/actions/actions_python.e89dee1a.js b/dist/actions/actions_python.e89dee1a.js
diff --git a/dist/actions/actions_python.e89dee1a.js.map b/dist/actions/actions_python.e89dee1a.js.map
diff --git a/dist/actions/cache-dependencies.a31532a6.js b/dist/actions/cache-dependencies.a31532a6.js
diff --git a/dist/actions/cache-dependencies.a31532a6.js.map b/dist/actions/cache-dependencies.a31532a6.js.map
diff --git a/dist/actions/setup-cpp.js b/dist/actions/setup-cpp.js
diff --git a/dist/actions/setup-cpp.js.map b/dist/actions/setup-cpp.js.map
diff --git a/dist/legacy/actions_python.3180bacb.js b/dist/legacy/actions_python.3180bacb.js
diff --git a/dist/legacy/actions_python.3180bacb.js.map b/dist/legacy/actions_python.3180bacb.js.map
diff --git a/dist/legacy/actions_python.7ea72d9b.js b/dist/legacy/actions_python.7ea72d9b.js
diff --git a/dist/legacy/actions_python.7ea72d9b.js.map b/dist/legacy/actions_python.7ea72d9b.js.map
diff --git a/dist/legacy/cache-dependencies.348a592e.js b/dist/legacy/cache-dependencies.348a592e.js
diff --git a/dist/legacy/cache-dependencies.348a592e.js.map b/dist/legacy/cache-dependencies.348a592e.js.map
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/actions_python.3b8537b9.js b/dist/modern/actions_python.3b8537b9.js
diff --git a/dist/modern/actions_python.3b8537b9.js.map b/dist/modern/actions_python.3b8537b9.js.map
diff --git a/dist/modern/actions_python.ff232e32.js b/dist/modern/actions_python.ff232e32.js
diff --git a/dist/modern/actions_python.ff232e32.js.map b/dist/modern/actions_python.ff232e32.js.map
diff --git a/dist/modern/cache-dependencies.e0061047.js b/dist/modern/cache-dependencies.e0061047.js
diff --git a/dist/modern/cache-dependencies.e0061047.js.map b/dist/modern/cache-dependencies.e0061047.js.map
diff --git a/dist/modern/setup-cpp.js b/dist/modern/setup-cpp.js
diff --git a/dist/modern/setup-cpp.js.map b/dist/modern/setup-cpp.js.map
diff --git a/package.json b/package.json
@@ -116,7 +116,7 @@
     "prettier-config-atomic": "^3.1.0",
     "retry-as-promised": "^7.0.4",
     "semver": "7.5.4",
-    "setup-python": "github:actions/setup-python#v4.7.0",
+    "setup-python": "github:aminya/setup-python#a783db655c6e40317e2c0c96f9d162d9c9f4a751",
     "shx": "0.3.4",
     "simple-update-notifier": "^2.0.0",
     "terser-config-atomic": "^1.0.0",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/python/actions_python.ts b/src/python/actions_python.ts
@@ -5,20 +5,13 @@ import { info, warning } from "ci-log"
 import { debug } from "@actions/core"
 import { join } from "patha"
 import { GITHUB_ACTIONS } from "ci-info"
-import { isCacheFeatureAvailable, IS_MAC } from "setup-python/src/utils"
-import { getCacheDistributor } from "setup-python/src/cache-distributions/cache-factory"
+import { IS_MAC } from "setup-python/src/utils"
 import { pathExists } from "path-exists"
 
 function isPyPyVersion(versionSpec: string) {
   return versionSpec.startsWith("pypy")
 }
 
-export async function cacheDependencies(cache: string, pythonVersion: string) {
-  const cacheDependencyPath = undefined
-  const cacheDistributor = getCacheDistributor(cache, pythonVersion, cacheDependencyPath)
-  await cacheDistributor.restoreCache()
-}
-
 const checkLatest = false
 
 export async function setupActionsPython(version: string, _setupDir: string, arch: string) {
@@ -45,9 +38,10 @@ export async function setupActionsPython(version: string, _setupDir: string, arc
       info(`Successfully set up ${installed.impl} (${pythonVersion})`)
     }
 
-    if (isCacheFeatureAvailable()) {
-      const cache = "pip" // package manager used for caching
-      await cacheDependencies(cache, pythonVersion)
+    const cache = false
+    if (cache) {
+      const { cacheDependencies } = await import("setup-python/src/cache-dependencies")
+      await cacheDependencies("pip", pythonVersion)
     }
   }