@@ -96273,10 +96273,12 @@ var State;
9627396273 State["CACHE_PATHS"] = "cache-paths";
9627496274})(State || (exports.State = State = {}));
9627596275class CacheDistributor {
96276+ packageManager;
96277+ cacheDependencyPath;
96278+ CACHE_KEY_PREFIX = 'setup-python';
9627696279 constructor(packageManager, cacheDependencyPath) {
9627796280 this.packageManager = packageManager;
9627896281 this.cacheDependencyPath = cacheDependencyPath;
96279- this.CACHE_KEY_PREFIX = 'setup-python';
9628096282 }
9628196283 async handleLoadedCache() { }
9628296284 async restoreCache() {
@@ -96422,10 +96424,11 @@ const cache_distributor_1 = __importDefault(__nccwpck_require__(2326));
9642296424const utils_1 = __nccwpck_require__(1798);
9642396425const constants_1 = __nccwpck_require__(565);
9642496426class PipCache extends cache_distributor_1.default {
96427+ pythonVersion;
96428+ cacheDependencyBackupPath = constants_1.CACHE_DEPENDENCY_BACKUP_PATH;
9642596429 constructor(pythonVersion, cacheDependencyPath = '**/requirements.txt') {
9642696430 super('pip', cacheDependencyPath);
9642796431 this.pythonVersion = pythonVersion;
96428- this.cacheDependencyBackupPath = constants_1.CACHE_DEPENDENCY_BACKUP_PATH;
9642996432 }
9643096433 async getCacheGlobalDirectories() {
9643196434 let exitCode = 1;
@@ -96530,6 +96533,8 @@ const path = __importStar(__nccwpck_require__(6928));
9653096533const core = __importStar(__nccwpck_require__(7484));
9653196534const cache_distributor_1 = __importDefault(__nccwpck_require__(2326));
9653296535class PipenvCache extends cache_distributor_1.default {
96536+ pythonVersion;
96537+ patterns;
9653396538 constructor(pythonVersion, patterns = '**/Pipfile.lock') {
9653496539 super('pipenv', patterns);
9653596540 this.pythonVersion = pythonVersion;
@@ -96615,6 +96620,9 @@ const core = __importStar(__nccwpck_require__(7484));
9661596620const cache_distributor_1 = __importDefault(__nccwpck_require__(2326));
9661696621const utils_1 = __nccwpck_require__(1798);
9661796622class PoetryCache extends cache_distributor_1.default {
96623+ pythonVersion;
96624+ patterns;
96625+ poetryProjects;
9661896626 constructor(pythonVersion, patterns = '**/poetry.lock', poetryProjects = new Set()) {
9661996627 super('poetry', patterns);
9662096628 this.pythonVersion = pythonVersion;
@@ -97054,7 +97062,6 @@ async function installPip(pythonLocation) {
9705497062 }
9705597063}
9705697064async function useCpythonVersion(version, architecture, updateEnvironment, checkLatest, allowPreReleases, freethreaded) {
97057- var _a;
9705897065 let manifest = null;
9705997066 const { version: desugaredVersionSpec, freethreaded: versionFreethreaded } = desugarVersion(version);
9706097067 let semanticVersionSpec = pythonVersionToSemantic(desugaredVersionSpec, allowPreReleases);
@@ -97070,7 +97077,7 @@ async function useCpythonVersion(version, architecture, updateEnvironment, check
9707097077 }
9707197078 if (checkLatest) {
9707297079 manifest = await installer.getManifest();
97073- const resolvedVersion = (_a = ( await installer.findReleaseFromManifest(semanticVersionSpec, architecture, manifest))) === null || _a === void 0 ? void 0 : _a .version;
97080+ const resolvedVersion = (await installer.findReleaseFromManifest(semanticVersionSpec, architecture, manifest))? .version;
9707497081 if (resolvedVersion) {
9707597082 semanticVersionSpec = resolvedVersion;
9707697083 core.info(`Resolved as '${semanticVersionSpec}'`);
@@ -97286,7 +97293,7 @@ const TOKEN = core.getInput('token');
9728697293const AUTH = !TOKEN ? undefined : `token ${TOKEN}`;
9728797294async function installGraalPy(graalpyVersion, architecture, allowPreReleases, releases) {
9728897295 let downloadDir;
97289- releases = releases !== null && releases !== void 0 ? releases : (await getAvailableGraalPyVersions());
97296+ releases = releases ?? (await getAvailableGraalPyVersions());
9729097297 if (!releases || !releases.length) {
9729197298 throw new Error('No release was found in GraalPy version.json');
9729297299 }
@@ -97497,7 +97504,7 @@ const fs_1 = __importDefault(__nccwpck_require__(9896));
9749797504const utils_1 = __nccwpck_require__(1798);
9749897505async function installPyPy(pypyVersion, pythonVersion, architecture, allowPreReleases, releases) {
9749997506 let downloadDir;
97500- releases = releases !== null && releases !== void 0 ? releases : (await getAvailablePyPyVersions());
97507+ releases = releases ?? (await getAvailablePyPyVersions());
9750197508 if (!releases || releases.length === 0) {
9750297509 throw new Error('No release was found in PyPy version.json');
9750397510 }
@@ -97936,11 +97943,10 @@ function resolveVersionInput() {
9793697943 return versions;
9793797944}
9793897945async function run() {
97939- var _a;
9794097946 if (utils_1.IS_MAC) {
9794197947 process.env['AGENT_TOOLSDIRECTORY'] = '/Users/runner/hostedtoolcache';
9794297948 }
97943- if ((_a = process.env.AGENT_TOOLSDIRECTORY) === null || _a === void 0 ? void 0 : _a .trim()) {
97949+ if (process.env.AGENT_TOOLSDIRECTORY? .trim()) {
9794497950 process.env['RUNNER_TOOL_CACHE'] = process.env['AGENT_TOOLSDIRECTORY'];
9794597951 }
9794697952 core.debug(`Python is expected to be installed into ${process.env['RUNNER_TOOL_CACHE']}`);
@@ -98281,7 +98287,6 @@ function getVersionsInputFromPlainFile(versionFile) {
9828198287 * Python version extracted from a .tool-versions file.
9828298288 */
9828398289function getVersionInputFromToolVersions(versionFile) {
98284- var _a;
9828598290 if (!fs_1.default.existsSync(versionFile)) {
9828698291 core.warning(`File ${versionFile} does not exist.`);
9828798292 return [];
@@ -98296,7 +98301,7 @@ function getVersionInputFromToolVersions(versionFile) {
9829698301 }
9829798302 const match = line.match(/^\s*python\s*v?\s*(?<version>[^\s]+)\s*$/);
9829898303 if (match) {
98299- return [((_a = match.groups) === null || _a === void 0 ? void 0 : _a .version.trim() ) || ''];
98304+ return [match.groups? .version.trim() || ''];
9830098305 }
9830198306 }
9830298307 core.warning(`No Python version found in ${versionFile}`);
0 commit comments