Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Extract python version from explicit main group (poetry) #745

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Extract python version from explicit main group (poetry) #745

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 12 additions & 0 deletions __tests__/utils.test.ts
View file
Open in desktop
Expand Up @@ -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 => {
Expand Down
18 changes: 13 additions & 5 deletions src/utils.ts
View file
Open in desktop
Expand Up @@ -228,15 +228,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}`);
Expand Down