actions/setup-python
1
0
Fork 0
mirror of https://code.forgejo.org/actions/setup-python synced 2025-06-17 16:26:06 +02:00
Code Activity

Fix desugaring of 3.13.1t and add test case.

Browse source
This commit is contained in:
Sam Gross 2025-01-22 20:22:49 +00:00
parent c70f76ebc5
commit d653c0b66e
3 changed files with 44 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/find-python.ts
View file

@ -38,11 +38,9 @@ export async function useCpythonVersion(
allowPreReleases: boolean
): Promise<InstalledVersion> {
let manifest: tc.IToolRelease[] | null = null;
const [desugaredVersionSpec, freethreaded] =
desugarFreeThreadedVersion(version);
const desugaredVersionSpec2 = desugarDevVersion(desugaredVersionSpec);
const [desugaredVersionSpec, freethreaded] = desugarVersion(version);
let semanticVersionSpec = pythonVersionToSemantic(
desugaredVersionSpec2,
desugaredVersionSpec,
allowPreReleases
);
core.debug(`Semantic version spec of ${version} is ${semanticVersionSpec}`);
@ -167,14 +165,22 @@ export async function useCpythonVersion(
return {impl: 'CPython', version: installed};
}
/* Identify freethreaded versions like, 3.13t, 3.13t-dev, 3.14.0a1t. Returns
* the version without the `t` and the architectures suffix, if freethreaded */
/* Desugar free threaded and dev versions */
export function desugarVersion(versionSpec: string) {
const [desugaredVersionSpec, freethreaded] =
desugarFreeThreadedVersion(versionSpec);
const desugaredVersionSpec2 = desugarDevVersion(desugaredVersionSpec);
return [desugaredVersionSpec2, freethreaded];
}
/* Identify freethreaded versions like, 3.13t, 3.13.1t, 3.13t-dev, 3.14.0a1t.
* Returns the version without the `t` and the architectures suffix, if freethreaded */
function desugarFreeThreadedVersion(versionSpec: string) {
const prereleaseVersion = /(\d+\.\d+\.\d+)(t)((?:a|b|rc)\d*)/g;
if (prereleaseVersion.test(versionSpec)) {
return [versionSpec.replace(prereleaseVersion, '$1$3'), '-freethreaded'];
}
const majorMinor = /^(\d+\.\d+)(t)$/;
const majorMinor = /^(\d+\.\d+(\.\d+)?)(t)$/;
if (majorMinor.test(versionSpec)) {
return [versionSpec.replace(majorMinor, '$1'), '-freethreaded'];
}