remove redundant logic (use same logic for dependency-groups as for tool.poetry.group)

Author: radoering

src/poetry/core/factory.py

@@ -4,6 +4,7 @@
 
 from collections import defaultdict
 from collections.abc import Mapping
+from itertools import chain
 from pathlib import Path
 from typing import TYPE_CHECKING
 from typing import Any
@@ -13,14 +14,14 @@
 
 from packaging.utils import canonicalize_name
 
+from poetry.core.packages.dependency import Dependency
 from poetry.core.utils.helpers import combine_unicode
 from poetry.core.utils.helpers import readme_content_type
 
 
 if TYPE_CHECKING:
     from packaging.utils import NormalizedName
 
-    from poetry.core.packages.dependency import Dependency
     from poetry.core.packages.dependency_group import DependencyGroup
     from poetry.core.packages.project_package import ProjectPackage
     from poetry.core.poetry import Poetry
@@ -87,7 +88,27 @@ def get_package(cls, name: str, version: str) -> ProjectPackage:
         return ProjectPackage(name, version)
 
     @classmethod
-    def _add_package_group_dependencies(
+    def _add_package_pep735_group_dependencies(
+        cls,
+        package: ProjectPackage,
+        group: DependencyGroup,
+        dependencies: list[str | dict[str, str]],
+    ) -> list[str]:
+        group_includes = []
+        for constraint in dependencies:
+            if isinstance(constraint, str):
+                dep = Dependency.create_from_pep_508(
+                    constraint,
+                    relative_to=package.root_dir,
+                    groups=[group.pretty_name],
+                )
+                group.add_dependency(dep)
+            else:
+                group_includes.append(constraint["include-group"])
+        return group_includes
+
+    @classmethod
+    def _add_package_poetry_group_dependencies(
         cls,
         package: ProjectPackage,
         group: str | DependencyGroup,
@@ -339,48 +360,62 @@ def _configure_package_dependencies(
             package.extras = package_extras
 
         if "dependencies" in tool_poetry:
-            cls._add_package_group_dependencies(
+            cls._add_package_poetry_group_dependencies(
                 package=package,
                 group=MAIN_GROUP,
                 dependencies=tool_poetry["dependencies"],
             )
 
         if with_groups:
-            normalized_groups = cls._normalize_dependency_group_names(dependency_groups)
-            included = cls._resolve_dependency_group_includes(normalized_groups)
-            for group_name, dependencies in normalized_groups.items():
-                poetry_group_config = tool_poetry.get("group", {}).get(group_name, {})
+            tool_poetry_groups = tool_poetry.get("group", {})
+            tool_poetry_groups_normalized = {
+                canonicalize_name(name): config
+                for name, config in tool_poetry_groups.items()
+            }
+            # create groups from the dependency-groups section considering
+            # additional information from the corresponding tool.poetry.group section
+            pep739_include_groups = {}
+            for group_name, dependencies in dependency_groups.items():
+                poetry_group_config = tool_poetry_groups_normalized.get(
+                    canonicalize_name(group_name), {}
+                )
                 group = DependencyGroup(
                     name=group_name,
                     optional=poetry_group_config.get("optional", False),
                 )
                 package.add_dependency_group(group)
-
-                for constraint in dependencies:
-                    dep = Dependency.create_from_pep_508(
-                        constraint,
-                        relative_to=package.root_dir,
-                        groups=[group_name],
-                    )
-                    group.add_dependency(dep)
-
-            for group_name, group_config in tool_poetry.get("group", {}).items():
-                if not package.has_dependency_group(group_name):
+                included_groups = cls._add_package_pep735_group_dependencies(
+                    package=package,
+                    group=group,
+                    dependencies=dependencies,
+                )
+                pep739_include_groups[group_name] = included_groups
+            # create groups from the tool.poetry.group section
+            # with no corresponding entry in dependency-groups
+            # and add dependency information for existing groups
+            poetry_include_groups = {}
+            for group_name, group_config in tool_poetry_groups.items():
+                poetry_include_groups[group_name] = group_config.get(
+                    "include-groups", []
+                )
+                if package.has_dependency_group(group_name):
+                    group = package.dependency_group(group_name)
+                else:
                     group = DependencyGroup(
                         name=group_name,
                         optional=group_config.get("optional", False),
                     )
                     package.add_dependency_group(group)
+                cls._add_package_poetry_group_dependencies(
+                    package=package,
+                    group=group,
+                    dependencies=group_config.get("dependencies", {}),
+                )
 
-                for group_name_ in (group_name, *included.get(group_name, [])):
-                    cls._add_package_group_dependencies(
-                        package=package,
-                        group=group_name_,
-                        dependencies=group_config.get("dependencies", {}),
-                    )
-
-            for group_name, group_config in tool_poetry.get("group", {}).items():
-                if include_groups := group_config.get("include-groups", []):
+            for group_name, include_groups in chain(
+                pep739_include_groups.items(), poetry_include_groups.items()
+            ):
+                if include_groups:
                     current_group = package.dependency_group(group_name)
                     for name in include_groups:
                         try:
@@ -396,7 +431,7 @@ def _configure_package_dependencies(
                         current_group.include_dependency_group(group_to_include)
 
         if with_groups and "dev-dependencies" in tool_poetry:
-            cls._add_package_group_dependencies(
+            cls._add_package_poetry_group_dependencies(
                 package=package,
                 group="dev",
                 dependencies=tool_poetry["dev-dependencies"],
@@ -422,65 +457,6 @@ def _configure_package_dependencies(
 
             package.extras = package_extras
 
-    @classmethod
-    def _normalize_dependency_group_names(
-        cls,
-        dependency_groups: dict[str, list[str | dict[str, str]]],
-    ) -> dict[NormalizedName, list[str | dict[str, str]]]:
-        original_names = defaultdict(list)
-        normalized_groups: dict[NormalizedName, list[str | dict[str, str]]] = {}
-
-        for group_name, value in dependency_groups.items():
-            normed_group_name = canonicalize_name(group_name)
-            original_names[normed_group_name].append(group_name)
-            normalized_groups[normed_group_name] = value
-
-        errors = []
-        for normed_name, names in original_names.items():
-            if len(names) > 1:
-                errors.append(f"{normed_name} ({', '.join(names)})")
-        if errors:
-            raise ValueError(f"Duplicate dependency group names: {', '.join(errors)}")
-
-        return normalized_groups
-
-    @classmethod
-    def _resolve_dependency_group_includes(
-        cls, dependency_groups: dict[NormalizedName, list[str | dict[str, str]]]
-    ) -> dict[NormalizedName, list[NormalizedName]]:
-        resolved_groups: set[NormalizedName] = set()
-        included: dict[NormalizedName, list[NormalizedName]] = defaultdict(list)
-        while resolved_groups != set(dependency_groups):
-            for group, dependencies in dependency_groups.items():
-                if group in resolved_groups:
-                    continue
-                if all(isinstance(dep, str) for dep in dependencies):
-                    resolved_groups.add(group)
-                    continue
-                resolved_dependencies: list[str | dict[str, str]] = []
-                for dep in dependencies:
-                    if isinstance(dep, str):
-                        resolved_dependencies.append(dep)
-                    else:
-                        included_group = canonicalize_name(dep["include-group"])
-                        if included_group in included[group]:
-                            raise ValueError(
-                                f"Cyclic dependency group include:"
-                                f" {group} -> {included_group}"
-                            )
-                        included[included_group].append(group)
-                        try:
-                            resolved_dependencies.extend(
-                                dependency_groups[included_group]
-                            )
-                        except KeyError:
-                            raise ValueError(
-                                f"Dependency group '{included_group}'"
-                                f" (included in '{group}') not found"
-                            )
-                dependency_groups[group] = resolved_dependencies
-        return included
-
     @classmethod
     def _prepare_formats(
         cls,
@@ -726,7 +702,7 @@ def validate(
                 ' Use "poetry.group.dev.dependencies" instead.'
             )
 
-        cls._validate_dependency_groups_includes(toml_data, result)
+        cls._validate_dependency_groups(toml_data, result)
 
         if strict:
             # Validate relation between [project] and [tool.poetry]
@@ -737,19 +713,41 @@ def validate(
         return result
 
     @classmethod
-    def _validate_dependency_groups_includes(
+    def _validate_dependency_groups(
         cls, toml_data: dict[str, Any], result: dict[str, list[str]]
     ) -> None:
-        """Ensure that dependency groups do not include themselves."""
-        config = toml_data.setdefault("tool", {}).setdefault("poetry", {})
-
+        """Ensure that there are no duplicated dependency groups
+        and that they do not include themselves."""
+        original_names = defaultdict(set)
         group_includes: dict[NormalizedName, list[NormalizedName]] = {}
-        for group_name, group_config in config.get("group", {}).items():
+
+        for group_name, dependencies in toml_data.get("dependency-groups", {}).items():
+            normalized_group_name = canonicalize_name(group_name)
+            original_names[normalized_group_name].add(group_name)
+            for constraint in dependencies:
+                if isinstance(constraint, dict) and (
+                    include := constraint.get("include-group")
+                ):
+                    group_includes.setdefault(normalized_group_name, []).append(
+                        canonicalize_name(include)
+                    )
+
+        poetry_config = toml_data.get("tool", {}).get("poetry", {})
+        for group_name, group_config in poetry_config.get("group", {}).items():
+            normalized_group_name = canonicalize_name(group_name)
+            original_names[normalized_group_name].add(group_name)
             if include_groups := group_config.get("include-groups", []):
-                group_includes[canonicalize_name(group_name)] = [
+                group_includes[normalized_group_name] = [
                     canonicalize_name(name) for name in include_groups
                 ]
 
+        for normed_name, names in original_names.items():
+            if len(names) > 1:
+                result["errors"].append(
+                    "Duplicate dependency group name after normalization:"
+                    f" {normed_name} ({', '.join(sorted(names))})"
+                )
+
         for root in group_includes:
             # group, path to group, ancestors
             stack: list[

tests/fixtures/sample_project_with_groups/README.rst

@@ -0,0 +1,2 @@
+My Package
+==========

tests/fixtures/sample_project_with_groups/pyproject.toml

@@ -0,0 +1,92 @@
+[tool.poetry]
+name = "my-package"
+version = "1.2.3"
+description = "Some description."
+authors = [
+    "Sébastien Eustace <sebastien@eustace.io>"
+]
+maintainers = [
+    "Sébastien Eustace <sebastien@eustace.io>"
+]
+license = "MIT"
+
+readme = "README.rst"
+
+homepage = "https://python-poetry.org"
+repository = "https://github.com/python-poetry/poetry"
+documentation = "https://python-poetry.org/docs"
+
+keywords = ["packaging", "dependency", "poetry"]
+
+classifiers = [
+    "Topic :: Software Development :: Build Tools",
+    "Topic :: Software Development :: Libraries :: Python Modules"
+]
+
+# Requirements
+[tool.poetry.dependencies]
+python = ">=3.6"
+cleo = "^0.6"
+pendulum = { git = "https://github.com/sdispater/pendulum.git", branch = "2.0" }
+tomlkit = { git = "https://github.com/sdispater/tomlkit.git", rev = "3bff550", develop = true }
+requests = { version = "^2.18", optional = true, extras = [ "security" ] }
+pathlib2 = { version = "^2.2", python = "~2.7" }
+
+orator = { version = "^0.9", optional = true }
+
+# File dependency
+demo = { path = "../distributions/demo-0.1.0-py2.py3-none-any.whl" }
+
+# Dir dependency with setup.py
+my-package = { path = "../project_with_setup/" }
+
+# Dir dependency with pyproject.toml
+simple-project = { path = "../simple_project/" }
+
+# Dependency with markers
+functools32 = { version = "^3.2.3", markers = "python_version ~= '2.7' and sys_platform == 'win32' or python_version in '3.4 3.5'" }
+
+# Dependency with python constraint
+dataclasses = { version = "^0.7", python = ">=3.6.1,<3.7" }
+
+
+[tool.poetry.group.Test.dependencies]
+pytest = ">7"
+coverage = "*"
+
+[tool.poetry.group.Dev]
+include-groups = [ "tEsT" ]
+
+[tool.poetry.group.Docs]
+optional = true
+
+[tool.poetry.group.Docs.dependencies]
+mkdocs = { git = "git+https://github.com/mkdocs/mkdocs.git", develop = true }
+
+[tool.poetry.group.all]
+include-groups = [ "test", "dev", "docs" ]
+
+
+[tool.poetry.extras]
+db = [ "orator" ]
+network = [ "requests" ]
+
+# Non-regression test for https://github.com/python-poetry/poetry-core/pull/492.
+# The underlying issue occurred because `tomlkit` can either return a TOML table as `Table` instance or an
+# `OutOfOrderProxy` one, if a table is discontinuous and multiple sections of a table are separated by a non-related
+# table, but we were too strict in our type check assertions.
+# So adding `tool.black` here ensure that we have discontinuous tables, so that we don't re-introduce the issue caused
+# by the type check assertion that ended up being reverted.
+[tool.black]
+preview = true
+
+[tool.poetry.group.Dev.dependencies]
+pre-commit = "*"
+
+
+[tool.poetry.scripts]
+my-script = "my_package:main"
+
+
+[tool.poetry.plugins."blogtool.parsers"]
+".rst" = "some_module::SomeClass"

tests/fixtures/sample_project_with_groups_new/pyproject.toml

@@ -69,8 +69,8 @@ all = [
     { "include-group" = "docs" },
 ]
 
-[tool.poetry.group.docs]
+[tool.poetry.group.Docs]
 optional = true
 
-[tool.poetry.group.docs.dependencies]
+[tool.poetry.group.Docs.dependencies]
 mkdocs = { develop = true }