这是indexloc提供的服务，不要输入任何密码
Skip to content

feat: enrich deps with managerData from poetry deps if both present #39275

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

feat: enrich deps with managerData from poetry deps if both present #39275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2482beb
feat: use poetry deps to enrich equivalent pep621/pep735 deps
jonaskuske Nov 12, 2025
74b8807
test: cover project.optional-dependencies in enrichment test
jonaskuske Nov 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions lib/modules/manager/poetry/__snapshots__/extract.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,6 +389,7 @@ exports[`modules/manager/poetry/extract > extractPackageFile() > extracts multip
"datasource": "pypi",
"depName": "dep5",
"depType": "dependencies",
"managerData": {},
"skipReason": "unspecified-version",
},
{
Expand Down
55 changes: 55 additions & 0 deletions lib/modules/manager/poetry/extract.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -616,4 +616,59 @@ describe('modules/manager/poetry/extract', () => {
},
]);
});

it('enriches pep621/pep735 dependencies with poetry managerData', async () => {
const content = codeBlock`
[project]
dependencies = ["click"]
[project.optional-dependencies]
other = ["zoom==1.0.0"]
[dependency-groups]
typing = ["mypy==1.13.0", "types-requests"]
[tool.poetry.dependencies]
click = { source = "artifactory" }
zoom = { source = "artifactory" }
[tool.poetry.group.typing.dependencies]
types-requests = { source = "artifactory" }
[tool.poetry.group.typing.dependencies.mypy]
source = "artifactory"
`;
const res = await extractPackageFile(content, 'pyproject.toml');
expect(res?.deps).toMatchObject([
{
packageName: 'click',
datasource: 'pypi',
depType: 'project.dependencies',
skipReason: 'unspecified-version',
depName: 'click',
managerData: { sourceName: 'artifactory' },
},
{
packageName: 'zoom',
datasource: 'pypi',
depType: 'project.optional-dependencies',
currentValue: '==1.0.0',
currentVersion: '1.0.0',
depName: 'zoom',
managerData: { depGroup: 'other', sourceName: 'artifactory' },
},
{
packageName: 'mypy',
datasource: 'pypi',
depType: 'dependency-groups',
currentValue: '==1.13.0',
currentVersion: '1.13.0',
depName: 'mypy',
managerData: { depGroup: 'typing', sourceName: 'artifactory' },
},
{
packageName: 'types-requests',
datasource: 'pypi',
depType: 'dependency-groups',
skipReason: 'unspecified-version',
depName: 'types-requests',
managerData: { depGroup: 'typing', sourceName: 'artifactory' },
},
]);
});
});
42 changes: 29 additions & 13 deletions lib/modules/manager/poetry/schema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,16 +108,17 @@ const PoetryPypiDependency = z.union([
z
.object({ version: z.string().optional(), source: z.string().optional() })
.transform(({ version: currentValue, source }): PackageDependency => {
const managerData = {
...(source ? { sourceName: source.toLowerCase() } : {}),
};

if (!currentValue) {
return { datasource: PypiDatasource.id };
return { datasource: PypiDatasource.id, managerData };
}

return {
datasource: PypiDatasource.id,
managerData: {
nestedVersion: true,
...(source ? { sourceName: source.toLowerCase() } : {}),
},
managerData: { ...managerData, nestedVersion: true },
currentValue,
};
})
Expand Down Expand Up @@ -353,19 +354,34 @@ export const PoetryPyProject = Toml.pipe(

deps.push(...dependencyGroups);

const projectDepsByName = [
...(projectDependencies ?? []),
...(dependencyGroups ?? []),
...(projectOptionalDependencies ?? []),
].reduce(
(obj, dep) => ((obj[dep.depName!] = dep), obj),
{} as Record<string, PackageDependency>,
);

const poetryDependencies = tool?.poetry?.dependencies;
if (poetryDependencies) {
deps.push(...poetryDependencies);
}

const poetryDevDependencies = tool?.poetry?.['dev-dependencies'];
if (poetryDevDependencies) {
deps.push(...poetryDevDependencies);
}

const poetryGroupDependencies = tool?.poetry?.group;
if (poetryGroupDependencies) {
deps.push(...poetryGroupDependencies);

for (const poetryDep of [
...(poetryDependencies ?? []),
...(poetryDevDependencies ?? []),
...(poetryGroupDependencies ?? []),
]) {
// When the same dep exists in project.dependencies or dependency-groups,
// Poetry just uses the Poetry dep for enrichment with source info.
if (poetryDep.depName && projectDepsByName[poetryDep.depName]) {
const dep = projectDepsByName[poetryDep.depName];
dep.managerData = { ...poetryDep.managerData, ...dep.managerData };
} else {
deps.push(poetryDep);
}
}

const packageFileVersion = tool?.poetry?.version;
Expand Down