actions
/
setup-python
mirror of https://github.com/actions/setup-python
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 2eb6c43547 into 82c7e631bb

This commit is contained in:
Nicolas Delaby 2024-03-30 13:19:40 +05:45 committed by GitHub
parent 82c7e631bb 2eb6c43547
commit 77d827840f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
__tests__/utils.test.ts
View File

@ -126,6 +126,18 @@ describe('Version from file test', () => {
expect(_fn(pythonVersionFilePath)).toEqual([pythonVersion]);
}
);
it.each([getVersionInputFromTomlFile, getVersionInputFromFile])(
'Version from poetry with explicit main group pyproject.toml test',
async _fn => {
await io.mkdirP(tempDir);
const pythonVersionFileName = 'pyproject.toml';
const pythonVersionFilePath = path.join(tempDir, pythonVersionFileName);
const pythonVersion = '>=3.7.0';
const pythonVersionFileContent = `[tool.poetry.group.main.dependencies]\npython = "${pythonVersion}"`;
fs.writeFileSync(pythonVersionFilePath, pythonVersionFileContent);
expect(_fn(pythonVersionFilePath)).toEqual([pythonVersion]);
}
);
it.each([getVersionInputFromTomlFile, getVersionInputFromFile])(
'Version undefined',
async _fn => {

18
src/utils.ts
View File

@ -230,15 +230,23 @@ export function getVersionInputFromTomlFile(versionFile: string): string[] {
if ('project' in pyprojectConfig) {
// standard project metadata (PEP 621)
keys = ['project', 'requires-python'];
keys = [['project', 'requires-python']];
} else {
// python poetry
keys = ['tool', 'poetry', 'dependencies', 'python'];
keys = [
// implicit group main
['tool', 'poetry', 'dependencies', 'python'],
// explicit group main
['tool', 'poetry', 'group', 'main', 'dependencies', 'python']
];
}
const versions = [];
const version = extractValue(pyprojectConfig, keys);
if (version !== undefined) {
versions.push(version);
for (const key of keys) {
const version = extractValue(pyprojectConfig, key);
if (version !== undefined) {
versions.push(version);
break;
}
}
core.info(`Extracted ${versions} from ${versionFile}`);