micropython-branch-manager 2.0.3__tar.gz → 2.1.0__tar.gz

micropython_branch_manager-2.0.3/.cache/pip/http-v2/d/8/7/1/b/d871bc55adf567ea2c49a2de02d30bfa1a66046fb62fe2b0b5e5e1b3.body → micropython_branch_manager-2.1.0/.cache/pip/http-v2/6/5/f/8/d/65f8dd134ec79390f6fba2e4328eff4d119f25775d7591b491591c4c.body

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: uv
-Version: 0.11.1
+Version: 0.11.23
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers
@@ -37,9 +37,9 @@ Project-URL: Repository, https://github.com/astral-sh/uv
 # uv
 
 [![uv](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/uv/main/assets/badge/v0.json)](https://github.com/astral-sh/uv)
-[![image](https://img.shields.io/pypi/v/uv/0.11.1.svg)](https://pypi.python.org/pypi/uv)
-[![image](https://img.shields.io/pypi/l/uv/0.11.1.svg)](https://pypi.python.org/pypi/uv)
-[![image](https://img.shields.io/pypi/pyversions/uv/0.11.1.svg)](https://pypi.python.org/pypi/uv)
+[![image](https://img.shields.io/pypi/v/uv/0.11.23.svg)](https://pypi.python.org/pypi/uv)
+[![image](https://img.shields.io/pypi/l/uv/0.11.23.svg)](https://pypi.python.org/pypi/uv)
+[![image](https://img.shields.io/pypi/pyversions/uv/0.11.23.svg)](https://pypi.python.org/pypi/uv)
 [![Actions status](https://github.com/astral-sh/uv/actions/workflows/ci.yml/badge.svg)](https://github.com/astral-sh/uv/actions)
 [![Discord](https://img.shields.io/badge/Discord-%235865F2.svg?logo=discord&logoColor=white)](https://discord.gg/astral-sh)
 
@@ -58,13 +58,13 @@ An extremely fast Python package and project manager, written in Rust.
 - A single tool to replace `pip`, `pip-tools`, `pipx`, `poetry`, `pyenv`, `twine`, `virtualenv`, and
   more.
 - [10-100x faster](https://github.com/astral-sh/uv/blob/main/BENCHMARKS.md) than `pip`.
-- Provides [comprehensive project management](https://github.com/astral-sh/uv/blob/0.11.1/README.md#projects), with a
+- Provides [comprehensive project management](https://github.com/astral-sh/uv/blob/0.11.23/README.md#projects), with a
   [universal lockfile](https://docs.astral.sh/uv/concepts/projects/layout#the-lockfile).
-- [Runs scripts](https://github.com/astral-sh/uv/blob/0.11.1/README.md#scripts), with support for
+- [Runs scripts](https://github.com/astral-sh/uv/blob/0.11.23/README.md#scripts), with support for
   [inline dependency metadata](https://docs.astral.sh/uv/guides/scripts#declaring-script-dependencies).
-- [Installs and manages](https://github.com/astral-sh/uv/blob/0.11.1/README.md#python-versions) Python versions.
-- [Runs and installs](https://github.com/astral-sh/uv/blob/0.11.1/README.md#tools) tools published as Python packages.
-- Includes a [pip-compatible interface](https://github.com/astral-sh/uv/blob/0.11.1/README.md#the-pip-interface) for a performance boost with a familiar
+- [Installs and manages](https://github.com/astral-sh/uv/blob/0.11.23/README.md#python-versions) Python versions.
+- [Runs and installs](https://github.com/astral-sh/uv/blob/0.11.23/README.md#tools) tools published as Python packages.
+- Includes a [pip-compatible interface](https://github.com/astral-sh/uv/blob/0.11.23/README.md#the-pip-interface) for a performance boost with a familiar
   CLI.
 - Supports Cargo-style [workspaces](https://docs.astral.sh/uv/concepts/projects/workspaces) for
   scalable projects.
@@ -315,7 +315,7 @@ It's pronounced as "you - vee" ([`/juː viː/`](https://en.wikipedia.org/wiki/He
 
 #### How should I stylize uv?
 
-Just "uv", please. See the [style guide](https://github.com/astral-sh/uv/blob/0.11.1/STYLE.md#styling-uv) for details.
+Just "uv", please. See the [style guide](https://github.com/astral-sh/uv/blob/0.11.23/STYLE.md#styling-uv) for details.
 
 #### What platforms does uv support?
 
@@ -344,9 +344,9 @@ for Windows support.
 
 uv is licensed under either of
 
-- Apache License, Version 2.0, ([LICENSE-APACHE](https://github.com/astral-sh/uv/blob/0.11.1/LICENSE-APACHE) or
+- Apache License, Version 2.0, ([LICENSE-APACHE](https://github.com/astral-sh/uv/blob/0.11.23/LICENSE-APACHE) or
   <https://www.apache.org/licenses/LICENSE-2.0>)
-- MIT license ([LICENSE-MIT](https://github.com/astral-sh/uv/blob/0.11.1/LICENSE-MIT) or <https://opensource.org/licenses/MIT>)
+- MIT license ([LICENSE-MIT](https://github.com/astral-sh/uv/blob/0.11.23/LICENSE-MIT) or <https://opensource.org/licenses/MIT>)
 
 at your option.
 

micropython_branch_manager-2.1.0/.cache/pip/http-v2/e/1/0/a/2/e10a2bbfb31a7de3b9b7a66daabe582666ce7da5b088fe0ee85cdd9b.body

@@ -0,0 +1,362 @@
+Metadata-Version: 2.4
+Name: uv
+Version: 0.11.24
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Console
+Classifier: Intended Audience :: Developers
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3.15
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Rust
+Classifier: Topic :: Software Development :: Quality Assurance
+Classifier: Topic :: Software Development :: Testing
+Classifier: Topic :: Software Development :: Libraries
+License-File: LICENSE-APACHE
+License-File: LICENSE-MIT
+Summary: An extremely fast Python package and project manager, written in Rust.
+Keywords: uv,requirements,packaging
+Home-Page: https://pypi.org/project/uv/
+Author-email: "Astral Software Inc." <hey@astral.sh>
+License-Expression: MIT OR Apache-2.0
+Requires-Python: >=3.8
+Description-Content-Type: text/markdown; charset=UTF-8; variant=GFM
+Project-URL: Changelog, https://github.com/astral-sh/uv/blob/main/CHANGELOG.md
+Project-URL: Discord, https://discord.gg/astral-sh
+Project-URL: Documentation, https://docs.astral.sh/uv
+Project-URL: Releases, https://github.com/astral-sh/uv/releases
+Project-URL: Repository, https://github.com/astral-sh/uv
+
+# uv
+
+[![uv](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/uv/main/assets/badge/v0.json)](https://github.com/astral-sh/uv)
+[![image](https://img.shields.io/pypi/v/uv/0.11.24.svg)](https://pypi.python.org/pypi/uv)
+[![image](https://img.shields.io/pypi/l/uv/0.11.24.svg)](https://pypi.python.org/pypi/uv)
+[![image](https://img.shields.io/pypi/pyversions/uv/0.11.24.svg)](https://pypi.python.org/pypi/uv)
+[![Actions status](https://github.com/astral-sh/uv/actions/workflows/ci.yml/badge.svg)](https://github.com/astral-sh/uv/actions)
+[![Discord](https://img.shields.io/badge/Discord-%235865F2.svg?logo=discord&logoColor=white)](https://discord.gg/astral-sh)
+
+An extremely fast Python package and project manager, written in Rust.
+
+<p align="center">
+  <img alt="Shows a bar chart with benchmark results." src="https://github.com/astral-sh/uv/assets/1309177/629e59c0-9c6e-4013-9ad4-adb2bcf5080d">
+</p>
+
+<p align="center">
+  <i>Installing <a href="https://trio.readthedocs.io/">Trio</a>'s dependencies with a warm cache.</i>
+</p>
+
+## Highlights
+
+- A single tool to replace `pip`, `pip-tools`, `pipx`, `poetry`, `pyenv`, `twine`, `virtualenv`, and
+  more.
+- [10-100x faster](https://github.com/astral-sh/uv/blob/main/BENCHMARKS.md) than `pip`.
+- Provides [comprehensive project management](https://github.com/astral-sh/uv/blob/0.11.24/README.md#projects), with a
+  [universal lockfile](https://docs.astral.sh/uv/concepts/projects/layout#the-lockfile).
+- [Runs scripts](https://github.com/astral-sh/uv/blob/0.11.24/README.md#scripts), with support for
+  [inline dependency metadata](https://docs.astral.sh/uv/guides/scripts#declaring-script-dependencies).
+- [Installs and manages](https://github.com/astral-sh/uv/blob/0.11.24/README.md#python-versions) Python versions.
+- [Runs and installs](https://github.com/astral-sh/uv/blob/0.11.24/README.md#tools) tools published as Python packages.
+- Includes a [pip-compatible interface](https://github.com/astral-sh/uv/blob/0.11.24/README.md#the-pip-interface) for a performance boost with a familiar
+  CLI.
+- Supports Cargo-style [workspaces](https://docs.astral.sh/uv/concepts/projects/workspaces) for
+  scalable projects.
+- Disk-space efficient, with a [global cache](https://docs.astral.sh/uv/concepts/cache) for
+  dependency deduplication.
+- Installable without Rust or Python via `curl` or `pip`.
+- Supports macOS, Linux, and Windows.
+
+uv is backed by [Astral](https://astral.sh), the creators of
+[Ruff](https://github.com/astral-sh/ruff) and [ty](https://github.com/astral-sh/ty).
+
+## Installation
+
+Install uv with our standalone installers:
+
+```bash
+# On macOS and Linux.
+curl -LsSf https://astral.sh/uv/install.sh | sh
+```
+
+```bash
+# On Windows.
+powershell -ExecutionPolicy ByPass -c "irm https://astral.sh/uv/install.ps1 | iex"
+```
+
+Or, from [PyPI](https://pypi.org/project/uv/):
+
+```bash
+# With pip.
+pip install uv
+```
+
+```bash
+# Or pipx.
+pipx install uv
+```
+
+If installed via the standalone installer, uv can update itself to the latest version:
+
+```bash
+uv self update
+```
+
+See the [installation documentation](https://docs.astral.sh/uv/getting-started/installation/) for
+details and alternative installation methods.
+
+## Documentation
+
+uv's documentation is available at [docs.astral.sh/uv](https://docs.astral.sh/uv).
+
+Additionally, the command line reference documentation can be viewed with `uv help`.
+
+## Features
+
+### Projects
+
+uv manages project dependencies and environments, with support for lockfiles, workspaces, and more,
+similar to `rye` or `poetry`:
+
+```console
+$ uv init example
+Initialized project `example` at `/home/user/example`
+
+$ cd example
+
+$ uv add ruff
+Creating virtual environment at: .venv
+Resolved 2 packages in 170ms
+   Built example @ file:///home/user/example
+Prepared 2 packages in 627ms
+Installed 2 packages in 1ms
+ + example==0.1.0 (from file:///home/user/example)
+ + ruff==0.5.0
+
+$ uv run ruff check
+All checks passed!
+
+$ uv lock
+Resolved 2 packages in 0.33ms
+
+$ uv sync
+Resolved 2 packages in 0.70ms
+Checked 1 package in 0.02ms
+```
+
+See the [project documentation](https://docs.astral.sh/uv/guides/projects/) to get started.
+
+uv also supports building and publishing projects, even if they're not managed with uv. See the
+[publish guide](https://docs.astral.sh/uv/guides/publish/) to learn more.
+
+### Scripts
+
+uv manages dependencies and environments for single-file scripts.
+
+Create a new script and add inline metadata declaring its dependencies:
+
+```console
+$ echo 'import requests; print(requests.get("https://astral.sh"))' > example.py
+
+$ uv add --script example.py requests
+Updated `example.py`
+```
+
+Then, run the script in an isolated virtual environment:
+
+```console
+$ uv run example.py
+Reading inline script metadata from: example.py
+Installed 5 packages in 12ms
+<Response [200]>
+```
+
+See the [scripts documentation](https://docs.astral.sh/uv/guides/scripts/) to get started.
+
+### Tools
+
+uv executes and installs command-line tools provided by Python packages, similar to `pipx`.
+
+Run a tool in an ephemeral environment using `uvx` (an alias for `uv tool run`):
+
+```console
+$ uvx pycowsay 'hello world!'
+Resolved 1 package in 167ms
+Installed 1 package in 9ms
+ + pycowsay==0.0.0.2
+  """
+
+  ------------
+< hello world! >
+  ------------
+   \   ^__^
+    \  (oo)\_______
+       (__)\       )\/\
+           ||----w |
+           ||     ||
+```
+
+Install a tool with `uv tool install`:
+
+```console
+$ uv tool install ruff
+Resolved 1 package in 6ms
+Installed 1 package in 2ms
+ + ruff==0.5.0
+Installed 1 executable: ruff
+
+$ ruff --version
+ruff 0.5.0
+```
+
+See the [tools documentation](https://docs.astral.sh/uv/guides/tools/) to get started.
+
+### Python versions
+
+uv installs Python and allows quickly switching between versions.
+
+Install multiple Python versions:
+
+```console
+$ uv python install 3.12 3.13 3.14
+Installed 3 versions in 972ms
+ + cpython-3.12.12-macos-aarch64-none (python3.12)
+ + cpython-3.13.9-macos-aarch64-none (python3.13)
+ + cpython-3.14.0-macos-aarch64-none (python3.14)
+
+```
+
+Download Python versions as needed:
+
+```console
+$ uv venv --python 3.12.0
+Using Python 3.12.0
+Creating virtual environment at: .venv
+Activate with: source .venv/bin/activate
+
+$ uv run --python pypy@3.8 -- python --version
+Python 3.8.16 (a9dbdca6fc3286b0addd2240f11d97d8e8de187a, Dec 29 2022, 11:45:30)
+[PyPy 7.3.11 with GCC Apple LLVM 13.1.6 (clang-1316.0.21.2.5)] on darwin
+Type "help", "copyright", "credits" or "license" for more information.
+>>>>
+```
+
+Use a specific Python version in the current directory:
+
+```console
+$ uv python pin 3.11
+Pinned `.python-version` to `3.11`
+```
+
+See the [Python installation documentation](https://docs.astral.sh/uv/guides/install-python/) to get
+started.
+
+### The pip interface
+
+uv provides a drop-in replacement for common `pip`, `pip-tools`, and `virtualenv` commands.
+
+uv extends their interfaces with advanced features, such as dependency version overrides,
+platform-independent resolutions, reproducible resolutions, alternative resolution strategies, and
+more.
+
+Migrate to uv without changing your existing workflows — and experience a 10-100x speedup — with the
+`uv pip` interface.
+
+Compile requirements into a platform-independent requirements file:
+
+```console
+$ uv pip compile requirements.in \
+   --universal \
+   --output-file requirements.txt
+Resolved 43 packages in 12ms
+```
+
+Create a virtual environment:
+
+```console
+$ uv venv
+Using Python 3.12.3
+Creating virtual environment at: .venv
+Activate with: source .venv/bin/activate
+```
+
+Install the locked requirements:
+
+```console
+$ uv pip sync requirements.txt
+Resolved 43 packages in 11ms
+Installed 43 packages in 208ms
+ + babel==2.15.0
+ + black==24.4.2
+ + certifi==2024.7.4
+ ...
+```
+
+See the [pip interface documentation](https://docs.astral.sh/uv/pip/index/) to get started.
+
+## Contributing
+
+We are passionate about supporting contributors of all levels of experience and would love to see
+you get involved in the project. See the
+[contributing guide](https://github.com/astral-sh/uv?tab=contributing-ov-file#contributing) to get
+started.
+
+## FAQ
+
+#### How do you pronounce uv?
+
+It's pronounced as "you - vee" ([`/juː viː/`](https://en.wikipedia.org/wiki/Help:IPA/English#Key))
+
+#### How should I stylize uv?
+
+Just "uv", please. See the [style guide](https://github.com/astral-sh/uv/blob/0.11.24/STYLE.md#styling-uv) for details.
+
+#### What platforms does uv support?
+
+See uv's [platform support](https://docs.astral.sh/uv/reference/platforms/) document.
+
+#### Is uv ready for production?
+
+Yes, uv is stable and widely used in production. See uv's
+[versioning policy](https://docs.astral.sh/uv/reference/versioning/) document for details.
+
+## Acknowledgements
+
+uv's dependency resolver uses [PubGrub](https://github.com/pubgrub-rs/pubgrub) under the hood. We're
+grateful to the PubGrub maintainers, especially [Jacob Finkelman](https://github.com/Eh2406), for
+their support.
+
+uv's Git implementation is based on [Cargo](https://github.com/rust-lang/cargo).
+
+Some of uv's optimizations are inspired by the great work we've seen in [pnpm](https://pnpm.io/),
+[Orogene](https://github.com/orogene/orogene), and [Bun](https://github.com/oven-sh/bun). We've also
+learned a lot from Nathaniel J. Smith's [Posy](https://github.com/njsmith/posy) and adapted its
+[trampoline](https://github.com/njsmith/posy/tree/main/src/trampolines/windows-trampolines/posy-trampoline)
+for Windows support.
+
+## License
+
+uv is licensed under either of
+
+- Apache License, Version 2.0, ([LICENSE-APACHE](https://github.com/astral-sh/uv/blob/0.11.24/LICENSE-APACHE) or
+  <https://www.apache.org/licenses/LICENSE-2.0>)
+- MIT license ([LICENSE-MIT](https://github.com/astral-sh/uv/blob/0.11.24/LICENSE-MIT) or <https://opensource.org/licenses/MIT>)
+
+at your option.
+
+Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in uv
+by you, as defined in the Apache-2.0 license, shall be dually licensed as above, without any
+additional terms or conditions.
+
+<div align="center">
+  <a target="_blank" href="https://astral.sh" style="background:none">
+    <img src="https://raw.githubusercontent.com/astral-sh/uv/main/assets/svg/Astral.svg" alt="Made by Astral">
+  </a>
+</div>
+

micropython_branch_manager-2.1.0/.cache/pip/selfcheck/fe300af6f7d708c14827daac3afc81fbb8306b73de8dd6e3f1f8ea3b

@@ -0,0 +1 @@
+{"key":"/usr/local","last_check":"2026-06-23T19:34:36.579623+00:00","pypi_version":"26.1.2"}

{micropython_branch_manager-2.0.3 → micropython_branch_manager-2.1.0}/PKG-INFO

@@ -1,7 +1,11 @@
 Metadata-Version: 2.4
 Name: micropython-branch-manager
-Version: 2.0.3
+Version: 2.1.0
 Summary: Tool for managing MicroPython fork integration branches
+Project-URL: Homepage, https://gitlab.com/alelec/micropython-branch-manager
+Project-URL: Repository, https://gitlab.com/alelec/micropython-branch-manager.git
+Project-URL: Issues, https://gitlab.com/alelec/micropython-branch-manager/-/issues
+Author-email: Andrew Leech <andrew@alelec.net>
 License-Expression: MIT
 License-File: LICENSE
 Requires-Python: >=3.11

{micropython_branch_manager-2.0.3 → micropython_branch_manager-2.1.0}/pyproject.toml

@@ -2,6 +2,7 @@
 name = "micropython-branch-manager"
 dynamic = ["version"]
 description = "Tool for managing MicroPython fork integration branches"
+authors = [{ name = "Andrew Leech", email = "andrew@alelec.net" }]
 readme = "README.md"
 license = "MIT"
 requires-python = ">=3.11"
@@ -11,6 +12,11 @@ dependencies = [
     "tomli-w>=1.0",
 ]
 
+[project.urls]
+Homepage = "https://gitlab.com/alelec/micropython-branch-manager"
+Repository = "https://gitlab.com/alelec/micropython-branch-manager.git"
+Issues = "https://gitlab.com/alelec/micropython-branch-manager/-/issues"
+
 [project.scripts]
 micropython-branch-manager = "micropython_branch_manager.cli:main"
 mbm = "micropython_branch_manager.cli:main"

{micropython_branch_manager-2.0.3 → micropython_branch_manager-2.1.0}/src/micropython_branch_manager/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '2.0.3'
-__version_tuple__ = version_tuple = (2, 0, 3)
+__version__ = version = '2.1.0'
+__version_tuple__ = version_tuple = (2, 1, 0)
 
 __commit_id__ = commit_id = None

{micropython_branch_manager-2.0.3 → micropython_branch_manager-2.1.0}/src/micropython_branch_manager/git.py

@@ -136,8 +136,8 @@ class GitRepo:
                 continue
         return False
 
-    def merge(self, branch: str, message: str, no_ff: bool = True) -> None:
-        """Merge branch with optional no-ff.
+    def merge(self, branch: str, message: str, no_ff: bool = True, signoff: bool = False) -> None:
+        """Merge branch with optional no-ff and Signed-off-by trailer.
 
         Raises:
             MergeConflictError: If conflicts require manual resolution
@@ -145,6 +145,8 @@ class GitRepo:
         args = ["merge"]
         if no_ff:
             args.append("--no-ff")
+        if signoff:
+            args.append("--signoff")
         args.extend([branch, "-m", message])
 
         try:

{micropython_branch_manager-2.0.3 → micropython_branch_manager-2.1.0}/src/micropython_branch_manager/pr.py

@@ -89,13 +89,14 @@ class PRManager:
         # Merge into update branch with trailers
         merge_msg = format_merge_message(
             branch_name=pr_info.branch,
+            integration=update_branch,
             title=pr_info.title,
             pr_number=pr_info.number,
             pr_url=pr_info.url,
             author=pr_info.author,
         )
         print(f"Merging {pr_info.branch} into {update_branch}...")
-        self.git.merge(pr_info.branch, merge_msg)
+        self.git.merge(pr_info.branch, merge_msg, signoff=True)
         print("Merge completed successfully")
 
         # Push update branch to GitLab

{micropython_branch_manager-2.0.3 → micropython_branch_manager-2.1.0}/src/micropython_branch_manager/rebase.py

@@ -144,11 +144,12 @@ class RebaseManager:
         self.git.checkout(update_branch)
         merge_msg = format_merge_message(
             branch_name=branch.name,
+            integration=update_branch,
             title=branch.title,
             pr_number=branch.pr_number,
             pr_url=branch.pr_url,
         )
-        self.git.merge(rebase_branch, merge_msg, no_ff=True)
+        self.git.merge(rebase_branch, merge_msg, no_ff=True, signoff=True)
 
         # Update feature branch ref
         self.git.run("branch", "-f", branch.name, rebase_branch)

{micropython_branch_manager-2.0.3 → micropython_branch_manager-2.1.0}/src/micropython_branch_manager/rerere.py

@@ -6,7 +6,7 @@ from pathlib import Path
 from .config import BranchConfig
 from .exceptions import GitError
 from .git import GitRepo
-from .trailers import MERGE_PATTERN
+from .trailers import MERGE_PATTERN, format_merge_message
 
 
 class RerereTrainer:
@@ -40,7 +40,7 @@ class RerereTrainer:
         worktree_path = Path(tempfile.mkdtemp(prefix="mbm-rerere-"))
         try:
             wt_git = self.git.create_worktree(worktree_path, target)
-            self._replay_merges(wt_git, pairs)
+            self._replay_merges(wt_git, pairs, integration_branch)
         finally:
             self.git.remove_worktree(worktree_path, force=True)
             # Clean up if directory still exists
@@ -87,6 +87,7 @@ class RerereTrainer:
         self,
         wt_git: GitRepo,
         pairs: list[tuple[BranchConfig, str]],
+        integration: str = "integration",
     ) -> None:
         """Replay merges in the worktree, resolving conflicts from the integration branch."""
         for branch, merge_hash in pairs:
@@ -101,9 +102,16 @@ class RerereTrainer:
                 wt_git.run(
                     "merge",
                     "--no-ff",
+                    "--signoff",
                     branch.name,
                     "-m",
-                    f"Merge branch '{branch.name}'",
+                    format_merge_message(
+                        branch.name,
+                        integration=integration,
+                        title=branch.title,
+                        pr_number=branch.pr_number,
+                        pr_url=branch.pr_url,
+                    ),
                 )
             except GitError:
                 # Conflict — resolve using the known-good merge commit

{micropython_branch_manager-2.0.3 → micropython_branch_manager-2.1.0}/src/micropython_branch_manager/trailers.py

@@ -4,6 +4,7 @@ from __future__ import annotations
 
 import contextlib
 import re
+import textwrap
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
@@ -17,19 +18,40 @@ TRAILER_AUTHOR = "MBM-Author"
 MERGE_PATTERN = re.compile(r"Merge branch '([^']+)'")
 
 
+def _merge_component(integration: str) -> str:
+    """Derive a subject-line component from the integration branch name.
+
+    Strips mbm's working-branch suffix so the component reads as the final
+    integration branch (e.g. "tessera_update" -> "tessera").
+    """
+    for suffix in ("_update", "_tmp"):
+        if integration.endswith(suffix):
+            return integration[: -len(suffix)]
+    return integration
+
+
 def format_merge_message(
     branch_name: str,
+    integration: str = "integration",
     title: str | None = None,
     pr_number: int | None = None,
     pr_url: str | None = None,
     author: str | None = None,
 ) -> str:
-    """Build merge commit message with MBM trailers."""
-    lines = [f"Merge branch '{branch_name}'"]
+    """Build a MicroPython verifygitlog-compatible merge commit message.
+
+    The subject is "<integration>: Merge branch '<branch>'." so it satisfies
+    verifygitlog's subject rules (component prefix, capitalised first word, ends
+    with a period) while keeping the "Merge branch '<name>'" substring that
+    MERGE_PATTERN parses back. The optional PR title is wrapped to <=75 columns
+    for the body-line-length rule. The Signed-off-by trailer is added by the
+    caller via `git merge --signoff` (it uses the committer identity).
+    """
+    lines = [f"{_merge_component(integration)}: Merge branch '{branch_name}'."]
 
     if title:
         lines.append("")
-        lines.append(title)
+        lines.append(textwrap.fill(title, width=75))
 
     # Add trailers
     trailers = []
@@ -93,22 +115,25 @@ def extract_branches_with_metadata(
             continue
         seen.add(branch_name)
 
-        # Extract title (second paragraph, before trailers)
+        # Extract title (second paragraph, before trailers). The title may be
+        # wrapped across several lines (format_merge_message wraps to 75 cols),
+        # so collect the whole paragraph and rejoin it.
         title = None
         body_lines = body.split("\n")
         if len(body_lines) > 2 and body_lines[1] == "":
-            # Find the title — first non-empty line after the blank line
+            title_parts = []
             for line in body_lines[2:]:
                 stripped = line.strip()
                 if not stripped:
                     break
-                # Skip trailer lines
-                if any(
+                # Stop at the trailer block (MBM-* or the Signed-off-by line).
+                if stripped.startswith("Signed-off-by: ") or any(
                     stripped.startswith(f"{k}: ") for k in (TRAILER_PR, TRAILER_URL, TRAILER_AUTHOR)
                 ):
                     break
-                title = stripped
-                break
+                title_parts.append(stripped)
+            if title_parts:
+                title = " ".join(title_parts)
 
         # Parse trailers
         trailers = parse_trailers_from_message(body)

micropython_branch_manager-2.1.0/tests/test_trailers.py

@@ -0,0 +1,191 @@
+"""Tests for git trailer support."""
+
+from micropython_branch_manager.git import GitRepo
+from micropython_branch_manager.trailers import (
+    TRAILER_AUTHOR,
+    TRAILER_PR,
+    TRAILER_URL,
+    extract_branches_with_metadata,
+    format_merge_message,
+    parse_trailers_from_message,
+)
+
+
+def _init_repo(tmp_path):
+    """Init a real git repo with a base commit on an 'upstream' branch."""
+    git = GitRepo(tmp_path)
+    git.run("init", "-q")
+    git.run("config", "user.name", "Tester")
+    git.run("config", "user.email", "tester@example.com")
+    git.run("config", "commit.gpgsign", "false")
+    (tmp_path / "base.txt").write_text("base\n")
+    git.run("add", "-A")
+    git.run("commit", "-q", "-m", "base: Initial commit.")
+    git.run("branch", "-M", "upstream")
+    return git
+
+
+def _add_feature(git, tmp_path, branch):
+    """Create a feature branch off upstream with one commit."""
+    git.run("checkout", "-q", "-b", branch, "upstream")
+    (tmp_path / f"{branch}.txt").write_text(f"{branch}\n")
+    git.run("add", "-A")
+    git.run("commit", "-q", "-m", f"feat: Add {branch}.")
+
+
+def test_format_merge_message_minimal():
+    """format_merge_message with just branch name uses the default component."""
+    msg = format_merge_message(branch_name="feature-x")
+    assert msg == "integration: Merge branch 'feature-x'."
+
+
+def test_format_merge_message_component_from_integration():
+    """The subject component is derived from the integration branch name."""
+    msg = format_merge_message(branch_name="feature-x", integration="tessera")
+    assert msg == "tessera: Merge branch 'feature-x'."
+
+
+def test_format_merge_message_strips_update_suffix():
+    """An _update/_tmp working-branch suffix is stripped from the component."""
+    assert format_merge_message("feature-x", integration="tessera_update").startswith(
+        "tessera: Merge branch 'feature-x'."
+    )
+    assert format_merge_message("feature-x", integration="tessera_tmp").startswith(
+        "tessera: Merge branch 'feature-x'."
+    )
+
+
+def test_format_merge_message_with_title():
+    """format_merge_message includes title and preserves the parseable substring."""
+    msg = format_merge_message(branch_name="feature-x", title="Add feature X")
+    assert "Merge branch 'feature-x'" in msg
+    assert "Add feature X" in msg
+
+
+def test_format_merge_message_wraps_long_title():
+    """A long title is wrapped to <=75 columns for verifygitlog body-line rule."""
+    long_title = "Add feature X " * 12
+    msg = format_merge_message(branch_name="feature-x", title=long_title.strip())
+    body_lines = msg.split("\n")
+    assert len(body_lines) > 3  # title spans multiple lines
+    assert all(len(line) <= 75 for line in body_lines)
+
+
+def test_format_merge_message_full():
+    """format_merge_message with all fields."""
+    msg = format_merge_message(
+        branch_name="feature-x",
+        integration="tessera",
+        title="Add feature X",
+        pr_number=12345,
+        pr_url="https://github.com/micropython/micropython/pull/12345",
+        author="testuser",
+    )
+
+    lines = msg.split("\n")
+    assert lines[0] == "tessera: Merge branch 'feature-x'."
+    assert "Add feature X" in msg
+    assert f"{TRAILER_PR}: 12345" in msg
+    assert f"{TRAILER_URL}: https://github.com/micropython/micropython/pull/12345" in msg
+    assert f"{TRAILER_AUTHOR}: testuser" in msg
+
+
+def test_format_merge_message_no_title_with_trailers():
+    """format_merge_message with trailers but no title."""
+    msg = format_merge_message(
+        branch_name="feature-x",
+        pr_number=123,
+    )
+    assert "Merge branch 'feature-x'" in msg
+    assert f"{TRAILER_PR}: 123" in msg
+
+
+def test_parse_trailers_from_message():
+    """parse_trailers_from_message extracts MBM trailers."""
+    msg = (
+        "Merge branch 'feature-x'\n"
+        "\n"
+        "Add feature X\n"
+        "\n"
+        "MBM-PR: 12345\n"
+        "MBM-URL: https://github.com/micropython/micropython/pull/12345\n"
+        "MBM-Author: testuser\n"
+    )
+
+    trailers = parse_trailers_from_message(msg)
+
+    assert trailers[TRAILER_PR] == "12345"
+    assert trailers[TRAILER_URL] == "https://github.com/micropython/micropython/pull/12345"
+    assert trailers[TRAILER_AUTHOR] == "testuser"
+
+
+def test_parse_trailers_from_message_no_trailers():
+    """parse_trailers_from_message returns empty dict if no trailers."""
+    msg = "Merge branch 'feature-x'\n\nAdd feature X\n"
+    trailers = parse_trailers_from_message(msg)
+    assert trailers == {}
+
+
+def test_parse_trailers_from_message_partial():
+    """parse_trailers_from_message handles partial trailers."""
+    msg = "Merge branch 'feature-x'\n\nMBM-PR: 42\n"
+    trailers = parse_trailers_from_message(msg)
+    assert trailers[TRAILER_PR] == "42"
+    assert TRAILER_URL not in trailers
+    assert TRAILER_AUTHOR not in trailers
+
+
+def test_extract_metadata_roundtrip_wrapped_title(tmp_path):
+    """A real --signoff merge written by format_merge_message round-trips.
+
+    Exercises the full write->read cycle against real git: the wrapped,
+    multi-line title is rejoined and the trailers are recovered, while the
+    subject carries the verifygitlog component prefix and a Signed-off-by line.
+    """
+    git = _init_repo(tmp_path)
+    _add_feature(git, tmp_path, "feature-x")
+    git.run("checkout", "-q", "-b", "tessera_update", "upstream")
+
+    long_title = (
+        "Add a deliberately long feature description that exceeds the "
+        "seventy-five column wrap width so the title spans several lines"
+    )
+    merge_msg = format_merge_message(
+        branch_name="feature-x",
+        integration="tessera_update",
+        title=long_title,
+        pr_number=12345,
+        pr_url="https://github.com/micropython/micropython/pull/12345",
+    )
+    git.merge("feature-x", merge_msg, no_ff=True, signoff=True)
+
+    # The written subject is verifygitlog-shaped and signed off.
+    assert git.run("log", "-1", "--format=%s", "tessera_update") == (
+        "tessera: Merge branch 'feature-x'."
+    )
+    assert "Signed-off-by: Tester <tester@example.com>" in git.run(
+        "log", "-1", "--format=%B", "tessera_update"
+    )
+
+    branches = extract_branches_with_metadata(git, "upstream", "tessera_update")
+    assert len(branches) == 1
+    b = branches[0]
+    assert b.name == "feature-x"
+    assert b.title == long_title  # wrapped lines rejoined
+    assert b.pr_number == 12345
+    assert b.pr_url == "https://github.com/micropython/micropython/pull/12345"
+
+
+def test_extract_metadata_signoff_not_treated_as_title(tmp_path):
+    """A Signed-off-by line on a title-less merge is not parsed as the title."""
+    git = _init_repo(tmp_path)
+    _add_feature(git, tmp_path, "feature-y")
+    git.run("checkout", "-q", "-b", "tessera_update", "upstream")
+
+    merge_msg = format_merge_message(branch_name="feature-y", integration="tessera_update")
+    git.merge("feature-y", merge_msg, no_ff=True, signoff=True)
+
+    branches = extract_branches_with_metadata(git, "upstream", "tessera_update")
+    assert len(branches) == 1
+    assert branches[0].name == "feature-y"
+    assert branches[0].title is None

micropython_branch_manager-2.0.3/.cache/pip/selfcheck/fe300af6f7d708c14827daac3afc81fbb8306b73de8dd6e3f1f8ea3b

@@ -1 +0,0 @@
-{"key":"/usr/local","last_check":"2026-03-25T21:41:43.339896+00:00","pypi_version":"26.0.1"}

micropython_branch_manager-2.0.3/tests/test_trailers.py

@@ -1,85 +0,0 @@
-"""Tests for git trailer support."""
-
-from micropython_branch_manager.trailers import (
-    TRAILER_AUTHOR,
-    TRAILER_PR,
-    TRAILER_URL,
-    format_merge_message,
-    parse_trailers_from_message,
-)
-
-
-def test_format_merge_message_minimal():
-    """format_merge_message with just branch name."""
-    msg = format_merge_message(branch_name="feature-x")
-    assert msg == "Merge branch 'feature-x'"
-
-
-def test_format_merge_message_with_title():
-    """format_merge_message includes title."""
-    msg = format_merge_message(branch_name="feature-x", title="Add feature X")
-    assert "Merge branch 'feature-x'" in msg
-    assert "Add feature X" in msg
-
-
-def test_format_merge_message_full():
-    """format_merge_message with all fields."""
-    msg = format_merge_message(
-        branch_name="feature-x",
-        title="Add feature X",
-        pr_number=12345,
-        pr_url="https://github.com/micropython/micropython/pull/12345",
-        author="testuser",
-    )
-
-    lines = msg.split("\n")
-    assert lines[0] == "Merge branch 'feature-x'"
-    assert "Add feature X" in msg
-    assert f"{TRAILER_PR}: 12345" in msg
-    assert f"{TRAILER_URL}: https://github.com/micropython/micropython/pull/12345" in msg
-    assert f"{TRAILER_AUTHOR}: testuser" in msg
-
-
-def test_format_merge_message_no_title_with_trailers():
-    """format_merge_message with trailers but no title."""
-    msg = format_merge_message(
-        branch_name="feature-x",
-        pr_number=123,
-    )
-    assert "Merge branch 'feature-x'" in msg
-    assert f"{TRAILER_PR}: 123" in msg
-
-
-def test_parse_trailers_from_message():
-    """parse_trailers_from_message extracts MBM trailers."""
-    msg = (
-        "Merge branch 'feature-x'\n"
-        "\n"
-        "Add feature X\n"
-        "\n"
-        "MBM-PR: 12345\n"
-        "MBM-URL: https://github.com/micropython/micropython/pull/12345\n"
-        "MBM-Author: testuser\n"
-    )
-
-    trailers = parse_trailers_from_message(msg)
-
-    assert trailers[TRAILER_PR] == "12345"
-    assert trailers[TRAILER_URL] == "https://github.com/micropython/micropython/pull/12345"
-    assert trailers[TRAILER_AUTHOR] == "testuser"
-
-
-def test_parse_trailers_from_message_no_trailers():
-    """parse_trailers_from_message returns empty dict if no trailers."""
-    msg = "Merge branch 'feature-x'\n\nAdd feature X\n"
-    trailers = parse_trailers_from_message(msg)
-    assert trailers == {}
-
-
-def test_parse_trailers_from_message_partial():
-    """parse_trailers_from_message handles partial trailers."""
-    msg = "Merge branch 'feature-x'\n\nMBM-PR: 42\n"
-    trailers = parse_trailers_from_message(msg)
-    assert trailers[TRAILER_PR] == "42"
-    assert TRAILER_URL not in trailers
-    assert TRAILER_AUTHOR not in trailers