refactor: set default formats for includes in Factory

Author: finswimmer

src/poetry/core/factory.py

@@ -7,6 +7,7 @@
 from pathlib import Path
 from typing import TYPE_CHECKING
 from typing import Any
+from typing import Literal
 from typing import Union
 
 from packaging.utils import canonicalize_name
@@ -357,6 +358,22 @@ def _configure_package_dependencies(
 
             package.extras = package_extras
 
+    @classmethod
+    def _prepare_formats(
+        cls,
+        items: list[dict[str, Any]],
+        default_formats: list[Literal["sdist", "wheel"]],
+    ) -> list[dict[str, Any]]:
+        result = []
+        for item in items:
+            formats = item.get("format", default_formats)
+            if not isinstance(formats, list):
+                formats = [formats]
+
+            result.append({**item, "format": formats})
+
+        return result
+
     @classmethod
     def _configure_package_poetry_specifics(
         cls, package: ProjectPackage, tool_poetry: dict[str, Any]
@@ -367,24 +384,20 @@ def _configure_package_poetry_specifics(
             package.build_config = build or {}
 
         if includes := tool_poetry.get("include"):
-            package.include = [
+            includes = [
                 include if isinstance(include, dict) else {"path": include}
                 for include in includes
             ]
 
+            package.include = cls._prepare_formats(includes, default_formats=["sdist"])
+
         if exclude := tool_poetry.get("exclude"):
             package.exclude = exclude
 
         if packages := tool_poetry.get("packages"):
-            packages_ = []
-            for p in packages:
-                formats = p.get("format", ["sdist", "wheel"])
-                if not isinstance(formats, list):
-                    formats = [formats]
-
-                packages_.append({**p, "format": formats})
-
-            package.packages = packages_
+            package.packages = cls._prepare_formats(
+                packages, default_formats=["sdist", "wheel"]
+            )
 
     @classmethod
     def create_dependency(

src/poetry/core/masonry/builders/builder.py

@@ -46,23 +46,16 @@ def __init__(self, poetry: Poetry, executable: Path | None = None) -> None:
     def _module(self) -> Module:
         from poetry.core.masonry.utils.module import Module
 
-        packages: list[dict[str, str | dict[str, str]]] = []
-        includes: list[dict[str, str | dict[str, str]]] = []
-        for source_list, target_list, default in [
-            (self._package.packages, packages, ["sdist", "wheel"]),
-            (self._package.include, includes, ["sdist"]),
-        ]:
-            for item in source_list:
-                # Default to including in both sdist & wheel
-                # if the `format` key is not provided.
-                formats = item.get("format", default)
-                if not isinstance(formats, list):
-                    formats = [formats]
-
-                if self.format and self.format not in formats:
-                    continue
-
-                target_list.append({**item, "format": formats})
+        packages = [
+            item
+            for item in self._package.packages
+            if not self.format or self.format in item["format"]
+        ]
+        includes = [
+            item
+            for item in self._package.include
+            if not self.format or self.format in item["format"]
+        ]
 
         return Module(
             self._package.name,

tests/test_factory.py

@@ -376,7 +376,7 @@ def test_create_poetry_with_packages_and_includes() -> None:
 
     assert package.include == [
         {"path": "extra_dir/vcs_excluded.py", "format": ["sdist", "wheel"]},
-        {"path": "notes.txt"},
+        {"path": "notes.txt", "format": ["sdist"]},
     ]