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

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"}
+CONTENT_TYPES: list[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"
 
@@ -69,9 +69,11 @@ jobs:
       - name: Build website
         run: |
           ap build
+        env:
+          BASE_PATH: '/${{ github.event.repository.name }}'
 
       - 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"
 

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/tools/_afterpython.py

@@ -1,71 +1,13 @@
 from __future__ import annotations
-
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
-    from pathlib import Path
-
     from tomlkit.toml_document import TOMLDocument
 
-    from afterpython._typing import tContentType
-
 import tomlkit
 
 import afterpython as ap
-from afterpython._io.toml import _to_tomlkit, read_toml, write_toml
-
-
-def get_default_thumbnail(
-    content_type: tContentType, file_path: Path | None = None
-) -> str:
-    """Get the default thumbnail value for a content type.
-
-    Reads default thumbnail configuration from afterpython.toml:
-    - Content type specific thumbnail: [website.{content_type}.thumbnail]
-    - Website-wide default thumbnail: [website.thumbnail]
-    - Falls back to empty string if no default is configured
-
-    Args:
-        content_type: The content type (blog, tutorial, etc.)
-        file_path: Optional path to the file needing the thumbnail (for calculating relative path)
-
-    Returns:
-        The thumbnail value to use (e.g., "./static/image.png", "../static/image.png", or "")
-    """
-    from afterpython._io.toml import _from_tomlkit
-    from afterpython.utils import get_relative_static_prefix, normalize_static_path
-
-    afterpython = read_afterpython()
-    try:
-        # website_default_thumbnail = normalize_static_path(
-        #     str(_from_tomlkit(afterpython.get("website", {})).get("thumbnail", ""))
-        # )
-        content_type_default_thumbnail = normalize_static_path(
-            str(
-                _from_tomlkit(afterpython.get("website", {}))
-                .get(content_type, {})
-                .get("thumbnail", "")
-            )
-        )
-    except ValueError as e:
-        print(f"Error in reading afterpython.toml for {content_type=}: {e}")
-        return "null"
-
-    # Determine the static prefix based on file location
-    if file_path is not None:
-        content_type_path = ap.paths.afterpython_path / content_type.lower()
-        static_prefix = get_relative_static_prefix(file_path, content_type_path)
-    else:
-        static_prefix = "./"  # Default fallback
-
-    if content_type_default_thumbnail:
-        return f"{static_prefix}static{content_type_default_thumbnail}"
-    # use "thumbnail" set in afterpython.toml [website]
-    # elif website_default_thumbnail:
-    # Website-wide static is one level up from content_type folder
-    # return f"{static_prefix}../static{website_default_thumbnail}"
-    else:
-        return ""
+from afterpython._io.toml import read_toml, write_toml, _to_tomlkit
 
 
 def read_afterpython() -> TOMLDocument:
@@ -112,17 +54,12 @@ def init_afterpython():
         return
     afterpython_toml_path.touch()
     print(f"Created {afterpython_toml_path}")
-    default_data = {
-        "company": {
-            "name": "",
-            "url": "",
-        },
-        "website": {
-            "url": "",
-            "favicon": "favicon.svg",
-            "logo": "logo.svg",
-            "logo_dark": "logo.svg",
-            "thumbnail": "thumbnail.png",
-        },
-    }
-    update_afterpython(default_data)
+    update_afterpython(
+        {
+            "company": {
+                "name": "",
+                "url": "",
+            },
+            "website": {"url": ""},
+        }
+    )

afterpython/tools/_git.py

@@ -58,7 +58,7 @@ def get_github_url() -> str | None:
         return None
 
 
-def is_gh_authenticated():
+def setup_github_auth():
     """Guide user through GitHub authentication."""
     if not has_gh():
         print("""
@@ -89,6 +89,7 @@ Please authenticate with GitHub:
         """)
         return False
 
+    print("✓ GitHub authentication verified")
     return True
 
 
@@ -106,32 +107,5 @@ def get_github_username() -> str | None:
     return result.stdout.strip()
 
 
-def get_current_user_id() -> int | None:
-    """
-    Get the GitHub user ID of the currently authenticated user.
-
-    Returns:
-        User ID or None if error
-    """
-    if not is_gh_authenticated():
-        return None
-
-    result = subprocess.run(
-        ["gh", "api", "user", "--jq", ".id"],
-        capture_output=True,
-        text=True,
-    )
-
-    if result.returncode != 0:
-        print(f"Error fetching user ID: {result.stderr}")
-        return None
-
-    try:
-        return int(result.stdout.strip())
-    except ValueError:
-        print("Error: Failed to parse user ID")
-        return None
-
-
 # TODO: use gh's token for pygithub to get repo issues
 # def get_repo_issues(owner: str, repo: str) -> list[dict]:

afterpython/tools/commitizen.py

@@ -1,13 +1,53 @@
-import shutil
-
 import afterpython as ap
 
 
+commitizen_default = {
+    "tool": {
+        "commitizen": {
+            "name": "cz_conventional_commits",
+            "tag_format": "v$version",
+            "version_scheme": "pep440",
+            "version_provider": "uv",
+            "update_changelog_on_bump": False,
+            "major_version_zero": True,
+        }
+    }
+}
+
+
+commitizen_pre_commit_hook = {
+    "repos": [
+        {
+            "repo": "https://github.com/commitizen-tools/commitizen",
+            "rev": "v4.10.0",
+            "hooks": [
+                {
+                    "id": "commitizen",
+                    "stages": ["commit-msg"],
+                },
+                {
+                    "id": "commitizen-branch",
+                    "stages": ["pre-push"],
+                },
+            ],
+        },
+    ]
+}
+
+
 def init_commitizen():
-    commitizen_toml_path = ap.paths.afterpython_path / "cz.toml"
+    from afterpython.tools.pre_commit import update_pre_commit
+    from afterpython._io.toml import write_toml
+
+    afterpython_path = ap.paths.afterpython_path
+    commitizen_toml_path = afterpython_path / "cz.toml"
     if commitizen_toml_path.exists():
         print(f"Commitizen configuration file {commitizen_toml_path} already exists")
         return
-    cz_template_path = ap.paths.templates_path / "cz-template.toml"
-    shutil.copy(cz_template_path, commitizen_toml_path)
+
+    # Create commitizen configuration with default values
+    write_toml(commitizen_toml_path, commitizen_default)
     print(f"Created {commitizen_toml_path}")
+
+    # add commitizen hook to .pre-commit-config.yaml
+    update_pre_commit(commitizen_pre_commit_hook)

afterpython/tools/github_actions.py

@@ -1,48 +1,78 @@
 import shutil
-from pathlib import Path
 
 import click
 
 import afterpython as ap
 
 
-def _copy_github_template(template_name: str, target_path: Path):
-    """Helper to copy GitHub-related templates"""
-    if target_path.exists():
-        click.echo(f"{target_path} already exists")
+def init_release_workflow():
+    """Initialize GitHub Actions release workflow.
+
+    Creates .github/workflows/release.yml in the user's project root.
+    This workflow triggers on version tags and:
+    - Builds the package with uv
+    - Publishes to PyPI using trusted publishing
+    - Creates GitHub releases (with pre-release detection)
+    """
+    user_path = ap.paths.user_path
+    workflow_dir = user_path / ".github" / "workflows"
+    workflow_path = workflow_dir / "release.yml"
+
+    if workflow_path.exists():
+        click.echo(f"GitHub Actions release workflow {workflow_path} already exists")
         return
 
-    # Create parent directory if it doesn't exist
-    target_path.parent.mkdir(parents=True, exist_ok=True)
+    # Create .github/workflows directory if it doesn't exist
+    workflow_dir.mkdir(parents=True, exist_ok=True)
 
     # Copy template from package
-    template_path = ap.paths.templates_path / template_name
+    template_path = ap.paths.templates_path / "release-workflow-template.yml"
     if not template_path.exists():
         raise FileNotFoundError(
             f"Template file not found: {template_path}\n"
             "This might indicate a corrupted installation. Please reinstall afterpython."
         )
 
-    shutil.copy(template_path, target_path)
-    print(f"Created {target_path}")
+    shutil.copy(template_path, workflow_path)
+    click.echo(f"Created {workflow_path}")
+    click.echo(
+        "\n📋 Next steps to enable releases:\n"
+        "   1. Enable PyPI trusted publishing:\n"
+        "      - Go to https://pypi.org/manage/account/publishing/\n"
+        "      - Add your repository and workflow file: release.yml\n"
+        "   2. Push tags to trigger releases:\n"
+        "      - Use 'ap bump --release' for stable releases (auto-pushes tag)\n"
+        "      - Use 'ap bump --pre' then 'ap release' for pre-releases\n"
+    )
 
 
-def create_workflow(workflow_name: str):
-    """Create a GitHub Actions workflow from template"""
-    if ".yml" in workflow_name:
-        workflow_name = workflow_name.replace(".yml", "")
+def init_deploy_workflow():
+    """Initialize GitHub Actions deployment workflow for GitHub Pages.
 
+    Creates .github/workflows/deploy.yml in the user's project root.
+    This workflow triggers on pushes to main branch and:
+    - Builds the project website with 'ap build'
+    - Deploys to GitHub Pages
+    - Allows manual deployment via workflow_dispatch
+    """
     user_path = ap.paths.user_path
-    workflow_path = user_path / ".github" / "workflows" / f"{workflow_name}.yml"
-    template_name = f"{workflow_name}-workflow-template.yml"
+    workflow_dir = user_path / ".github" / "workflows"
+    workflow_path = workflow_dir / "deploy.yml"
 
-    _copy_github_template(template_name, workflow_path)
+    if workflow_path.exists():
+        click.echo(f"GitHub Actions deploy workflow {workflow_path} already exists")
+        return
 
+    # Create .github/workflows directory if it doesn't exist
+    workflow_dir.mkdir(parents=True, exist_ok=True)
 
-def create_dependabot():
-    """Create Dependabot configuration for GitHub Actions updates"""
-    user_path = ap.paths.user_path
-    dependabot_path = user_path / ".github" / "dependabot.yml"
-    template_name = "dependabot-template.yml"
+    # Copy template from package
+    template_path = ap.paths.templates_path / "deploy-workflow-template.yml"
+    if not template_path.exists():
+        raise FileNotFoundError(
+            f"Template file not found: {template_path}\n"
+            "This might indicate a corrupted installation. Please reinstall afterpython."
+        )
 
-    _copy_github_template(template_name, dependabot_path)
+    shutil.copy(template_path, workflow_path)
+    click.echo(f"Created {workflow_path}")