afterpython 0.1.0__py3-none-any.whl → 0.1.0.dev6__py3-none-any.whl

afterpython/cli/commands/init.py

@@ -7,13 +7,38 @@ import afterpython as ap
 
 
 def init_ruff_toml():
-    ruff_toml_path = ap.paths.afterpython_path / "ruff.toml"
+    from afterpython.tools.pre_commit import update_pre_commit
+
+    afterpython_path = ap.paths.afterpython_path
+    ruff_toml_path = afterpython_path / "ruff.toml"
     if ruff_toml_path.exists():
         click.echo(f"Ruff configuration file {ruff_toml_path} already exists")
         return
     ruff_template_path = ap.paths.templates_path / "ruff-template.toml"
     shutil.copy(ruff_template_path, ruff_toml_path)
     click.echo(f"Created {ruff_toml_path}")
+    # add ruff-pre-commit hook to .pre-commit-config.yaml
+    data_update = {
+        "repos": [
+            {
+                "repo": "https://github.com/astral-sh/ruff-pre-commit",
+                "rev": "v0.14.5",
+                "hooks": [
+                    {
+                        "id": "ruff-check",
+                        "stages": ["pre-commit"],
+                        "args": ["--config", "./afterpython/ruff.toml"],
+                    },
+                    {
+                        "id": "ruff-format",
+                        "stages": ["pre-commit"],
+                        "args": ["--config", "./afterpython/ruff.toml"],
+                    },
+                ],
+            },
+        ]
+    }
+    update_pre_commit(data_update)
 
 
 def init_website():
@@ -21,43 +46,19 @@ def init_website():
     subprocess.run(["ap", "update", "website"])
 
 
-def init_py_typed():
-    from afterpython.tools.pyproject import find_package_directory
-
-    try:
-        package_dir = find_package_directory()
-    except FileNotFoundError:
-        click.echo(
-            "Could not find package directory (__init__.py not found), skipping py-typed initialization"
-        )
-        return
-    py_typed_path = package_dir / "py.typed"
-    if py_typed_path.exists():
-        click.echo(f"py.typed file already exists at {py_typed_path}")
-        return
-    py_typed_path.touch()
-    click.echo(f"Created {py_typed_path}")
-
-
 @click.command()
-@click.option(
-    "--yes",
-    "-y",
-    is_flag=True,
-    help="Automatically answer yes to all prompts",
-)
 @click.pass_context
-def init(ctx, yes):
-    """Initialize AfterPython project structure and website template"""
+def init(ctx):
+    """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_dependabot,
-        create_workflow,
+        init_release_workflow,
+        init_deploy_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...")
@@ -66,6 +67,7 @@ def init(ctx, yes):
 
     afterpython_path.mkdir(parents=True, exist_ok=True)
     static_path.mkdir(parents=True, exist_ok=True)
+    afterpython_path.joinpath("afterpython.toml").touch()
 
     init_pyproject()
 
@@ -77,31 +79,20 @@ def init(ctx, yes):
 
     init_website()
 
-    # TODO: add type checking related stuff here
-    init_py_typed()
-
-    create_workflow("deploy")
-    create_workflow("ci")
-
-    if yes or click.confirm(
+    if click.confirm(
         f"\nCreate .pre-commit-config.yaml in {afterpython_path}?", default=True
     ):
         init_pre_commit()
 
-    if yes or click.confirm(f"\nCreate ruff.toml in {afterpython_path}?", default=True):
+    if click.confirm(f"\nCreate ruff.toml in {afterpython_path}?", default=True):
         init_ruff_toml()
 
-    if yes or click.confirm(
+    if click.confirm(
         f"\nCreate commitizen configuration (cz.toml) in {afterpython_path} "
         f"and release workflow in .github/workflows/release.yml?",
         default=True,
     ):
         init_commitizen()
-        create_workflow("release")
+        init_release_workflow()
 
-    if yes or click.confirm(
-        "\nCreate Dependabot configuration (.github/dependabot.yml) "
-        "to auto-update GitHub Actions versions?",
-        default=True,
-    ):
-        create_dependabot()
+    init_deploy_workflow()

afterpython/cli/commands/install.py

@@ -3,7 +3,7 @@ import subprocess
 import click
 from click.exceptions import Exit
 
-from afterpython.utils import has_pixi, has_uv
+from afterpython.utils import has_uv
 
 
 @click.command(
@@ -13,16 +13,10 @@ from afterpython.utils import has_pixi, has_uv
     )
 )
 def install():
-    """Install all project dependencies (manages both uv and pixi if present)"""
+    """Run 'uv sync --all-extras --all-groups' to install all dependencies"""
     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/pre_commit.py

@@ -27,7 +27,7 @@ def _command_supports_config(command: str) -> bool:
 )
 @click.pass_context
 def pre_commit(ctx):
-    """Run pre-commit hooks (uses afterpython/.pre-commit-config.yaml if available)"""
+    """Run pre-commit, always use the afterpython/.pre-commit-config.yaml if it exists"""
     from afterpython.utils import handle_passthrough_help
 
     # Show both our options and pre-commit's help and exit

afterpython/cli/commands/preview.py

@@ -7,7 +7,7 @@ from click.exceptions import Exit
 @click.command()
 @click.pass_context
 def preview(ctx):
-    """Preview the production build of the project website"""
+    """Preview the production build of the project website (including myst's builds)"""
     from afterpython.utils import find_node_env
 
     paths = ctx.obj["paths"]

afterpython/cli/commands/start.py

@@ -1,5 +1,4 @@
 from __future__ import annotations
-
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
@@ -10,6 +9,7 @@ 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(
@@ -42,13 +42,10 @@ command_kwargs = {
     "--guide", is_flag=True, help="Start the development server for guide/ directory"
 )
 def start(ctx, doc: bool, blog: bool, tutorial: bool, example: bool, guide: bool):
-    """Start MyST development server for a specific content type"""
+    """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 (
-        find_node_env,
-        handle_passthrough_help,
-        has_content_for_myst,
-    )
+    from afterpython.utils import handle_passthrough_help
 
     # Show both our options and myst's help and exit
     handle_passthrough_help(

afterpython/cli/commands/sync.py

@@ -5,13 +5,13 @@ from pyproject_metadata import StandardMetadata
 from tomlkit.toml_document import TOMLDocument
 
 import afterpython as ap
-from afterpython.utils import convert_author_name_to_id, normalize_static_path
+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._io.yaml import read_yaml
     from afterpython.tools.myst import update_authors_yml
+    from afterpython._io.yaml import read_yaml
 
     # read myst.yml from docs path to get "version"
     doc_myst_yml = read_yaml(ap.paths.afterpython_path / "doc" / "myst.yml")
@@ -36,56 +36,34 @@ def _sync_authors_yml(authors: list[tuple[str, str | None]]):
 
 @click.command()
 def sync():
-    """Sync configuration between pyproject.toml/afterpython.toml and authors.yml/myst.yml"""
-    from afterpython._io.toml import _from_tomlkit
+    """Sync between pyproject.toml+afterpython.toml and authors.yml+myst.yml files"""
     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 = read_afterpython()
     github_url = str(pyproject.urls.get("repository", ""))
-    company_name = str(_from_tomlkit(afterpython.get("company", {})).get("name", ""))
-    company_url = str(_from_tomlkit(afterpython.get("company", {})).get("url", ""))
-    website_url = str(_from_tomlkit(afterpython.get("website", {})).get("url", ""))
-    try:
-        website_favicon = normalize_static_path(
-            str(_from_tomlkit(afterpython.get("website", {})).get("favicon", ""))
-        )
-        website_logo = normalize_static_path(
-            str(_from_tomlkit(afterpython.get("website", {})).get("logo", ""))
-        )
-        website_logo_dark = normalize_static_path(
-            str(_from_tomlkit(afterpython.get("website", {})).get("logo_dark", ""))
-        )
-        website_thumbnail = normalize_static_path(
-            str(_from_tomlkit(afterpython.get("website", {})).get("thumbnail", ""))
-        )
-    except ValueError as e:
-        click.echo(f"Error in reading afterpython.toml: {e}")
-        return
-
+    company_name = str(_from_tomlkit(afterpython["company"]).get("name", ""))
+    company_url = str(_from_tomlkit(afterpython["company"]).get("url", ""))
+    website_url = str(_from_tomlkit(afterpython["website"]).get("url", ""))
     authors = pyproject.authors
-    if company_name and company_url:
-        nav_bar = [{"title": company_name, "url": company_url}]
-    else:
-        nav_bar = []
-    if website_url:
-        nav_bar.extend(
-            [
-                {
-                    "title": content_type.capitalize() + "s",
-                    "url": f"{website_url}/{content_type}",
-                }
-                for content_type in CONTENT_TYPES
-            ]
-        )
+    nav_bar = [
+        {
+            "title": content_type.capitalize() + "s",
+            "url": f"{website_url}/{content_type}",
+        }
+        if website_url
+        else ""
+        for content_type in CONTENT_TYPES
+    ]
 
     _sync_authors_yml(authors)
 
@@ -100,9 +78,9 @@ def sync():
     # based on the current values in pyproject.toml and afterpython.toml
     for content_type in CONTENT_TYPES:
         path = ap.paths.afterpython_path / content_type
-        # nav_bar_per_content_type = [
-        #     item for item in nav_bar if item["title"] != content_type.capitalize() + "s"
-        # ]
+        nav_bar_per_content_type = [
+            item for item in nav_bar if item["title"] != content_type.capitalize() + "s"
+        ]
         title = project_name + f"'s {content_type.capitalize()}"
         data = {
             "project": {
@@ -120,24 +98,14 @@ def sync():
                 "description": str(pyproject.description),
                 "keywords": list(map(str, pyproject.keywords)),
                 "github": github_url,
-                "thumbnail": "../static" + website_thumbnail
-                if website_thumbnail
-                else "",
             },
             "site": {
                 "title": title,
                 "options": {
-                    "favicon": "../static" + website_favicon if website_favicon else "",
-                    "logo": "../static" + website_logo if website_logo else "",
-                    "logo_dark": "../static" + website_logo_dark
-                    if website_logo_dark
-                    else "",
                     "logo_text": project_name,
                     "logo_url": website_url,
                 },
-                # FIXME: disable nav bar for now until myst fixes the issue with the nav bar
-                # the current issue is they prepend the BASE_URL to the nav bar links even they are external
-                # "nav": nav_bar_per_content_type,
+                "nav": nav_bar_per_content_type,
                 "actions": [
                     {
                         "title": "⭐ Star",

afterpython/cli/commands/update.py

@@ -1,13 +1,12 @@
 from __future__ import annotations
-
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
     from afterpython._typing import NodeEnv
     from afterpython.pcu import Dependencies
 
-import shutil
 import subprocess
+import shutil
 
 import click
 from click.exceptions import Exit
@@ -24,17 +23,17 @@ def update():
     "-u",
     "--upgrade",
     is_flag=True,
-    help="Upgrade dependencies to their latest versions",
+    help="if enabled, the dependencies will be upgraded to the latest version",
 )
 @click.option(
     "--all",
     is_flag=True,
-    help="Also update pre-commit hooks and pixi dependencies",
+    help="update all versions in dependencies and tool configurations (e.g. pre-commit-config.yaml)",
 )
 def dependencies(upgrade: bool, all: bool):
-    """Check and update project dependencies to latest versions"""
+    """Update pyproject.toml dependencies to the latest version"""
     from afterpython.pcu import get_dependencies, update_dependencies
-    from afterpython.utils import has_pixi, has_uv
+    from afterpython.utils import has_uv
 
     dependencies: Dependencies = get_dependencies()
     has_at_least_one_update = False
@@ -80,9 +79,7 @@ def dependencies(upgrade: bool, all: bool):
                 raise Exit(result.returncode)
             click.echo(
                 click.style(
-                    "✓ All dependencies in pyproject.toml upgraded successfully 🎉",
-                    fg="green",
-                    bold=True,
+                    "✓ All dependencies upgraded successfully 🎉", fg="green", bold=True
                 )
             )
         else:
@@ -92,26 +89,6 @@ 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"
@@ -122,10 +99,10 @@ update.add_command(dependencies, name="deps")  # alias for "dependencies"
 @click.option(
     "--no-backup",
     is_flag=True,
-    help="Skip creating a backup of the existing website template",
+    help="if enabled, the existing project website template will not be backed up",
 )
 def website(ctx, no_backup: bool):
-    """Update project website template to the latest version"""
+    """Update the project website template to the latest version"""
     from afterpython.utils import find_node_env
 
     website_template_repo = "AfterPythonOrg/project-website-template"

afterpython/cli/main.py

@@ -1,89 +1,32 @@
 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.add import add
+from afterpython.cli.commands.init import init
 from afterpython.cli.commands.build import build
-from afterpython.cli.commands.bump import bump
-from afterpython.cli.commands.check import check
-from afterpython.cli.commands.clean import clean
-from afterpython.cli.commands.commit import commit
-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.update import update
+from afterpython.cli.commands.check import check
 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.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.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(cls=AliasGroup, context_settings={"help_option_names": ["-h", "--help"]})
+@click.group(context_settings={"help_option_names": ["-h", "--help"]})
 @click.pass_context
 @click.version_option(version=__version__)
 def afterpython_group(ctx):
@@ -107,7 +50,6 @@ afterpython_group.add_command(build)
 afterpython_group.add_command(dev)
 afterpython_group.add_command(update)
 afterpython_group.add_command(check)
-afterpython_group.add_command(check, name="lint")
 afterpython_group.add_command(format)
 afterpython_group.add_command(sync)
 afterpython_group.add_command(start)
@@ -121,12 +63,9 @@ 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/const.py

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

afterpython/cz.toml

@@ -0,0 +1,27 @@
+[tool.commitizen]
+name = "cz_conventional_commits"
+# name = "cz_customize"
+tag_format = "v$version"
+version_scheme = "pep440"
+version_provider = "uv"
+update_changelog_on_bump = false
+major_version_zero = true
+
+# FIXME: commitizen can't even add a few custom types like "chore" and "wip", skip it for now
+# [[tool.commitizen.customize.questions]]
+# type = "list"
+# name = "change_type"
+# choices = [
+#     {value = "fix", name = "fix: A bug fix. Correlates with PATCH in SemVer"},
+#     {value = "feat", name = "feat: A new feature. Correlates with MINOR in SemVer"},
+#     {value = "docs", name = "docs: Documentation only changes"},
+#     {value = "style", name = "style: Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc)"},
+#     {value = "refactor", name = "refactor: A code change that neither fixes a bug nor adds a feature"},
+#     {value = "perf", name = "perf: A code change that improves performance"},
+#     {value = "test", name = "test: Adding missing or correcting existing tests"},
+#     {value = "build", name = "build: Changes that affect the build system or external dependencies (example scopes: pip, docker, npm)"},
+#     {value = "ci", name = "ci: Changes to CI configuration files and scripts (example scopes: GitLabCI)"},
+#     {value = "chore", name = "chore: Other changes that don't modify src or test files"},
+#     {value = "wip", name = "wip: Work in progress"}
+# ]
+# message = "Select the type of change you are committing"

afterpython/pcu.py

@@ -3,8 +3,7 @@ pcu = "pip check updates", similar to ncu (npm check updates in Node.js)
 """
 
 from __future__ import annotations
-
-from typing import TYPE_CHECKING, NamedTuple, TypeAlias, TypedDict
+from typing import TYPE_CHECKING, TypedDict, NamedTuple, TypeAlias
 
 if TYPE_CHECKING:
     from tomlkit.toml_document import TOMLDocument
@@ -61,7 +60,6 @@ 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/templates/deploy-workflow-template.yml

@@ -35,7 +35,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - name: Install pnpm
         uses: pnpm/action-setup@v4
@@ -43,19 +43,19 @@ jobs:
           version: 10
 
       - name: Set up Node.js
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v4
         with:
           node-version: '24'
           cache: 'pnpm'
           cache-dependency-path: './afterpython/_website/pnpm-lock.yaml'
 
       - name: Set up Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v5
         with:
           python-version: '3.11'
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v7
+        uses: astral-sh/setup-uv@v5
         with:
           version: "latest"
 
@@ -71,7 +71,7 @@ jobs:
           ap build
 
       - name: Upload artifact
-        uses: actions/upload-pages-artifact@v4
+        uses: actions/upload-pages-artifact@v3
         with:
           path: './afterpython/_website/build'
 

afterpython/templates/release-workflow-template.yml

@@ -14,15 +14,15 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - name: Set up Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v5
         with:
           python-version: '3.11'
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v7
+        uses: astral-sh/setup-uv@v5
         with:
           version: "latest"