Skip to content

Commit

Permalink
Fix style issues and build
Browse files Browse the repository at this point in the history
Build the project using `npm run build` and run prettier using `npm run
format`
  • Loading branch information
elpic committed May 31, 2023
1 parent 3d009a5 commit 59a7889
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 14 deletions.
12 changes: 9 additions & 3 deletions __tests__/utils.test.ts
Expand Up @@ -12,15 +12,21 @@ jest.mock('@actions/core');

describe('parsePythonVersionFile', () => {
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', () => {
expect(parsePythonVersionFile('3.7 ')).toEqual('3.7')
expect(parsePythonVersionFile('3.7 ')).toEqual('3.7');
});

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'
);
});
});

Expand Down
2 changes: 1 addition & 1 deletion docs/advanced-usage.md
Expand Up @@ -242,7 +242,7 @@ jobs:
The python-version-file input accepts a path to a file containing the version of Python to be used by a project, for example .python-version, or .tool-versions.
If both the python-version and the python-version-file inputs are provided then the python-version input is used.

> In case both `python-version` and `python-version-file` inputs are supplied, the `python-version-file` input will be ignored due to its lower priority.
>In case both `python-version` and `python-version-file` inputs are supplied, the `python-version-file` input will be ignored due to its lower priority.
```yaml
steps:
Expand Down
19 changes: 11 additions & 8 deletions src/find-pypy.ts
Expand Up @@ -65,14 +65,17 @@ export async function findPyPyVersion(
));

if (!installDir) {
({installDir, resolvedPythonVersion, resolvedPyPyVersion} =
await pypyInstall.installPyPy(
pypyVersionSpec.pypyVersion,
pypyVersionSpec.pythonVersion,
architecture,
allowPreReleases,
releases
));
({
installDir,
resolvedPythonVersion,
resolvedPyPyVersion
} = await pypyInstall.installPyPy(
pypyVersionSpec.pypyVersion,
pypyVersionSpec.pythonVersion,
architecture,
allowPreReleases,
releases
));
}

const pipDir = IS_WINDOWS ? 'Scripts' : 'bin';
Expand Down
11 changes: 9 additions & 2 deletions src/setup-python.ts
Expand Up @@ -5,7 +5,12 @@ import * as path from 'path';
import * as os from 'os';
import fs from 'fs';
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) {
return versionSpec.startsWith('pypy');
Expand Down Expand Up @@ -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}`);

return [version];
Expand Down

0 comments on commit 59a7889

Please sign in to comment.