Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 news/13917.bugfix.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Show all errors instead of first error for faulty ``dependency_groups`` definitions.
1 change: 1 addition & 0 deletions news/dependency-groups.vendor.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Use ``packaging`` 26.1's new ``dependency_groups`` module, removing ``dependency-groups`` vendor.
21 changes: 16 additions & 5 deletions src/pip/_internal/req/req_dependency_group.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
from collections.abc import Iterable, Iterator
from typing import Any

from pip._vendor.dependency_groups import DependencyGroupResolver
from pip._vendor.packaging.dependency_groups import DependencyGroupResolver
from pip._vendor.packaging.errors import ExceptionGroup

from pip._internal.exceptions import InstallationError
from pip._internal.utils.compat import tomllib
Expand All @@ -28,11 +29,13 @@ def _resolve_all_groups(
resolver = resolvers[path]
try:
yield from (str(req) for req in resolver.resolve(groupname))
except (ValueError, TypeError, LookupError) as e:
except ExceptionGroup as eg:
# Convert ExceptionGroup to a single InstallationError with all messages
messages = [str(e) for e in eg.exceptions]

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit

Suggested change
messages = [str(e) for e in eg.exceptions]
messages = "; ".join(str(e) for e in eg.exceptions)

raise InstallationError(
f"[dependency-groups] resolution failed for '{groupname}' "
f"from '{path}': {e}"
) from e
f"from '{path}': {'; '.join(messages)}"
) from eg


def _build_resolvers(paths: Iterable[str]) -> dict[str, Any]:
Expand All @@ -54,7 +57,15 @@ def _build_resolvers(paths: Iterable[str]) -> dict[str, Any]:
"Cannot resolve '--group' option."
)

resolvers[path] = DependencyGroupResolver(raw_dependency_groups)
try:
resolvers[path] = DependencyGroupResolver(raw_dependency_groups)
except ExceptionGroup as eg:
# Handle ExceptionGroup from resolver initialization
messages = [str(e) for e in eg.exceptions]
raise InstallationError(
f"[dependency-groups] data was invalid in {path}: {'; '.join(messages)}"
) from eg

return resolvers


Expand Down
9 changes: 0 additions & 9 deletions src/pip/_vendor/dependency_groups/LICENSE.txt

This file was deleted.

13 changes: 0 additions & 13 deletions src/pip/_vendor/dependency_groups/__init__.py

This file was deleted.

65 changes: 0 additions & 65 deletions src/pip/_vendor/dependency_groups/__main__.py

This file was deleted.

209 changes: 0 additions & 209 deletions src/pip/_vendor/dependency_groups/_implementation.py

This file was deleted.

Loading