multicz 1.0.0__tar.gz → 1.2.0__tar.gz

{multicz-1.0.0 → multicz-1.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: multicz
-Version: 1.0.0
+Version: 1.2.0
 Summary: Multi-component versioning for monorepos: bump apps, charts, and images independently from conventional commits.
 Keywords: semver,monorepo,helm,conventional-commits,release,versioning
 Author: Chris

{multicz-1.0.0 → multicz-1.2.0}/pyproject.toml

@@ -3,7 +3,7 @@
 
 [project]
 name = "multicz"
-version = "1.0.0"
+version = "1.2.0"
 description = "Multi-component versioning for monorepos: bump apps, charts, and images independently from conventional commits."
 readme = "README.md"
 authors = [

{multicz-1.0.0 → multicz-1.2.0}/src/multicz/changelog/bucket.py

@@ -14,10 +14,10 @@ markers).
 
 from __future__ import annotations
 
-from collections.abc import Iterable, Sequence
+from collections.abc import Iterable, Mapping, Sequence
 from dataclasses import dataclass, field
 
-from ..commits import Commit
+from ..commits import BumpRule, Commit
 from ..config import ChangelogSection, _default_changelog_sections
 
 
@@ -51,6 +51,7 @@ def bucket_commits(
     commits: Iterable[Commit],
     *,
     sections: Sequence[ChangelogSection] | None = None,
+    bump_rules: Mapping[str, BumpRule] | None = None,
     breaking_title: str = "Breaking changes",
     other_title: str = "",
 ) -> BucketedCommits:
@@ -61,6 +62,13 @@ def bucket_commits(
     breaking bucket (breaking commits then fall through to whichever
     section claims their type), ``other_title=""`` drops unmatched
     commits entirely.
+
+    ``bump_rules`` (if passed) bridges the bump configuration with the
+    rendered sections. Any commit type with a non-``"none"`` rule is
+    considered "interesting": if no explicit section claims it, an
+    auto-bucket titled ``type.title()`` is created (e.g. ``docs:`` →
+    ``"Docs"`` section). Auto-buckets render *after* the explicitly
+    declared sections, in alphabetical order for determinism.
     """
     sections = list(sections) if sections is not None else _default_changelog_sections()
     relevant = [c for c in commits if c.is_conventional]
@@ -80,12 +88,31 @@ def bucket_commits(
         if items:
             by_section[section.title] = items
 
+    section_claimed = {t.lower() for s in sections for t in s.types}
+
+    # Auto-buckets for types declared in bump_rules but not claimed by
+    # any explicit section. Sorted for stable output.
+    rule_claimed: set[str] = set()
+    if bump_rules:
+        rule_claimed = {
+            t.lower()
+            for t, kind in bump_rules.items()
+            if kind != "none"
+        }
+        for type_name in sorted(rule_claimed - section_claimed):
+            items = [
+                c for c in relevant
+                if id(c) not in breaking_set and c.type.lower() == type_name
+            ]
+            if items:
+                by_section[type_name.title()] = items
+
     leftovers: list[Commit] = []
     if other_title:
-        claimed = {t.lower() for s in sections for t in s.types}
+        all_claimed = section_claimed | rule_claimed
         leftovers = [
             c for c in relevant
-            if id(c) not in breaking_set and c.type.lower() not in claimed
+            if id(c) not in breaking_set and c.type.lower() not in all_claimed
         ]
 
     return BucketedCommits(
@@ -99,6 +126,7 @@ def filter_commits(
     commits: Iterable[Commit],
     *,
     sections: Sequence[ChangelogSection] | None = None,
+    bump_rules: Mapping[str, BumpRule] | None = None,
     breaking_title: str = "Breaking changes",
     other_title: str = "",
 ) -> list[Commit]:
@@ -108,9 +136,17 @@ def filter_commits(
     list bullets in original commit order). Equivalent to "any commit
     that ``bucket_commits`` would have placed somewhere", expressed as
     a single list.
+
+    Same ``bump_rules`` semantics as :func:`bucket_commits`: a type
+    with a non-``"none"`` rule is kept even when no explicit section
+    claims it.
     """
     sections = list(sections) if sections is not None else _default_changelog_sections()
     section_types = {t.lower() for s in sections for t in s.types}
+    rule_types = {
+        t.lower() for t, kind in (bump_rules or {}).items() if kind != "none"
+    }
+    keep = section_types | rule_types
     keep_breaking = bool(breaking_title)
     keep_leftovers = bool(other_title)
     return [
@@ -118,7 +154,7 @@ def filter_commits(
         if c.is_conventional
         and (
             (keep_breaking and c.breaking)
-            or c.type.lower() in section_types
+            or c.type.lower() in keep
             or keep_leftovers
         )
     ]

{multicz-1.0.0 → multicz-1.2.0}/src/multicz/changelog/debian.py

@@ -27,12 +27,12 @@ configured Debian revision when writing a new stanza.
 from __future__ import annotations
 
 import re
-from collections.abc import Iterable, Sequence
+from collections.abc import Iterable, Mapping, Sequence
 from dataclasses import dataclass
 from datetime import UTC, datetime
 from email.utils import format_datetime
 
-from ..commits import Commit
+from ..commits import BumpRule, Commit
 from ..config import ChangelogSection
 from .bucket import filter_commits
 
@@ -195,6 +195,7 @@ def render_stanza(
     maintainer: str = "Unknown <unknown@example.com>",
     when: datetime | None = None,
     sections: Sequence[ChangelogSection] | None = None,
+    bump_rules: Mapping[str, BumpRule] | None = None,
     breaking_title: str = "Breaking changes",
     other_title: str = "",
 ) -> str:
@@ -222,6 +223,7 @@ def render_stanza(
     filtered = filter_commits(
         commits,
         sections=sections,
+        bump_rules=bump_rules,
         breaking_title=breaking_title,
         other_title=other_title,
     )

{multicz-1.0.0 → multicz-1.2.0}/src/multicz/changelog/markdown.py

@@ -31,12 +31,12 @@ older release section.
 from __future__ import annotations
 
 import re
-from collections.abc import Iterable, Sequence
+from collections.abc import Iterable, Mapping, Sequence
 from dataclasses import dataclass
 from datetime import date
 from pathlib import Path
 
-from ..commits import Commit
+from ..commits import BumpRule, Commit
 from ..config import ChangelogSection, _default_changelog_sections
 from .bucket import bucket_commits
 
@@ -75,6 +75,7 @@ def render_body(
     commits: Iterable[Commit],
     *,
     sections: Sequence[ChangelogSection] | None = None,
+    bump_rules: Mapping[str, BumpRule] | None = None,
     breaking_title: str = "Breaking changes",
     other_title: str = "",
     cascades: Sequence[CascadeEntry] | None = None,
@@ -87,6 +88,11 @@ def render_body(
     commits then fall through to whichever section claims their type).
     Empty string ``other_title`` drops unmatched conventional commits.
 
+    ``bump_rules`` (when passed) ties the rendered sections to the bump
+    configuration: a type with a non-``"none"`` rule is included even
+    if no explicit section claims it (auto-bucketed under
+    ``type.title()``). See :func:`bucket_commits`.
+
     ``cascades`` lists upstream bumps that pulled this component along
     (mirror writes, trigger edges). When present and ``cascade_title``
     is non-empty, they render as a dedicated H3 section; this also
@@ -97,6 +103,7 @@ def render_body(
     bucketed = bucket_commits(
         commits,
         sections=sections,
+        bump_rules=bump_rules,
         breaking_title=breaking_title,
         other_title=other_title,
     )
@@ -173,6 +180,7 @@ def render_section(
     *,
     today: date | None = None,
     sections: Sequence[ChangelogSection] | None = None,
+    bump_rules: Mapping[str, BumpRule] | None = None,
     breaking_title: str = "Breaking changes",
     other_title: str = "",
     cascades: Sequence[CascadeEntry] | None = None,
@@ -184,6 +192,7 @@ def render_section(
     body = render_body(
         commits,
         sections=sections,
+        bump_rules=bump_rules,
         breaking_title=breaking_title,
         other_title=other_title,
         cascades=cascades,
@@ -236,6 +245,7 @@ def update_changelog_file(
     *,
     today: date | None = None,
     sections: Sequence[ChangelogSection] | None = None,
+    bump_rules: Mapping[str, BumpRule] | None = None,
     breaking_title: str = "Breaking changes",
     other_title: str = "",
     drop_prereleases: bool = False,
@@ -254,6 +264,7 @@ def update_changelog_file(
         commits,
         today=today,
         sections=sections,
+        bump_rules=bump_rules,
         breaking_title=breaking_title,
         other_title=other_title,
         cascades=cascades,

{multicz-1.0.0 → multicz-1.2.0}/src/multicz/cli/commands/bump.py

@@ -274,6 +274,7 @@ def bump(
                 new_version,
                 relevant,
                 sections=config.project.changelog_sections,
+                bump_rules=config.bump_rules_for(planned.component),
                 breaking_title=config.project.breaking_section_title,
                 other_title=config.project.other_section_title,
                 drop_prereleases=is_final and strategy == "promote",

{multicz-1.0.0 → multicz-1.2.0}/src/multicz/cli/presenters.py

@@ -449,6 +449,7 @@ def render_release_notes(
         body = render_body(
             list(s.commits),
             sections=config.project.changelog_sections,
+            bump_rules=config.bump_rules_for(s.component),
             breaking_title=config.project.breaking_section_title,
             other_title=config.project.other_section_title,
             cascades=list(s.cascades) if s.cascades else None,
@@ -490,6 +491,7 @@ def render_changelog(
             body = render_body(
                 list(entry.relevant),
                 sections=config.project.changelog_sections,
+                bump_rules=config.bump_rules_for(entry.component),
                 breaking_title=config.project.breaking_section_title,
                 other_title=config.project.other_section_title,
             )

{multicz-1.0.0 → multicz-1.2.0}/src/multicz/config/models.py

@@ -115,6 +115,14 @@ class DebianChangelogWriter(BaseModel):
     maintainer: str | None = None  # falls back to debian/control then git config
     debian_revision: int = 1
     epoch: int | None = None
+    # Debian package name written into each new stanza header. Defaults
+    # to the multicz component name when unset. Override when the
+    # component name (typically short - "api", "worker") differs from
+    # the Debian binary package name (typically prefixed -
+    # "shomer-api"); ``dpkg-source`` errors out otherwise because the
+    # changelog's package name must match ``debian/control``'s
+    # ``Source:`` field.
+    package: str | None = None
 
 
 # Discriminated union of all writer types. Add new writer schemas here

{multicz-1.0.0 → multicz-1.2.0}/src/multicz/writers/debian_changelog.py

@@ -67,13 +67,14 @@ class DebianChangelogImpl:
         )
         maintainer = _resolve_maintainer(ctx.repo, writer.maintainer)
         stanza = render_stanza(
-            package=ctx.component_name,
+            package=writer.package or ctx.component_name,
             version=debian_version,
             distribution=writer.distribution,
             urgency=writer.urgency,
             commits=ctx.relevant_commits,
             maintainer=maintainer,
             sections=config.project.changelog_sections,
+            bump_rules=config.bump_rules_for(ctx.component_name),
             breaking_title=config.project.breaking_section_title,
             other_title=config.project.other_section_title,
         )