afterpython 0.1.0.dev7__py3-none-any.whl → 0.1.0.dev9__py3-none-any.whl

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/_paths.py

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

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/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/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/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/cli/__init__.py

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

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/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()
@@ -77,7 +79,7 @@ def prebuild():
     _check_initialized()
     _clean_build_directory()
 
-    if os.getenv("AP_MOLAB_BADGE", "0") == "1":
+    if os.getenv("AP_MOLAB_BADGE", "1") == "1":
         for content_type in CONTENT_TYPES:
             add_molab_badge_to_jupyter_notebooks(content_type)
 
@@ -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/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/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/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/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",
@@ -47,18 +47,24 @@ def init_website():
 
 
 @click.command()
+@click.option(
+    "--yes",
+    "-y",
+    is_flag=True,
+    help="Automatically answer yes to all prompts",
+)
 @click.pass_context
-def init(ctx):
+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 (
-        init_release_workflow,
-        init_deploy_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...")
@@ -79,20 +85,28 @@ def init(ctx):
 
     init_website()
 
-    if click.confirm(
+    create_workflow("deploy")
+    create_workflow("ci")
+
+    if yes or click.confirm(
         f"\nCreate .pre-commit-config.yaml in {afterpython_path}?", default=True
     ):
         init_pre_commit()
 
-    if click.confirm(f"\nCreate ruff.toml in {afterpython_path}?", default=True):
+    if yes or click.confirm(f"\nCreate ruff.toml in {afterpython_path}?", default=True):
         init_ruff_toml()
 
-    if click.confirm(
+    if yes or click.confirm(
         f"\nCreate commitizen configuration (cz.toml) in {afterpython_path} "
         f"and release workflow in .github/workflows/release.yml?",
         default=True,
     ):
         init_commitizen()
-        init_release_workflow()
+        create_workflow("release")
 
-    init_deploy_workflow()
+    if yes or click.confirm(
+        "\nCreate Dependabot configuration (.github/dependabot.yml) "
+        "to auto-update GitHub Actions versions?",
+        default=True,
+    ):
+        create_dependabot()

afterpython/cli/commands/init_branch_rules.py

@@ -0,0 +1,9 @@
+import click
+
+
+@click.command()
+def init_branch_rules():
+    """Create default branch protection rules for the current repository"""
+    from afterpython.tools.branch_rules import create_default_branch_rules
+
+    create_default_branch_rules()

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/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/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/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/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)

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"