afterpython 0.1.0.dev8__tar.gz → 0.1.0.dev9__tar.gz

{afterpython-0.1.0.dev8 → afterpython-0.1.0.dev9}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: afterpython
-Version: 0.1.0.dev8
-Summary: CLI tool for AfterPython
+Version: 0.1.0.dev9
+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
 Author-email: Stephen Yau <softwareentrepreneer+afterpython@gmail.com>
@@ -10,6 +10,7 @@ Classifier: Operating System :: OS Independent
 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
@@ -21,11 +22,11 @@ Requires-Dist: ruamel-yaml>=0.18.16
 Requires-Dist: gitpython>=3.1.45
 Requires-Dist: pygithub>=2.8.1
 Requires-Dist: python-dotenv>=1.2.1
-Requires-Dist: pyproject-metadata>=0.9.1
+Requires-Dist: pyproject-metadata>=0.10.0
 Requires-Dist: mystmd>=1.6.6
 Requires-Dist: pdoc>=16.0.0
-Requires-Dist: ruff>=0.14.5
-Requires-Dist: pre-commit>=4.4.0
+Requires-Dist: ruff>=0.14.6
+Requires-Dist: pre-commit>=4.5.0
 Requires-Dist: commitizen>=4.10.0
 Requires-Python: >=3.11
 Project-URL: documentation, https://afterpython.afterpython.org/doc
@@ -75,8 +76,9 @@ First-time maintainers must learn multiple tools and concepts, e.g. [MyST], [Sem
 
 ## Core Features
 - [x] Write content directly in [MyST Markdown] or [Jupyter Notebook]
-- [x] Go from writing to website deployment in minutes — no need to learn any of the underlying tools
-- [x] Centralize all your content in a modern, unified project website — from documentation to blog posts
+- [x] Go from writing to **website deployment in minutes** — no need to learn any of the underlying tools
+- [x] Centralize all your content in a modern, **unified project website** — from documentation to blog posts
+- [x] Zero-config orchestration — Pre-configured modern tooling with sane defaults (see [Tech Stack](#tech-stack)), so you can start maintaining packages immediately **without learning each tool**
 - [ ] Export content as PDF — for example, combine all blog posts into a single PDF file
 - [ ] **⚡ Full-text search** across **ALL** your content in your website — docs, blogs, tutorials, everything
 - [ ] **🤖 Embedded AI Chatbot** that answers questions directly using an in-browser LLM — at no cost

{afterpython-0.1.0.dev8 → afterpython-0.1.0.dev9}/README.md

@@ -40,8 +40,9 @@ First-time maintainers must learn multiple tools and concepts, e.g. [MyST], [Sem
 
 ## Core Features
 - [x] Write content directly in [MyST Markdown] or [Jupyter Notebook]
-- [x] Go from writing to website deployment in minutes — no need to learn any of the underlying tools
-- [x] Centralize all your content in a modern, unified project website — from documentation to blog posts
+- [x] Go from writing to **website deployment in minutes** — no need to learn any of the underlying tools
+- [x] Centralize all your content in a modern, **unified project website** — from documentation to blog posts
+- [x] Zero-config orchestration — Pre-configured modern tooling with sane defaults (see [Tech Stack](#tech-stack)), so you can start maintaining packages immediately **without learning each tool**
 - [ ] Export content as PDF — for example, combine all blog posts into a single PDF file
 - [ ] **⚡ Full-text search** across **ALL** your content in your website — docs, blogs, tutorials, everything
 - [ ] **🤖 Embedded AI Chatbot** that answers questions directly using an in-browser LLM — at no cost

{afterpython-0.1.0.dev8 → afterpython-0.1.0.dev9}/pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "afterpython"
-version = "0.1.0.dev8"
-description = "CLI tool for AfterPython"
+version = "0.1.0.dev9"
+description = "CLI tool to streamline Python package maintenance and generate a dedicated project website"
 license = "Apache-2.0"
 authors = [
     { name = "Stephen Yau", email = "softwareentrepreneer+afterpython@gmail.com" },
@@ -24,6 +24,7 @@ classifiers = [
     "Intended Audience :: Developers",
     "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",
@@ -39,13 +40,13 @@ dependencies = [
     "gitpython>=3.1.45",
     "pygithub>=2.8.1",
     "python-dotenv>=1.2.1",
-    "pyproject-metadata>=0.9.1",
+    "pyproject-metadata>=0.10.0",
     # "jupytext>=1.18.1",
     # "jinja2>=3.1.6",
     "mystmd>=1.6.6",
     "pdoc>=16.0.0",
-    "ruff>=0.14.5",
-    "pre-commit>=4.4.0",
+    "ruff>=0.14.6",
+    "pre-commit>=4.5.0",
     "commitizen>=4.10.0",
     # "python-semantic-release>=10.5.2",
 ]
@@ -64,44 +65,9 @@ pcu = "afterpython.main:run_pcu"
 override-dependencies = ["platformdirs>=4.5.0", "nodeenv>=1.9.1"]
 
 [build-system]
-requires = ["uv_build>=0.9.10,<0.10.0"]
+requires = ["uv_build>=0.9.13,<0.10.0"]
 build-backend = "uv_build"
 
-[dependency-groups]
-dev = ["notebook>=7.4.7"]
-
 [tool.uv.build-backend]
 module-name = "afterpython"
-module-root = ""
-source-exclude = [
-    "afterpython/doc",
-    "afterpython/blog",
-    "afterpython/tutorial",
-    "afterpython/example",
-    "afterpython/guide",
-    "afterpython/static",
-    "afterpython/_website",
-    "afterpython/_build",
-    "afterpython/cz.toml",
-    "afterpython/.pre-commit-config.yaml",
-    "afterpython/ruff.toml",
-    "afterpython/afterpython.toml",
-    "afterpython/authors.yml",
-    "afterpython/faq.yml",
-]
-wheel-exclude = [
-    "afterpython/doc",
-    "afterpython/blog",
-    "afterpython/tutorial",
-    "afterpython/example",
-    "afterpython/guide",
-    "afterpython/static",
-    "afterpython/_website",
-    "afterpython/_build",
-    "afterpython/cz.toml",
-    "afterpython/.pre-commit-config.yaml",
-    "afterpython/ruff.toml",
-    "afterpython/afterpython.toml",
-    "afterpython/authors.yml",
-    "afterpython/faq.yml",
-]
+module-root = "src"

{afterpython-0.1.0.dev8 → afterpython-0.1.0.dev9/src}/afterpython/_io/toml.py

@@ -1,10 +1,12 @@
 from __future__ import annotations
+
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
-    from tomlkit.toml_document import TOMLDocument
     from pathlib import Path
 
+    from tomlkit.toml_document import TOMLDocument
+
 import tomlkit
 
 
@@ -16,7 +18,7 @@ def _from_tomlkit(value):
     - tomlkit containers → plain Python containers
     - tomlkit primitives → plain Python primitives
     """
-    from tomlkit.items import Array, InlineTable, Table, AoT
+    from tomlkit.items import AoT, Array, InlineTable, Table
 
     if value is None:
         return None
@@ -58,7 +60,7 @@ def _to_tomlkit(value):
     - List of dicts → array of inline tables: [{key = val}]
     - Nested dicts → nested tables with proper structure
     """
-    from tomlkit import inline_table, array
+    from tomlkit import array, inline_table
 
     if value is None:
         return None

{afterpython-0.1.0.dev8 → afterpython-0.1.0.dev9/src}/afterpython/_typing.py

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

{afterpython-0.1.0.dev8 → afterpython-0.1.0.dev9/src}/afterpython/builders/__init__.py

@@ -1,7 +1,6 @@
 from afterpython.builders.metadata import build_metadata
 from afterpython.builders.molab import add_molab_badge_to_jupyter_notebooks
 
-
 __all__ = (
     "add_molab_badge_to_jupyter_notebooks",
     "build_metadata",

{afterpython-0.1.0.dev8 → afterpython-0.1.0.dev9/src}/afterpython/builders/molab.py

@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
@@ -10,8 +11,8 @@ from pathlib import Path
 from pyproject_metadata import StandardMetadata
 
 import afterpython as ap
-from afterpython.tools.pyproject import read_metadata
 from afterpython.const import CONTENT_TYPES
+from afterpython.tools.pyproject import read_metadata
 
 
 def _get_molab_badge() -> str:

{afterpython-0.1.0.dev8 → afterpython-0.1.0.dev9/src}/afterpython/cli/__init__.py

@@ -1,4 +1,3 @@
 from afterpython.cli.main import afterpython_group
 
-
 __all__ = ["afterpython_group"]

afterpython-0.1.0.dev9/src/afterpython/cli/commands/add.py

@@ -0,0 +1,67 @@
+import subprocess
+
+import click
+from click.exceptions import Exit
+
+from afterpython.utils import has_pixi, has_uv
+
+
+@click.command()
+@click.option(
+    "--optional",
+    type=str,
+    default=None,
+    required=False,
+    help="Add to an optional dependency group (pixi: mapped to 'optional' feature)",
+)
+@click.option(
+    "--group",
+    type=str,
+    default=None,
+    required=False,
+    help="Add to a dependency group (pixi: mapped to same-named feature)",
+)
+@click.argument("lib", type=str, required=True)
+def add(optional: str | None, group: str | None, lib: str):
+    """Add a new dependency to the project (manages both uv and pixi if present)"""
+    if not has_uv():
+        click.echo("uv not found. Please install uv first.")
+        return
+
+    if optional and group:
+        click.echo("Error: Cannot specify both --optional and --group")
+        raise Exit(1)
+
+    result = subprocess.run(
+        [
+            "uv",
+            "add",
+            *(["--optional", optional] if optional else []),
+            *(["--group", group] if group else []),
+            lib,
+        ],
+        check=False,
+    )
+    if result.returncode != 0:
+        raise Exit(result.returncode)
+
+    if has_pixi():
+        # NOTE: pixi doesn't support --optional, so we need to use --feature instead
+        if optional:
+            feature_name = "optional"
+        elif group:
+            feature_name = group
+        else:
+            feature_name = None
+        result = subprocess.run(
+            [
+                "pixi",
+                "add",
+                "--pypi",
+                *(["--feature", feature_name] if feature_name else []),
+                lib,
+            ],
+            check=False,
+        )
+        if result.returncode != 0:
+            raise Exit(result.returncode)

{afterpython-0.1.0.dev8 → afterpython-0.1.0.dev9/src}/afterpython/cli/commands/build.py

@@ -1,11 +1,13 @@
 from __future__ import annotations
-from typing import TYPE_CHECKING
+
 from collections.abc import Callable
+from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
-    from afterpython._typing import NodeEnv
     from pathlib import Path
 
+    from afterpython._typing import NodeEnv
+
 import os
 import shutil
 import subprocess
@@ -14,12 +16,12 @@ import click
 from click.exceptions import Exit
 
 import afterpython as ap
-from afterpython.utils import find_node_env
-from afterpython.const import CONTENT_TYPES
 from afterpython.builders import (
-    build_metadata,
     add_molab_badge_to_jupyter_notebooks,
+    build_metadata,
 )
+from afterpython.const import CONTENT_TYPES
+from afterpython.utils import find_node_env
 
 
 def determine_base_path() -> str:
@@ -29,9 +31,9 @@ def determine_base_path() -> str:
         Empty string if custom domain is configured (no github.io in URL)
         /repo-name if using default GitHub Pages URL (contains github.io)
     """
+    from afterpython._io.toml import _from_tomlkit
     from afterpython.tools._afterpython import read_afterpython
     from afterpython.tools.pyproject import read_metadata
-    from afterpython._io.toml import _from_tomlkit
 
     # Read website URL from afterpython.toml
     afterpython = read_afterpython()
@@ -167,8 +169,7 @@ def build(ctx, dev: bool, execute: bool):
 
     Use --execute to execute Jupyter notebooks for all content types.
     """
-    from afterpython.utils import has_content_for_myst
-    from afterpython.utils import handle_passthrough_help
+    from afterpython.utils import handle_passthrough_help, has_content_for_myst
 
     # Show both our options and myst's help and exit
     handle_passthrough_help(

{afterpython-0.1.0.dev8 → afterpython-0.1.0.dev9/src}/afterpython/cli/commands/clean.py

@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
@@ -10,8 +11,8 @@ import subprocess
 import click
 from click.exceptions import Exit
 
-from afterpython.utils import find_node_env, has_content_for_myst
 from afterpython.const import CONTENT_TYPES
+from afterpython.utils import find_node_env, has_content_for_myst
 
 
 @click.command(

{afterpython-0.1.0.dev8 → afterpython-0.1.0.dev9/src}/afterpython/cli/commands/commit.py

@@ -15,7 +15,13 @@ import click
 @click.option(
     "--no-cz", "--no-commitizen", is_flag=True, help="Skip running 'cz commit'"
 )
-def commit(ctx, no_cz: bool):
+@click.option(
+    "--no-pc",
+    "--no-pre-commit",
+    is_flag=True,
+    help="Skip running pre-commit checks before commit",
+)
+def commit(ctx, no_cz: bool, no_pc: bool):
     """Run 'cz commit'"""
     from afterpython.utils import handle_passthrough_help
 
@@ -26,6 +32,15 @@ def commit(ctx, no_cz: bool):
         show_underlying=True,
     )
 
+    # Run pre-commit checks first (unless --no-pc is set)
+    if not no_pc:
+        result = subprocess.run(["ap", "pc", "run"])
+        if result.returncode != 0:
+            click.echo(
+                "❌ Pre-commit checks failed. Please fix the issues and try again."
+            )
+            ctx.exit(1)
+
     if not no_cz:
         subprocess.run(["ap", "cz", "commit", *ctx.args])
     else:

{afterpython-0.1.0.dev8 → afterpython-0.1.0.dev9/src}/afterpython/cli/commands/dev.py

@@ -1,17 +1,18 @@
 from __future__ import annotations
+
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
     from afterpython._typing import NodeEnv
 
-import time
 import subprocess
+import time
 
 import click
 from click.exceptions import Exit
 
-from afterpython.utils import find_node_env, find_available_port
 from afterpython.const import CONTENT_TYPES
+from afterpython.utils import find_available_port, find_node_env
 
 
 @click.command(

{afterpython-0.1.0.dev8 → afterpython-0.1.0.dev9/src}/afterpython/cli/commands/init.py

@@ -22,7 +22,7 @@ def init_ruff_toml():
         "repos": [
             {
                 "repo": "https://github.com/astral-sh/ruff-pre-commit",
-                "rev": "v0.14.5",
+                "rev": "v0.14.6",
                 "hooks": [
                     {
                         "id": "ruff-check",
@@ -56,15 +56,15 @@ def init_website():
 @click.pass_context
 def init(ctx, yes):
     """Initialize afterpython with MyST Markdown (by default) and project website template"""
-    from afterpython.tools.pyproject import init_pyproject
     from afterpython.tools._afterpython import init_afterpython
-    from afterpython.tools.myst import init_myst
-    from afterpython.tools.pre_commit import init_pre_commit
     from afterpython.tools.commitizen import init_commitizen
     from afterpython.tools.github_actions import (
-        create_workflow,
         create_dependabot,
+        create_workflow,
     )
+    from afterpython.tools.myst import init_myst
+    from afterpython.tools.pre_commit import init_pre_commit
+    from afterpython.tools.pyproject import init_pyproject
 
     paths = ctx.obj["paths"]
     click.echo("Initializing afterpython...")

{afterpython-0.1.0.dev8 → afterpython-0.1.0.dev9/src}/afterpython/cli/commands/install.py

@@ -3,7 +3,7 @@ import subprocess
 import click
 from click.exceptions import Exit
 
-from afterpython.utils import has_uv
+from afterpython.utils import has_pixi, has_uv
 
 
 @click.command(
@@ -13,10 +13,16 @@ from afterpython.utils import has_uv
     )
 )
 def install():
-    """Run 'uv sync --all-extras --all-groups' to install all dependencies"""
+    """Install all dependencies (runs 'uv sync --all-extras --all-groups' and 'pixi install' if present)"""
     if not has_uv():
         click.echo("uv not found. Please install uv first.")
         return
+
     result = subprocess.run(["uv", "sync", "--all-extras", "--all-groups"], check=False)
     if result.returncode != 0:
         raise Exit(result.returncode)
+
+    if has_pixi():
+        result = subprocess.run(["pixi", "install"], check=False)
+        if result.returncode != 0:
+            raise Exit(result.returncode)

afterpython-0.1.0.dev9/src/afterpython/cli/commands/lock.py

@@ -0,0 +1,23 @@
+import subprocess
+
+import click
+from click.exceptions import Exit
+
+from afterpython.utils import has_pixi, has_uv
+
+
+@click.command()
+def lock():
+    """Lock the dependencies (runs 'uv lock' and 'pixi lock' if present)"""
+    if not has_uv():
+        click.echo("uv not found. Please install uv first.")
+        return
+
+    result = subprocess.run(["uv", "lock"], check=False)
+    if result.returncode != 0:
+        raise Exit(result.returncode)
+
+    if has_pixi():
+        result = subprocess.run(["pixi", "lock"], check=False)
+        if result.returncode != 0:
+            raise Exit(result.returncode)

afterpython-0.1.0.dev9/src/afterpython/cli/commands/remove.py

@@ -0,0 +1,67 @@
+import subprocess
+
+import click
+from click.exceptions import Exit
+
+from afterpython.utils import has_pixi, has_uv
+
+
+@click.command()
+@click.option(
+    "--optional",
+    type=str,
+    default=None,
+    required=False,
+    help="Remove from an optional dependency group (pixi: mapped to 'optional' feature)",
+)
+@click.option(
+    "--group",
+    type=str,
+    default=None,
+    required=False,
+    help="Remove from a dependency group (pixi: mapped to same-named feature)",
+)
+@click.argument("lib", type=str, required=True)
+def remove(optional: str | None, group: str | None, lib: str):
+    """Remove a dependency from the project (manages both uv and pixi if present)"""
+    if not has_uv():
+        click.echo("uv not found. Please install uv first.")
+        return
+
+    if optional and group:
+        click.echo("Error: Cannot specify both --optional and --group")
+        raise Exit(1)
+
+    result = subprocess.run(
+        [
+            "uv",
+            "remove",
+            *(["--optional", optional] if optional else []),
+            *(["--group", group] if group else []),
+            lib,
+        ],
+        check=False,
+    )
+    if result.returncode != 0:
+        raise Exit(result.returncode)
+
+    if has_pixi():
+        # NOTE: pixi doesn't support --optional, so we need to use --feature instead
+        if optional:
+            feature_name = "optional"
+        elif group:
+            feature_name = group
+        else:
+            feature_name = None
+        result = subprocess.run(
+            [
+                "pixi",
+                "remove",
+                "--pypi",
+                *(["--feature", feature_name] if feature_name else []),
+                lib,
+            ],
+            check=False,
+        )
+        if result.returncode != 0:
+            raise Exit(result.returncode)

{afterpython-0.1.0.dev8 → afterpython-0.1.0.dev9/src}/afterpython/cli/commands/start.py

@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
@@ -9,7 +10,6 @@ import subprocess
 import click
 from click.exceptions import Exit
 
-
 command_kwargs = {
     "add_help_option": False,  # disable click's --help option so that myst start --help can work
     "context_settings": dict(
@@ -43,9 +43,12 @@ command_kwargs = {
 )
 def start(ctx, doc: bool, blog: bool, tutorial: bool, example: bool, guide: bool):
     """Simple wrapper for `myst start` for convenience"""
-    from afterpython.utils import find_node_env, has_content_for_myst
     from afterpython.const import CONTENT_TYPES
-    from afterpython.utils import handle_passthrough_help
+    from afterpython.utils import (
+        find_node_env,
+        handle_passthrough_help,
+        has_content_for_myst,
+    )
 
     # Show both our options and myst's help and exit
     handle_passthrough_help(

{afterpython-0.1.0.dev8 → afterpython-0.1.0.dev9/src}/afterpython/cli/commands/update.py

@@ -1,12 +1,13 @@
 from __future__ import annotations
+
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
     from afterpython._typing import NodeEnv
     from afterpython.pcu import Dependencies
 
-import subprocess
 import shutil
+import subprocess
 
 import click
 from click.exceptions import Exit
@@ -33,7 +34,7 @@ def update():
 def dependencies(upgrade: bool, all: bool):
     """Update pyproject.toml dependencies to the latest version"""
     from afterpython.pcu import get_dependencies, update_dependencies
-    from afterpython.utils import has_uv
+    from afterpython.utils import has_pixi, has_uv
 
     dependencies: Dependencies = get_dependencies()
     has_at_least_one_update = False
@@ -79,7 +80,9 @@ def dependencies(upgrade: bool, all: bool):
                 raise Exit(result.returncode)
             click.echo(
                 click.style(
-                    "✓ All dependencies upgraded successfully 🎉", fg="green", bold=True
+                    "✓ All dependencies in pyproject.toml upgraded successfully 🎉",
+                    fg="green",
+                    bold=True,
                 )
             )
         else:
@@ -89,6 +92,26 @@ def dependencies(upgrade: bool, all: bool):
     if all:
         subprocess.run(["ap", "pre-commit", "autoupdate"])
         click.echo("All pre-commit hooks updated successfully.")
+        if has_pixi():
+            click.echo("Upgrading dependencies with pixi...")
+            result = subprocess.run(
+                ["pixi", "upgrade", "--exclude", "python"], check=False
+            )
+            if result.returncode != 0:
+                raise Exit(result.returncode)
+            result = subprocess.run(["pixi", "lock"], check=False)
+            if result.returncode != 0:
+                raise Exit(result.returncode)
+            result = subprocess.run(["pixi", "install"], check=False)
+            if result.returncode != 0:
+                raise Exit(result.returncode)
+            click.echo(
+                click.style(
+                    "✓ All dependencies in pixi.toml upgraded successfully 🎉",
+                    fg="green",
+                    bold=True,
+                )
+            )
 
 
 update.add_command(dependencies, name="deps")  # alias for "dependencies"

{afterpython-0.1.0.dev8 → afterpython-0.1.0.dev9/src}/afterpython/cli/main.py

@@ -1,33 +1,89 @@
 import os
 import subprocess
+from collections import defaultdict
 
 import click
+from dotenv import find_dotenv, load_dotenv
 from trogon import tui
-from dotenv import load_dotenv, find_dotenv
 
 import afterpython as ap
 from afterpython import __version__
-from afterpython.cli.commands.init import init
+from afterpython.cli.commands.add import add
 from afterpython.cli.commands.build import build
-from afterpython.cli.commands.dev import dev
-from afterpython.cli.commands.update import update
+from afterpython.cli.commands.bump import bump
 from afterpython.cli.commands.check import check
-from afterpython.cli.commands.install import install
-from afterpython.cli.commands.format import format
-from afterpython.cli.commands.sync import sync
-from afterpython.cli.commands.start import start, doc, blog, tutorial, example, guide
-from afterpython.cli.commands.preview import preview
 from afterpython.cli.commands.clean import clean
-from afterpython.cli.commands.pre_commit import pre_commit
-from afterpython.cli.commands.commitizen import commitizen
 from afterpython.cli.commands.commit import commit
-from afterpython.cli.commands.bump import bump
-from afterpython.cli.commands.release import release
+from afterpython.cli.commands.commitizen import commitizen
+from afterpython.cli.commands.dev import dev
+from afterpython.cli.commands.format import format
+from afterpython.cli.commands.init import init
 from afterpython.cli.commands.init_branch_rules import init_branch_rules
+from afterpython.cli.commands.install import install
+from afterpython.cli.commands.lock import lock
+from afterpython.cli.commands.pre_commit import pre_commit
+from afterpython.cli.commands.preview import preview
+from afterpython.cli.commands.release import release
+from afterpython.cli.commands.remove import remove
+from afterpython.cli.commands.start import blog, doc, example, guide, start, tutorial
+from afterpython.cli.commands.sync import sync
+from afterpython.cli.commands.update import update
+
+
+class AliasGroup(click.Group):
+    """Custom group that displays command aliases together."""
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self._aliases = defaultdict(list)  # Maps primary command -> list of aliases
+        self._alias_to_primary = {}  # Maps alias -> primary command name
+
+    def add_command(self, cmd, name=None):
+        """Track aliases when the same command is added with different names."""
+        name = name or cmd.name
+
+        # Check if this command object was already added under a different name
+        for existing_name, existing_cmd in self.commands.items():
+            if existing_cmd is cmd and existing_name != name:
+                # This is an alias
+                self._aliases[existing_name].append(name)
+                self._alias_to_primary[name] = existing_name
+                break
+
+        super().add_command(cmd, name)
+
+    def format_commands(self, ctx, formatter):
+        """Format commands with aliases shown together."""
+        commands = []
+        for subcommand in self.list_commands(ctx):
+            # Skip aliases - they'll be shown with their primary command
+            if subcommand in self._alias_to_primary:
+                continue
+
+            cmd = self.get_command(ctx, subcommand)
+            if cmd is None:
+                continue
+
+            # Skip hidden commands
+            if cmd.hidden:
+                continue
+
+            help_text = cmd.get_short_help_str(limit=formatter.width)
+
+            # Build command name with aliases
+            aliases = self._aliases.get(subcommand, [])
+            if aliases:
+                subcommand = f"{subcommand}, {', '.join(aliases)}"
+
+            commands.append((subcommand, help_text))
+
+        if commands:
+            with formatter.section("Commands"):
+                formatter.write_dl(commands)
 
 
 @tui(command="tui", help="Open terminal UI")
-@click.group(context_settings={"help_option_names": ["-h", "--help"]})
+@click.group(cls=AliasGroup, context_settings={"help_option_names": ["-h", "--help"]})
 @click.pass_context
 @click.version_option(version=__version__)
 def afterpython_group(ctx):
@@ -65,10 +121,12 @@ afterpython_group.add_command(preview)
 afterpython_group.add_command(clean)
 afterpython_group.add_command(pre_commit)
 afterpython_group.add_command(pre_commit, name="pc")
-afterpython_group.add_command(pre_commit, name="precommit")
 afterpython_group.add_command(commitizen)
 afterpython_group.add_command(commitizen, name="cz")
 afterpython_group.add_command(commit)
 afterpython_group.add_command(bump)
 afterpython_group.add_command(release)
 afterpython_group.add_command(init_branch_rules)
+afterpython_group.add_command(add)
+afterpython_group.add_command(remove)
+afterpython_group.add_command(lock)

{afterpython-0.1.0.dev8 → afterpython-0.1.0.dev9/src}/afterpython/const.py

@@ -1,5 +1,4 @@
 from afterpython._typing import tContentType
 
-
 NODEENV_VERSION = "24.11.0"
 CONTENT_TYPES: set[tContentType] = {"doc", "blog", "tutorial", "example", "guide"}

{afterpython-0.1.0.dev8 → afterpython-0.1.0.dev9/src}/afterpython/pcu.py

@@ -3,7 +3,8 @@ pcu = "pip check updates", similar to ncu (npm check updates in Node.js)
 """
 
 from __future__ import annotations
-from typing import TYPE_CHECKING, TypedDict, NamedTuple, TypeAlias
+
+from typing import TYPE_CHECKING, NamedTuple, TypeAlias, TypedDict
 
 if TYPE_CHECKING:
     from tomlkit.toml_document import TOMLDocument
@@ -60,6 +61,7 @@ async def get_latest_versions(
 ) -> dict[str, Version | None]:
     """Get latest versions for a list of dependencies from PyPI."""
     import httpx
+
     from afterpython.utils import fetch_pypi_json
 
     async def fetch_version(

{afterpython-0.1.0.dev8 → afterpython-0.1.0.dev9/src}/afterpython/templates/ruff-template.toml

@@ -18,7 +18,7 @@ ignore = [
 ]
 # extended rules:
 extend-select = [
-    # "I",     # isort - import sorting
+    "I",     # isort - import sorting
     "UP",    # pyupgrade - upgrade syntax for newer Python
     "B",     # flake8-bugbear - find likely bugs
     "SIM",   # flake8-simplify - simplify code

{afterpython-0.1.0.dev8 → afterpython-0.1.0.dev9/src}/afterpython/tools/_afterpython.py

@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
@@ -7,7 +8,7 @@ if TYPE_CHECKING:
 import tomlkit
 
 import afterpython as ap
-from afterpython._io.toml import read_toml, write_toml, _to_tomlkit
+from afterpython._io.toml import _to_tomlkit, read_toml, write_toml
 
 
 def read_afterpython() -> TOMLDocument:

{afterpython-0.1.0.dev8 → afterpython-0.1.0.dev9/src}/afterpython/tools/branch_rules.py

@@ -9,7 +9,6 @@ from copy import deepcopy
 
 from afterpython.tools._git import is_gh_authenticated
 
-
 DEFAULT_RULESET = {
     "name": "afterpython-default",  # The ruleset identifier in GitHub
     "target": "branch",  # This ruleset applies to branches (not tags)

{afterpython-0.1.0.dev8 → afterpython-0.1.0.dev9/src}/afterpython/tools/commitizen.py

@@ -1,6 +1,5 @@
 import afterpython as ap
 
-
 commitizen_default = {
     "tool": {
         "commitizen": {
@@ -36,8 +35,8 @@ commitizen_pre_commit_hook = {
 
 
 def init_commitizen():
-    from afterpython.tools.pre_commit import update_pre_commit
     from afterpython._io.toml import write_toml
+    from afterpython.tools.pre_commit import update_pre_commit
 
     afterpython_path = ap.paths.afterpython_path
     commitizen_toml_path = afterpython_path / "cz.toml"

{afterpython-0.1.0.dev8 → afterpython-0.1.0.dev9/src}/afterpython/tools/myst.py

@@ -1,15 +1,17 @@
 from __future__ import annotations
+
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
     from pathlib import Path
-    from afterpython._typing import tContentType, NodeEnv
+
+    from afterpython._typing import NodeEnv, tContentType
 
 import subprocess
 
 import afterpython as ap
+from afterpython._io.yaml import read_yaml, write_yaml
 from afterpython.utils import deep_merge
-from afterpython._io.yaml import write_yaml, read_yaml
 
 
 def update_authors_yml(data_update: dict):

{afterpython-0.1.0.dev8 → afterpython-0.1.0.dev9/src}/afterpython/tools/pre_commit.py

@@ -1,9 +1,7 @@
 import subprocess
 
 import afterpython as ap
-
-from afterpython._io.yaml import write_yaml, read_yaml
-
+from afterpython._io.yaml import read_yaml, write_yaml
 
 pre_commit_default = {
     # default is only ["pre-commit"], without changing the default,

{afterpython-0.1.0.dev8 → afterpython-0.1.0.dev9/src}/afterpython/tools/pyproject.py

@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
@@ -9,7 +10,7 @@ import asyncio
 from pyproject_metadata import StandardMetadata
 
 import afterpython as ap
-from afterpython._io.toml import read_toml, write_toml, _to_tomlkit
+from afterpython._io.toml import _to_tomlkit, read_toml, write_toml
 
 
 def read_pyproject() -> TOMLDocument:
@@ -32,8 +33,9 @@ def init_pyproject():
     - add [project.urls] section with homepage, repository, and documentation URLs
     """
     import httpx
-    from afterpython.utils import fetch_pypi_json
+
     from afterpython.tools._git import get_git_user_config, get_github_url
+    from afterpython.utils import fetch_pypi_json
 
     build_backend = "uv_build"
 

{afterpython-0.1.0.dev8 → afterpython-0.1.0.dev9/src}/afterpython/utils.py

@@ -1,9 +1,12 @@
 from __future__ import annotations
+
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
     from pathlib import Path
+
     from httpx import AsyncClient
+
     from afterpython._typing import NodeEnv
 
 import os
@@ -20,6 +23,7 @@ def find_node_env() -> NodeEnv:
     If no, install the Node.js version specified in NODEENV_VERSION
     """
     from mystmd_py.nodeenv import find_any_node
+
     from afterpython.const import NODEENV_VERSION
 
     # from mystmd_py.main import ensure_valid_version

{afterpython-0.1.0.dev8 → afterpython-0.1.0.dev9/src}/afterpython/_paths.py

@@ -1,5 +1,5 @@
-from pathlib import Path
 from dataclasses import dataclass, field
+from pathlib import Path
 
 
 @dataclass

{afterpython-0.1.0.dev8 → afterpython-0.1.0.dev9/src}/afterpython/builders/metadata.py

@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
@@ -8,7 +9,6 @@ import json
 
 import afterpython as ap
 
-
 build_path = ap.paths.build_path
 
 

{afterpython-0.1.0.dev8 → afterpython-0.1.0.dev9/src}/afterpython/cli/commands/sync.py

@@ -10,8 +10,8 @@ from afterpython.utils import convert_author_name_to_id
 
 def _sync_authors_yml(authors: list[tuple[str, str | None]]):
     """Sync authors.yml with authors in pyproject.toml"""
-    from afterpython.tools.myst import update_authors_yml
     from afterpython._io.yaml import read_yaml
+    from afterpython.tools.myst import update_authors_yml
 
     # read myst.yml from docs path to get "version"
     doc_myst_yml = read_yaml(ap.paths.afterpython_path / "doc" / "myst.yml")
@@ -37,15 +37,15 @@ def _sync_authors_yml(authors: list[tuple[str, str | None]]):
 @click.command()
 def sync():
     """Sync between pyproject.toml+afterpython.toml and authors.yml+myst.yml files"""
+    from afterpython._io.toml import _from_tomlkit
     from afterpython.const import CONTENT_TYPES
     from afterpython.tools._afterpython import read_afterpython
+    from afterpython.tools.myst import update_myst_yml
     from afterpython.tools.pyproject import (
         read_metadata,
         read_pyproject,
         write_pyproject,
     )
-    from afterpython._io.toml import _from_tomlkit
-    from afterpython.tools.myst import update_myst_yml
 
     pyproject: StandardMetadata = read_metadata()
     project_name = str(pyproject.name)