afterpython 0.3.18__tar.gz → 0.4.0__tar.gz

{afterpython-0.3.18 → afterpython-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: afterpython
-Version: 0.3.18
+Version: 0.4.0
 Summary: CLI tool to streamline Python package maintenance and generate a dedicated project website
 Keywords: package-maintenance,project-website,static-site-generator,developer-tools,documentation,cli-tool,ci/cd,mystmd,semantic-release,python-packaging
 Author: Stephen Yau
@@ -11,27 +11,30 @@ Classifier: Intended Audience :: Developers
 Classifier: Topic :: Software Development :: Build Tools
 Classifier: Topic :: Software Development :: Documentation
 Classifier: Typing :: Typed
-Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
-Requires-Dist: click>=8.1.8
+Classifier: Programming Language :: Python :: 3.14
+Requires-Dist: click>=8.5.0
 Requires-Dist: trogon>=0.6.0
-Requires-Dist: httpx2>=2.5.0
-Requires-Dist: tomlkit>=0.15.0
+Requires-Dist: httpx2>=2.13.1
+Requires-Dist: tomlkit>=0.15.1
 Requires-Dist: ruamel-yaml>=0.19.1
-Requires-Dist: gitpython>=3.1.50
-Requires-Dist: python-dotenv>=1.2.2
-Requires-Dist: pyproject-metadata>=0.11.0
-Requires-Dist: jupytext>=1.19.4
-Requires-Dist: mystmd>=1.10.1
+Requires-Dist: gitpython>=3.2.0
+Requires-Dist: python-dotenv>=1.2.3
+Requires-Dist: pyproject-metadata>=0.12.1
+Requires-Dist: jupytext>=1.19.5
+Requires-Dist: mystmd>=1.11.0
 Requires-Dist: pdoc>=16.0.0
-Requires-Dist: ruff>=0.15.21
-Requires-Dist: pre-commit>=4.6.0
-Requires-Dist: commitizen>=4.16.4
-Requires-Python: >=3.11
+Requires-Dist: ruff>=0.16.9
+Requires-Dist: prek>=0.5.4
+Requires-Dist: ty>=0.0.84
+Requires-Dist: git-cliff>=2.14.2
+Requires-Dist: marimo[recommended,lsp]>=0.25.0 ; extra == 'marimo'
+Requires-Python: >=3.12
 Project-URL: homepage, https://afterpython.afterpython.org
 Project-URL: repository, https://github.com/AfterPythonOrg/afterpython
 Project-URL: documentation, https://afterpython.afterpython.org/doc
+Provides-Extra: marimo
 Description-Content-Type: text/markdown
 
 # AfterPython: Python Package Maintenance Toolkit and Project Website Generator
@@ -59,10 +62,10 @@ Description-Content-Type: text/markdown
 [Scikit-Learn]: https://scikit-learn.org
 [WebLLM]: https://webllm.mlc.ai/
 [project-website-template]: https://github.com/AfterPythonOrg/project-website-template
-[commitizen]: https://github.com/commitizen-tools/commitizen
 [uv]: https://docs.astral.sh/uv/
 [ruff]: https://docs.astral.sh/ruff/
-
+[ty]: https://docs.astral.sh/ty/
+[git-cliff]: https://git-cliff.org/
 
 ## Problem
 Going from **writing Python code to publishing and maintaining a package** is **time-consuming**.
@@ -125,10 +128,10 @@ ap tui
 - [pre-commit]
 - [GitHub Actions]
 - [pdoc]
-- [commitizen]
 - [uv]
 - [ruff]
+- [ty]
 - [pagefind]
 - [WebLLM]
-<!-- - ty -->
+- [git-cliff]
 <!-- - [pixi] -->

{afterpython-0.3.18 → afterpython-0.4.0}/README.md

@@ -23,10 +23,10 @@
 [Scikit-Learn]: https://scikit-learn.org
 [WebLLM]: https://webllm.mlc.ai/
 [project-website-template]: https://github.com/AfterPythonOrg/project-website-template
-[commitizen]: https://github.com/commitizen-tools/commitizen
 [uv]: https://docs.astral.sh/uv/
 [ruff]: https://docs.astral.sh/ruff/
-
+[ty]: https://docs.astral.sh/ty/
+[git-cliff]: https://git-cliff.org/
 
 ## Problem
 Going from **writing Python code to publishing and maintaining a package** is **time-consuming**.
@@ -89,10 +89,10 @@ ap tui
 - [pre-commit]
 - [GitHub Actions]
 - [pdoc]
-- [commitizen]
 - [uv]
 - [ruff]
+- [ty]
 - [pagefind]
 - [WebLLM]
-<!-- - ty -->
+- [git-cliff]
 <!-- - [pixi] -->

afterpython-0.4.0/pyproject.toml

@@ -0,0 +1,73 @@
+[project]
+name = "afterpython"
+version = "0.4.0"
+description = "CLI tool to streamline Python package maintenance and generate a dedicated project website"
+license = "Apache-2.0"
+readme = "README.md"
+keywords = [
+    "package-maintenance",
+    "project-website",
+    "static-site-generator",
+    "developer-tools",
+    "documentation",
+    "cli-tool",
+    "ci/cd",
+    "mystmd",
+    "semantic-release",
+    "python-packaging",
+]
+classifiers = [
+    "Operating System :: OS Independent",
+    "Intended Audience :: Developers",
+    "Topic :: Software Development :: Build Tools",
+    "Topic :: Software Development :: Documentation",
+    "Typing :: Typed",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
+]
+requires-python = ">=3.12"
+dependencies = [
+    "click>=8.5.0",
+    "trogon>=0.6.0",
+    "httpx2>=2.13.1",
+    "tomlkit>=0.15.1",
+    "ruamel-yaml>=0.19.1",
+    "gitpython>=3.2.0",
+    "python-dotenv>=1.2.3",
+    "pyproject-metadata>=0.12.1",
+    "jupytext>=1.19.5",
+    "mystmd>=1.11.0",
+    "pdoc>=16.0.0",
+    "ruff>=0.16.9",
+    "prek>=0.5.4",
+    "ty>=0.0.84",
+    "git-cliff>=2.14.2",
+]
+
+[[project.authors]]
+name = "Stephen Yau"
+email = "softwareentrepreneer+afterpython@gmail.com"
+
+[project.optional-dependencies]
+marimo = ["marimo[recommended,lsp]>=0.25.0"]
+
+[project.urls]
+homepage = "https://afterpython.afterpython.org"
+repository = "https://github.com/AfterPythonOrg/afterpython"
+documentation = "https://afterpython.afterpython.org/doc"
+
+[project.scripts]
+ap = "afterpython.main:run_cli"
+pcu = "afterpython.main:run_pcu"
+
+[build-system]
+requires = ["uv_build>=0.12.21,<0.13.0"]
+build-backend = "uv_build"
+
+[tool.uv.build-backend]
+module-name = "afterpython"
+module-root = "src"
+
+[tool.ruff]
+extend = "afterpython/ruff.toml"

afterpython-0.3.18/pyproject.toml → afterpython-0.4.0/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "afterpython"
-version = "0.3.18"
+version = "0.4.0"
 description = "CLI tool to streamline Python package maintenance and generate a dedicated project website"
 license = "Apache-2.0"
 authors = [
@@ -25,32 +25,33 @@ classifiers = [
     "Topic :: Software Development :: Build Tools",
     "Topic :: Software Development :: Documentation",
     "Typing :: Typed",
-    "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
-    # "Programming Language :: Python :: 3.14",
+    "Programming Language :: Python :: 3.14",
+    # "Programming Language :: Python :: 3.15",
 ]
-requires-python = ">=3.11"
+requires-python = ">=3.12"
 dependencies = [
-    "click>=8.1.8",
+    "click>=8.5.0",
     "trogon>=0.6.0",
-    "httpx2>=2.5.0",
-    "tomlkit>=0.15.0",
+    "httpx2>=2.13.1",
+    "tomlkit>=0.15.1",
     "ruamel-yaml>=0.19.1",
-    "gitpython>=3.1.50",
-    # "pygithub>=2.8.1",
-    "python-dotenv>=1.2.2",
-    "pyproject-metadata>=0.11.0",
-    "jupytext>=1.19.4",
-    # "jinja2>=3.1.6",
-    "mystmd>=1.10.1",
+    "gitpython>=3.2.0",
+    "python-dotenv>=1.2.3",
+    "pyproject-metadata>=0.12.1",
+    "jupytext>=1.19.5",
+    "mystmd>=1.11.0",
     "pdoc>=16.0.0",
-    "ruff>=0.15.21",
-    "pre-commit>=4.6.0",
-    "commitizen>=4.16.4",
-    # "python-semantic-release>=10.5.2",
+    "ruff>=0.16.9",
+    "prek>=0.5.4",
+    "ty>=0.0.84",
+    "git-cliff>=2.14.2",
 ]
 
+[project.optional-dependencies]
+marimo = ["marimo[recommended,lsp]>=0.25.0"]
+
 [project.urls]
 homepage = "https://afterpython.afterpython.org"
 repository = "https://github.com/AfterPythonOrg/afterpython"
@@ -60,22 +61,16 @@ documentation = "https://afterpython.afterpython.org/doc"
 ap = "afterpython.main:run_cli"
 pcu = "afterpython.main:run_pcu"
 
-# [tool.uv]
-# override-dependencies = ["platformdirs>=4.5.0", "nodeenv>=1.9.1"]
-
 [build-system]
-requires = ["uv_build>=0.11.28,<0.12.0"]
+requires = ["uv_build>=0.12.21,<0.13.0"]
 build-backend = "uv_build"
 
 [tool.uv]
-exclude-newer = "14 days"
+# exclude-newer = "14 days"
 
 [tool.uv.build-backend]
 module-name = "afterpython"
 module-root = "src"
 
-# [tool.uv.sources]
-# afterpython = { path = ".", editable = true }
-
-[tool.pyright]
-typeCheckingMode = "basic"
+[tool.ruff]
+extend = "afterpython/ruff.toml"

afterpython-0.4.0/src/afterpython/_typing.py

@@ -0,0 +1,4 @@
+from typing import Literal
+
+type NodeEnv = dict[str, str]
+tContentType = Literal["doc", "blog", "tutorial", "example", "guide"]

{afterpython-0.3.18 → afterpython-0.4.0}/src/afterpython/builders/marimo_notebook.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import os
 import re
+import shutil
 import subprocess
 from pathlib import Path
 from typing import Literal
@@ -48,6 +49,12 @@ def _export_marimo(
     execute: bool = False,
 ):
     """Run `marimo export` to produce HTML at `output_html`."""
+    # marimo is an optional dependency (the `marimo` extra)
+    if shutil.which("marimo") is None:
+        raise click.ClickException(
+            f"marimo is required to build {source.name} (a marimo notebook), "
+            'install it with: uv add --dev "afterpython[marimo]"'
+        )
     output_html.parent.mkdir(parents=True, exist_ok=True)
     subcommand = "html-wasm" if mode == "wasm" else "html"
     cmd = [

{afterpython-0.3.18 → afterpython-0.4.0}/src/afterpython/cli/commands/build.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from collections.abc import Callable
+from collections.abc import Callable, Iterable
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
@@ -147,7 +147,7 @@ def postbuild(dev_build: bool = False):
         source: Path,
         destination: Path,
         is_copy: bool = True,
-        ignore_copy: Callable[[str, list[str]], set[str]] | None = None,
+        ignore_copy: Callable[[str, list[str]], Iterable[str]] | None = None,
     ):
         """
         Move or copy files from source to destination.
@@ -156,7 +156,7 @@ def postbuild(dev_build: bool = False):
             source: Source path
             destination: Destination path
             is_copy: If True, copy files (merge with existing). If False, move files (replace destination)
-            ignore_copy: Optional ignore function for copytree, takes (directory, contents) and returns set of names to ignore
+            ignore_copy: Optional ignore function for copytree, takes (directory, contents) and returns the names to ignore
         """
         if not source.exists():
             return

afterpython-0.4.0/src/afterpython/cli/commands/bump.py

@@ -0,0 +1,333 @@
+import os
+import subprocess
+import sys
+
+import click
+from packaging.version import Version
+
+# uv's --bump names for PEP 440 pre-release markers
+PRE_KINDS = {"a": "alpha", "b": "beta", "rc": "rc"}
+CHANGELOG = "CHANGELOG.md"
+# git-cliff ignores pre-release and dev tags (e.g. v0.4.0rc1, v0.4.0.dev2),
+# so a stable release's section has every commit since the previous stable release
+PRE_RELEASE_TAGS = "(a|b|rc|dev)[0-9]+"
+
+
+def _uv_version_args(
+    version: Version, release: bool, pre: bool, level: str
+) -> list[str]:
+    """Arguments for `uv version`, either `--bump ...` or an exact version"""
+    is_stable = not version.is_prerelease  # dev versions count as pre-releases too
+    if not is_stable and level != "patch":
+        raise click.ClickException(
+            f"--{level} only applies to stable versions, current version is {version}"
+        )
+    if release:
+        # e.g. 0.1.0rc0 -> 0.1.0, 0.3.19 -> 0.3.20
+        return ["--bump", "stable" if not is_stable else level]
+    if is_stable:
+        # e.g. 0.3.19 -> 0.3.20 (or 0.3.20rc0 with --pre)
+        return ["--bump", level, *(["--bump", "rc=0"] if pre else [])]
+    if version.is_devrelease:
+        if not pre:
+            # e.g. 0.1.0.dev3 -> 0.1.0.dev4
+            return ["--bump", "dev"]
+        if version.pre is None:
+            # e.g. 0.1.0.dev3 -> 0.1.0rc0
+            return ["--bump", "rc=0"]
+        # e.g. 0.1.0rc0.dev2 -> 0.1.0rc0 (uv's --bump rc would skip to rc1)
+        kind, number = version.pre
+        return [str(Version(f"{version.base_version}{kind}{number}"))]
+    # e.g. 0.1.0a1 -> 0.1.0a2, 0.1.0rc0 -> 0.1.0rc1
+    assert version.pre is not None  # not stable and not dev, so it's a pre-release
+    return ["--bump", PRE_KINDS[version.pre[0]]]
+
+
+def _git(*args: str) -> subprocess.CompletedProcess:
+    import afterpython as ap
+
+    return subprocess.run(
+        ["git", *args],
+        cwd=ap.paths.user_path,
+        capture_output=True,
+        text=True,
+        check=False,
+    )
+
+
+def _restore(files: list[str], new_files: list[str]):
+    """Undo the version bump in the working tree and index"""
+    import afterpython as ap
+
+    _git("restore", "--source=HEAD", "--staged", "--worktree", "--", *files)
+    for file in new_files:
+        # --force, a hook (e.g. end-of-file-fixer) may have changed the file after it was staged
+        _git("rm", "--cached", "--force", "--quiet", "--ignore-unmatch", "--", file)
+        (ap.paths.user_path / file).unlink(missing_ok=True)
+    click.echo(f"↩️  Restored {', '.join(files + new_files)}", err=True)
+
+
+def _write_changelog(tag: str):
+    """Write the release section for tag to CHANGELOG.md with git-cliff"""
+    import afterpython as ap
+
+    cmd = [
+        "git-cliff",
+        "--config",
+        str(ap.paths.afterpython_path / "cliff.toml"),
+        "--tag",
+        tag,
+        "--ignore-tags",
+        PRE_RELEASE_TAGS,
+    ]
+    if (ap.paths.user_path / CHANGELOG).exists():
+        # only add the new section on top, keeping manual edits to older ones;
+        # a range from the previous stable tag, since --unreleased would drop
+        # the commits before an ignored pre-release tag (e.g. v0.4.1rc0)
+        previous = _git(
+            "describe",
+            "--tags",
+            "--abbrev=0",
+            "--match",
+            "v*",
+            *(f"--exclude=*{kind}[0-9]*" for kind in ("a", "b", "rc", "dev")),
+        ).stdout.strip()
+        cmd += [f"{previous}..HEAD" if previous else "--unreleased"]
+        cmd += ["--prepend", CHANGELOG]
+    else:
+        # git-cliff can't prepend to a missing file, so create it from the full history
+        cmd += ["--output", CHANGELOG]
+    result = subprocess.run(
+        cmd, cwd=ap.paths.user_path, capture_output=True, text=True, check=False
+    )
+    if result.returncode != 0:
+        raise click.ClickException(f"git-cliff failed:\n{result.stderr.strip()}")
+    # the blank line after each release also ends up at the end of the file,
+    # end it with a single newline as end-of-file-fixer wants
+    path = ap.paths.user_path / CHANGELOG
+    path.write_text(path.read_text().rstrip("\n") + "\n")
+
+
+def _is_interactive() -> bool:
+    return sys.stdin.isatty() and sys.stdout.isatty()
+
+
+def _edit_changelog():
+    """Open CHANGELOG.md in git's editor, the bump continues once it's closed"""
+    import afterpython as ap
+
+    result = _git("var", "GIT_EDITOR")
+    if result.returncode != 0:
+        raise click.ClickException(
+            f"Failed to find git's editor:\n{result.stderr.strip()}"
+        )
+    editor = result.stdout.strip()
+    click.echo(
+        f"✏️  Opening {CHANGELOG} in {editor}, save and close it to commit the bump "
+        "(to abort, press Ctrl+C or exit the editor with an error, e.g. :cq in vim)"
+    )
+    # raises ClickException if the editor exits with an error, which rolls back the bump
+    click.edit(filename=str(ap.paths.user_path / CHANGELOG), editor=editor)
+
+
+@click.command()
+@click.option(
+    "--pre",
+    is_flag=True,
+    help="bump to pre-release version (e.g., 0.1.0.dev3 -> 0.1.0rc0, 0.1.0a1 -> 0.1.0a2)",
+)
+@click.option(
+    "--release",
+    is_flag=True,
+    help="bump to stable version (e.g., 0.1.0rc0 -> 0.1.0, 0.3.19 -> 0.3.20) and push it with its tag to trigger the release workflow (default branch only)",
+)
+@click.option(
+    "--minor",
+    is_flag=True,
+    help="bump the minor version instead of patch (stable versions only, e.g., 0.3.19 -> 0.4.0)",
+)
+@click.option(
+    "--major",
+    is_flag=True,
+    help="bump the major version instead of patch (stable versions only, e.g., 0.3.19 -> 1.0.0)",
+)
+@click.option(
+    "--no-edit",
+    is_flag=True,
+    help="don't open CHANGELOG.md in git's editor before committing a stable bump",
+)
+@click.option(
+    "--dry-run", is_flag=True, help="show the new version without changing anything"
+)
+def bump(
+    release: bool, pre: bool, minor: bool, major: bool, no_edit: bool, dry_run: bool
+):
+    """Bump project version, commit it and tag it.
+
+    \b
+    By default, stays within current release phase:
+    - Dev releases (e.g., 0.1.0.dev3) -> increment dev number (0.1.0.dev4)
+    - Pre-releases (e.g., 0.1.0a1) -> increment pre-release (0.1.0a2)
+    - Stable releases (e.g., 0.3.19) -> increment patch (0.3.20), or --minor/--major
+
+    Use --pre to transition from dev to pre-release, or pre-release to next pre-release.
+    Stable bumps also add the new release section to CHANGELOG.md with git-cliff
+    (if afterpython/cliff.toml exists, see `ap init cliff`) and open it in git's editor,
+    the bump is committed once you close it (use --no-edit to skip).
+    Use --release to bump to a stable version and push it with its tag (triggers the release workflow),
+    only allowed on the default branch (e.g. main).
+    """
+    import afterpython as ap
+    from afterpython.tools._git import check_release_branch
+    from afterpython.tools.pyproject import read_metadata
+    from afterpython.utils import has_pixi
+
+    if release and pre:
+        raise click.ClickException("Only one of --release or --pre can be specified")
+    if minor and major:
+        raise click.ClickException("Only one of --minor or --major can be specified")
+    level = "minor" if minor else "major" if major else "patch"
+
+    # before changing anything, so a wrong branch doesn't leave a bump behind
+    if release:
+        check_release_branch()
+
+    version = read_metadata().version
+    if version is None:
+        raise click.ClickException("Unable to read version from pyproject.toml")
+    uv_args = _uv_version_args(version, release, pre, level)
+
+    user_path = ap.paths.user_path
+    # without uv.lock, --frozen stops uv from creating one; with it, uv updates it
+    has_uv_lock = (user_path / "uv.lock").exists()
+    uv_lock_arg = "--no-sync" if has_uv_lock else "--frozen"
+    result = subprocess.run(
+        ["uv", "version", *uv_args, "--dry-run", "--short", "--frozen"],
+        cwd=user_path,
+        capture_output=True,
+        text=True,
+        check=False,
+    )
+    if result.returncode != 0:
+        raise click.ClickException(result.stderr.strip())
+    new_version = result.stdout.strip()
+    tag = f"v{new_version}"
+
+    uses_pixi = (user_path / "pixi.lock").exists()
+    if uses_pixi and not has_pixi():
+        click.echo("⚠️  pixi.lock found but pixi is not installed, skip updating it")
+        uses_pixi = False
+    candidates = [
+        "pyproject.toml",
+        *(["uv.lock"] if has_uv_lock else []),
+        *(["pixi.lock"] if uses_pixi else []),
+    ]
+    # only stable bumps write the changelog, and only when afterpython/cliff.toml was set up
+    writes_changelog = (
+        not Version(new_version).is_prerelease
+        and (ap.paths.afterpython_path / "cliff.toml").exists()
+    )
+    if writes_changelog:
+        candidates.append(CHANGELOG)
+    # no editor in CI or tests
+    edits_changelog = writes_changelog and not no_edit and _is_interactive()
+    files = _git("ls-files", "--", *candidates).stdout.split()
+    if "pyproject.toml" not in files:
+        raise click.ClickException("pyproject.toml is not tracked by git")
+    # CHANGELOG.md created by this bump, removed again if the bump fails
+    new_files: list[str] = []
+    if writes_changelog and CHANGELOG not in files:
+        if (user_path / CHANGELOG).exists():
+            raise click.ClickException(
+                f"{CHANGELOG} exists but is not tracked by git, commit or remove it first"
+            )
+        new_files.append(CHANGELOG)
+
+    # the bump commit only contains the version change
+    dirty = _git("status", "--porcelain", "--", *files).stdout.strip()
+    if dirty:
+        raise click.ClickException(
+            f"Commit or stash your changes to these files first:\n{dirty}"
+        )
+    if _git("rev-parse", "--quiet", "--verify", f"refs/tags/{tag}").returncode == 0:
+        raise click.ClickException(f"Tag {tag} already exists")
+    # otherwise uv would re-lock other packages into the bump commit
+    if has_uv_lock and (
+        subprocess.run(
+            ["uv", "lock", "--check"], cwd=user_path, capture_output=True, check=False
+        ).returncode
+        != 0
+    ):
+        raise click.ClickException(
+            "uv.lock is out of date, run `uv lock` and commit it first"
+        )
+
+    if dry_run:
+        click.echo(f"{version} → {new_version}")
+        if writes_changelog:
+            click.echo(f"Would write the {new_version} section to {CHANGELOG}")
+            if edits_changelog:
+                click.echo(f"Would open {CHANGELOG} in git's editor before committing")
+        click.echo(f"Would commit {', '.join(files + new_files)} and create tag {tag}")
+        if release:
+            click.echo(f"Would push the current branch and tag {tag} to origin")
+        return
+
+    try:
+        result = subprocess.run(
+            ["uv", "version", *uv_args, uv_lock_arg], cwd=user_path, check=False
+        )
+        if result.returncode != 0:
+            raise click.ClickException("uv version failed")
+        if read_metadata().version != Version(new_version):
+            raise click.ClickException(
+                f"Expected version {new_version} in pyproject.toml after the bump"
+            )
+        # refresh the pixi env; older pixi versions also record the editable version in pixi.lock
+        if uses_pixi:
+            result = subprocess.run(["pixi", "install"], cwd=user_path, check=False)
+            if result.returncode != 0:
+                raise click.ClickException("pixi install failed")
+        if writes_changelog:
+            _write_changelog(tag)
+            click.echo(f"📝 Wrote the {new_version} section to {CHANGELOG}")
+        if edits_changelog:
+            _edit_changelog()
+        if new_files:
+            # `git commit -- <files>` only takes files git already knows about
+            result = _git("add", "--", *new_files)
+            if result.returncode != 0:
+                raise click.ClickException(f"git add failed:\n{result.stderr.strip()}")
+
+        # skip the commit message check, "bump" is not one of the commit types
+        env = os.environ.copy()
+        env["SKIP"] = ",".join(filter(None, [env.get("SKIP"), "ap-commit"]))
+        message = f"bump: version {version} → {new_version}"
+        # `git commit -- <files>` commits only these files, leaving anything else staged as is
+        result = subprocess.run(
+            ["git", "commit", "-m", message, "--", *files, *new_files],
+            cwd=user_path,
+            env=env,
+            check=False,
+        )
+        if result.returncode != 0:
+            raise click.ClickException("git commit failed")
+    except (click.ClickException, KeyboardInterrupt):
+        _restore(files, new_files)
+        raise
+
+    result = _git("tag", tag)
+    if result.returncode != 0:
+        raise click.ClickException(
+            f"Committed the bump but failed to create tag {tag}:\n{result.stderr.strip()}"
+        )
+    click.echo(f"✅ Bumped {version} → {new_version} and tagged {tag}")
+
+    if release:
+        # ap release pushes the branch and the tag, which triggers the release workflow
+        click.echo()
+        result = subprocess.run(["ap", "release"], cwd=user_path, check=False)
+        if result.returncode != 0:
+            raise click.ClickException(
+                f"Bumped and tagged {tag} but didn't push it, retry with: ap release"
+            )