actions/setup-python
3
0
Fork 0
mirror of https://github.com/actions/setup-python.git synced 2025-06-19 10:47:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

update pypy3 to point to 3.6 (#164)

Browse Source
This commit is contained in:
Maxim Lobanov
2020-12-08 00:59:14 +03:00
committed by GitHub
parent 723e46dad7
commit 3b3f2de1b1
3 changed files with 37 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/find-python.ts
View File

@ -37,8 +37,11 @@ function binDir(installDir: string): string {
// A particular version of PyPy may contain one or more versions of the Python interpreter.
// For example, PyPy 7.0 contains Python 2.7, 3.5, and 3.6-alpha.
// We only care about the Python version, so we don't use the PyPy version for the tool cache.
function usePyPy(majorVersion: 2 | 3, architecture: string): InstalledVersion {
const findPyPy = tc.find.bind(undefined, 'PyPy', majorVersion.toString());
function usePyPy(
majorVersion: '2' | '3.6',
architecture: string
): InstalledVersion {
const findPyPy = tc.find.bind(undefined, 'PyPy', majorVersion);
let installDir: string | null = findPyPy(architecture);
if (!installDir && IS_WINDOWS) {
@ -188,9 +191,10 @@ export async function findPythonVersion(
): Promise<InstalledVersion> {
switch (version.toUpperCase()) {
case 'PYPY2':
return usePyPy(2, architecture);
return usePyPy('2', architecture);
case 'PYPY3':
return usePyPy(3, architecture);
// keep pypy3 pointing to 3.6 for backward compatibility
return usePyPy('3.6', architecture);
default:
return await useCpythonVersion(version, architecture);
}