feat: add new commands "add", "remove", "lock" to manage both uv and pixi (optional) more conveniently

Author: softwareentrepreneer

afterpython/.pre-commit-config.yaml

@@ -23,7 +23,7 @@ repos:
     stages:
     - pre-commit
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.14.5
+  rev: v0.14.6
   hooks:
   - id: ruff-check
     stages:

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/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",

afterpython/cli/commands/install.py

@@ -3,7 +3,7 @@
 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 @@
     )
 )
 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/update.py

@@ -34,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
@@ -80,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:
@@ -90,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/cli/main.py

@@ -8,6 +8,7 @@
 
 import afterpython as ap
 from afterpython import __version__
+from afterpython.cli.commands.add import add
 from afterpython.cli.commands.build import build
 from afterpython.cli.commands.bump import bump
 from afterpython.cli.commands.check import check
@@ -19,9 +20,11 @@
 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
@@ -124,3 +127,6 @@ def afterpython_group(ctx):
 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/doc/references/roadmap.md

@@ -10,9 +10,10 @@ This roadmap is tentative and subject to change
 - full-text search engine using pagefind
 - incremental build, only build changed content (for `ap dev`)
 - integrate with `git-cliff` for changelog generation
-- integrate with `pixi`, supports `conda install`
 - supports docs built by different engines? e.g. Sphix, MkDocs
 - update `afterpython` itself using `ap update afterpython`
     - it merges the new defaults in a newer version of `afterpython` into your project
     - very difficult, need to create an interactive UX to show the diffs and let the user choose to merge or not
+- add type checker using `ty`
 - support python 3.14
+- integrate with `pixi`, supports `conda install`