actions/setup-python
1
0
Fork 0
mirror of https://github.com/actions/setup-python.git synced 2024-11-25 10:26:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix style issues and build

Browse source 
Build the project using `npm run build` and run prettier using `npm run
format`
This commit is contained in:
Pablo Ifrán 2023-01-18 10:00:38 -03:00
parent 3d009a5143
commit 59a78899a9
4 changed files with 30 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
__tests__/utils.test.ts
View file

@ -12,15 +12,21 @@ jest.mock('@actions/core');
describe('parsePythonVersionFile', () => { describe('parsePythonVersionFile', () => {
it('handle the content of a .python-version file', () => { it('handle the content of a .python-version file', () => {
expect(parsePythonVersionFile('3.6')).toEqual('3.6') expect(parsePythonVersionFile('3.6')).toEqual('3.6');
}); });
it('trims extra spaces at the end of the content', () => { it('trims extra spaces at the end of the content', () => {
expect(parsePythonVersionFile('3.7 ')).toEqual('3.7') expect(parsePythonVersionFile('3.7 ')).toEqual('3.7');
}); });
it('parses correctly the content of .tool-version files', () => { it('parses correctly the content of .tool-version files', () => {
expect(parsePythonVersionFile('python 3.7')).toEqual('3.7') expect(parsePythonVersionFile('python 3.7')).toEqual('3.7');
});
it('parses correctly pypy version content of the .tool-version files', () => {
expect(parsePythonVersionFile('python pypy3.9-7.3.10')).toEqual(
'pypy3.9-7.3.10'
);
}); });
}); });

7
src/find-pypy.ts
View file

@ -65,8 +65,11 @@ export async function findPyPyVersion(
)); ));
if (!installDir) { if (!installDir) {
({installDir, resolvedPythonVersion, resolvedPyPyVersion} = ({
await pypyInstall.installPyPy( installDir,
resolvedPythonVersion,
resolvedPyPyVersion
} = await pypyInstall.installPyPy(
pypyVersionSpec.pypyVersion, pypyVersionSpec.pypyVersion,
pypyVersionSpec.pythonVersion, pypyVersionSpec.pythonVersion,
architecture, architecture,

11
src/setup-python.ts
View file

@ -5,7 +5,12 @@ import * as path from 'path';
import * as os from 'os'; import * as os from 'os';
import fs from 'fs'; import fs from 'fs';
import {getCacheDistributor} from './cache-distributions/cache-factory'; import {getCacheDistributor} from './cache-distributions/cache-factory';
import {parsePythonVersionFile, isCacheFeatureAvailable, logWarning, IS_MAC} from './utils'; import {
parsePythonVersionFile,
isCacheFeatureAvailable,
logWarning,
IS_MAC
} from './utils';
function isPyPyVersion(versionSpec: string) { function isPyPyVersion(versionSpec: string) {
return versionSpec.startsWith('pypy'); return versionSpec.startsWith('pypy');
@ -43,7 +48,9 @@ function resolveVersionInput() {
); );
} }
const version = parsePythonVersionFile(fs.readFileSync(versionFile, 'utf8')); const version = parsePythonVersionFile(
fs.readFileSync(versionFile, 'utf8')
);
core.info(`Resolved ${versionFile} as ${version}`); core.info(`Resolved ${versionFile} as ${version}`);
return [version]; return [version];