Skip to content

AI-generated possible solution for #10703 (B) #10925

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
hugnia wants to merge 1 commit into
base: main
Choose a base branch
from
+31 −1
Open

AI-generated possible solution for #10703 (B) #10925

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
32 changes: 31 additions & 1 deletion src/poetry/console/commands/remove.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,12 @@ def handle(self) -> int:
group_sections.append(
(MAIN_GROUP, project_dependencies, poetry_dependencies)
)
# Add optional dependencies (extras) to the group sections
optional_dependencies = project_content.get("optional-dependencies", {})
for extra_name, extra_deps in optional_dependencies.items():
group_sections.append(
(extra_name, extra_deps, {})
)
group_sections.extend(
(
group_name,
Expand Down Expand Up @@ -127,6 +133,19 @@ def handle(self) -> int:
del poetry_content["dev-dependencies"]
else:
removed = set()
# Check if the group is an optional dependency (extra)
optional_dependencies = project_content.get("optional-dependencies", {})
if group in optional_dependencies:
removed.update(
self._remove_packages(
packages=packages,
standard_section=optional_dependencies[group],
poetry_section={},
group_name=group,
)
)
if not optional_dependencies[group]:
del optional_dependencies[group]
if group_content := poetry_groups_content.get(group):
poetry_section = group_content.get("dependencies", {})
removed.update(
Expand All @@ -152,13 +171,24 @@ def handle(self) -> int:
)
if not groups_content[group]:
del groups_content[group]
if group not in groups_content and group not in poetry_groups_content:
if (
group not in groups_content
and group not in poetry_groups_content
and group not in optional_dependencies
):
self._remove_references_to_group(group, content)

if "group" in poetry_content and not poetry_content["group"]:
del poetry_content["group"]
if "dependency-groups" in content and not content["dependency-groups"]:
del content["dependency-groups"]
# Clean up empty optional dependencies
if "optional-dependencies" in project_content:
for extra_name in list(project_content["optional-dependencies"].keys()):
if not project_content["optional-dependencies"][extra_name]:
del project_content["optional-dependencies"][extra_name]
if not project_content["optional-dependencies"]:
del project_content["optional-dependencies"]

not_found = set(packages).difference(removed)
if not_found:
Expand Down
Loading