Skip to content

fix: ensure all poetry-dependencies are added to lock file (#9959) #810

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

Closed
finswimmer wants to merge 1 commit into from
Closed

fix: ensure all poetry-dependencies are added to lock file (#9959) #810

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/poetry/core/packages/dependency_group.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ def dependencies_for_locking(self) -> list[Dependency]:
for dep in self._poetry_dependencies:
poetry_dependencies_by_name[dep.name].append(dep)

enriched_poetry_dependencies = []
dependencies = []
for dep in self._dependencies:
if dep.name in poetry_dependencies_by_name:
Expand All @@ -59,11 +60,16 @@ def dependencies_for_locking(self) -> list[Dependency]:
marker = dep.marker
enriched = True
dependencies.append(_enrich_dependency(dep, poetry_dep, marker))
enriched_poetry_dependencies.append(poetry_dep)
if not enriched:
dependencies.append(dep)
else:
dependencies.append(dep)

for dep in self._poetry_dependencies:
if dep not in enriched_poetry_dependencies:
dependencies.append(dep)

return dependencies

def is_optional(self) -> bool:
Expand Down
11 changes: 11 additions & 0 deletions tests/packages/test_dependency_group.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,17 @@ def test_remove_dependency_removes_from_both_lists() -> None:
),
],
),
(
[create_dependency("requests", constraint="2.32.3,<3")],
[
create_dependency("numpy", constraint="==2.2.1"),
create_dependency("requests", constraint="2.32.3,<3"),
],
[
create_dependency("requests", constraint="2.32.3,<3"),
create_dependency("numpy", constraint="==2.2.1"),
],
),
],
)
def test_dependencies_for_locking(
Expand Down
Loading