afterpython 0.4.0__tar.gz → 0.4.2__tar.gz

{afterpython-0.4.0 → afterpython-0.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: afterpython
-Version: 0.4.0
+Version: 0.4.2
 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
@@ -11,26 +11,27 @@ Classifier: Intended Audience :: Developers
 Classifier: Topic :: Software Development :: Build Tools
 Classifier: Topic :: Software Development :: Documentation
 Classifier: Typing :: Typed
-Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
-Requires-Dist: click>=8.5.0
+Classifier: Programming Language :: Python :: 3.15
+Requires-Dist: click>=8.5.1
 Requires-Dist: trogon>=0.6.0
-Requires-Dist: httpx2>=2.13.1
-Requires-Dist: tomlkit>=0.15.1
+Requires-Dist: httpx2>=2.16.0
+Requires-Dist: tomlkit>=0.15.2
 Requires-Dist: ruamel-yaml>=0.19.1
-Requires-Dist: gitpython>=3.2.0
-Requires-Dist: python-dotenv>=1.2.3
+Requires-Dist: gitpython>=3.2.1
+Requires-Dist: python-dotenv>=1.2.4
 Requires-Dist: pyproject-metadata>=0.12.1
-Requires-Dist: jupytext>=1.19.5
-Requires-Dist: mystmd>=1.11.0
+Requires-Dist: jupytext>=1.19.6
+Requires-Dist: mystmd>=1.12.0
 Requires-Dist: pdoc>=16.0.0
-Requires-Dist: ruff>=0.16.9
-Requires-Dist: prek>=0.5.4
-Requires-Dist: ty>=0.0.84
+Requires-Dist: ruff>=0.17.4
+Requires-Dist: prek>=0.5.10
+Requires-Dist: ty>=0.0.99
 Requires-Dist: git-cliff>=2.14.2
-Requires-Dist: marimo[recommended,lsp]>=0.25.0 ; extra == 'marimo'
-Requires-Python: >=3.12
+Requires-Dist: questionary>=2.1.1
+Requires-Dist: marimo[recommended,lsp]>=0.25.2 ; extra == 'marimo'
+Requires-Python: >=3.13
 Project-URL: homepage, https://afterpython.afterpython.org
 Project-URL: repository, https://github.com/AfterPythonOrg/afterpython
 Project-URL: documentation, https://afterpython.afterpython.org/doc
@@ -44,8 +45,8 @@ Description-Content-Type: text/markdown
 [![PyPI](https://img.shields.io/pypi/v/afterpython.svg?cacheSeconds=300)](https://pypi.org/project/afterpython)
 ![PyPI - Support Python Versions](https://img.shields.io/pypi/pyversions/afterpython?cacheSeconds=300)
 [![Discussions](https://img.shields.io/badge/Discussions-Let's%20Chat-green)](https://github.com/AfterPythonOrg/afterpython/discussions)
-[![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/AfterPythonOrg/afterpython)
 [![View Code Wiki](https://assets.codewiki.google/readme-badge/static.svg)](https://codewiki.google/github.com/afterpythonorg/afterpython?utm_source=badge&utm_medium=github&utm_campaign=github.com/afterpythonorg/afterpython)
+<!--[![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/AfterPythonOrg/afterpython)-->
 <!-- ![PyPI downloads](https://img.shields.io/pypi/dm/afterpython) -->
 <!-- [![Pixi Badge](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/prefix-dev/pixi/main/assets/badge/v0.json)](https://pixi.sh) -->
 
@@ -53,6 +54,7 @@ Description-Content-Type: text/markdown
 [MyST]: https://mystmd.org
 [MyST Markdown]: https://mystmd.org/spec/
 [Jupyter Notebook]: https://jupyter.org
+[marimo]: https://marimo.io
 [pre-commit]: https://pre-commit.com
 [pagefind]: https://pagefind.app
 [SemVer]: https://semver.org
@@ -80,7 +82,7 @@ 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] Write content directly in [MyST Markdown], [Jupyter Notebook] or [marimo] notebooks, with reproducible outputs for marimo
 - [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**

{afterpython-0.4.0 → afterpython-0.4.2}/README.md

@@ -5,8 +5,8 @@
 [![PyPI](https://img.shields.io/pypi/v/afterpython.svg?cacheSeconds=300)](https://pypi.org/project/afterpython)
 ![PyPI - Support Python Versions](https://img.shields.io/pypi/pyversions/afterpython?cacheSeconds=300)
 [![Discussions](https://img.shields.io/badge/Discussions-Let's%20Chat-green)](https://github.com/AfterPythonOrg/afterpython/discussions)
-[![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/AfterPythonOrg/afterpython)
 [![View Code Wiki](https://assets.codewiki.google/readme-badge/static.svg)](https://codewiki.google/github.com/afterpythonorg/afterpython?utm_source=badge&utm_medium=github&utm_campaign=github.com/afterpythonorg/afterpython)
+<!--[![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/AfterPythonOrg/afterpython)-->
 <!-- ![PyPI downloads](https://img.shields.io/pypi/dm/afterpython) -->
 <!-- [![Pixi Badge](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/prefix-dev/pixi/main/assets/badge/v0.json)](https://pixi.sh) -->
 
@@ -14,6 +14,7 @@
 [MyST]: https://mystmd.org
 [MyST Markdown]: https://mystmd.org/spec/
 [Jupyter Notebook]: https://jupyter.org
+[marimo]: https://marimo.io
 [pre-commit]: https://pre-commit.com
 [pagefind]: https://pagefind.app
 [SemVer]: https://semver.org
@@ -41,7 +42,7 @@ 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] Write content directly in [MyST Markdown], [Jupyter Notebook] or [marimo] notebooks, with reproducible outputs for marimo
 - [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**

{afterpython-0.4.0 → afterpython-0.4.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "afterpython"
-version = "0.4.0"
+version = "0.4.2"
 description = "CLI tool to streamline Python package maintenance and generate a dedicated project website"
 license = "Apache-2.0"
 readme = "README.md"
@@ -22,27 +22,28 @@ classifiers = [
     "Topic :: Software Development :: Build Tools",
     "Topic :: Software Development :: Documentation",
     "Typing :: Typed",
-    "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
     "Programming Language :: Python :: 3.14",
+    "Programming Language :: Python :: 3.15",
 ]
-requires-python = ">=3.12"
+requires-python = ">=3.13"
 dependencies = [
-    "click>=8.5.0",
+    "click>=8.5.1",
     "trogon>=0.6.0",
-    "httpx2>=2.13.1",
-    "tomlkit>=0.15.1",
+    "httpx2>=2.16.0",
+    "tomlkit>=0.15.2",
     "ruamel-yaml>=0.19.1",
-    "gitpython>=3.2.0",
-    "python-dotenv>=1.2.3",
+    "gitpython>=3.2.1",
+    "python-dotenv>=1.2.4",
     "pyproject-metadata>=0.12.1",
-    "jupytext>=1.19.5",
-    "mystmd>=1.11.0",
+    "jupytext>=1.19.6",
+    "mystmd>=1.12.0",
     "pdoc>=16.0.0",
-    "ruff>=0.16.9",
-    "prek>=0.5.4",
-    "ty>=0.0.84",
+    "ruff>=0.17.4",
+    "prek>=0.5.10",
+    "ty>=0.0.99",
     "git-cliff>=2.14.2",
+    "questionary>=2.1.1",
 ]
 
 [[project.authors]]
@@ -50,7 +51,7 @@ name = "Stephen Yau"
 email = "softwareentrepreneer+afterpython@gmail.com"
 
 [project.optional-dependencies]
-marimo = ["marimo[recommended,lsp]>=0.25.0"]
+marimo = ["marimo[recommended,lsp]>=0.25.2"]
 
 [project.urls]
 homepage = "https://afterpython.afterpython.org"
@@ -62,7 +63,7 @@ ap = "afterpython.main:run_cli"
 pcu = "afterpython.main:run_pcu"
 
 [build-system]
-requires = ["uv_build>=0.12.21,<0.13.0"]
+requires = ["uv_build>=0.13.7,<0.14.0"]
 build-backend = "uv_build"
 
 [tool.uv.build-backend]

{afterpython-0.4.0 → afterpython-0.4.2}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "afterpython"
-version = "0.4.0"
+version = "0.4.2"
 description = "CLI tool to streamline Python package maintenance and generate a dedicated project website"
 license = "Apache-2.0"
 authors = [
@@ -25,32 +25,32 @@ classifiers = [
     "Topic :: Software Development :: Build Tools",
     "Topic :: Software Development :: Documentation",
     "Typing :: Typed",
-    "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
     "Programming Language :: Python :: 3.14",
-    # "Programming Language :: Python :: 3.15",
+    "Programming Language :: Python :: 3.15",
 ]
-requires-python = ">=3.12"
+requires-python = ">=3.13"
 dependencies = [
-    "click>=8.5.0",
+    "click>=8.5.1",
     "trogon>=0.6.0",
-    "httpx2>=2.13.1",
-    "tomlkit>=0.15.1",
+    "httpx2>=2.16.0",
+    "tomlkit>=0.15.2",
     "ruamel-yaml>=0.19.1",
-    "gitpython>=3.2.0",
-    "python-dotenv>=1.2.3",
+    "gitpython>=3.2.1",
+    "python-dotenv>=1.2.4",
     "pyproject-metadata>=0.12.1",
-    "jupytext>=1.19.5",
-    "mystmd>=1.11.0",
+    "jupytext>=1.19.6",
+    "mystmd>=1.12.0",
     "pdoc>=16.0.0",
-    "ruff>=0.16.9",
-    "prek>=0.5.4",
-    "ty>=0.0.84",
+    "ruff>=0.17.4",
+    "prek>=0.5.10",
+    "ty>=0.0.99",
     "git-cliff>=2.14.2",
+    "questionary>=2.1.1",
 ]
 
 [project.optional-dependencies]
-marimo = ["marimo[recommended,lsp]>=0.25.0"]
+marimo = ["marimo[recommended,lsp]>=0.25.2"]
 
 [project.urls]
 homepage = "https://afterpython.afterpython.org"
@@ -62,7 +62,7 @@ ap = "afterpython.main:run_cli"
 pcu = "afterpython.main:run_pcu"
 
 [build-system]
-requires = ["uv_build>=0.12.21,<0.13.0"]
+requires = ["uv_build>=0.13.7,<0.14.0"]
 build-backend = "uv_build"
 
 [tool.uv]

{afterpython-0.4.0 → afterpython-0.4.2}/src/afterpython/builders/__init__.py

@@ -1,4 +1,5 @@
 from afterpython.builders.build_pdoc import build_pdoc
+from afterpython.builders.comments_json import build_comments_json
 from afterpython.builders.content_json import build_content_json
 from afterpython.builders.faq_json import build_faq_json
 from afterpython.builders.index_md import (
@@ -7,16 +8,19 @@ from afterpython.builders.index_md import (
 )
 from afterpython.builders.jupyter_notebook import build_jupyter_notebooks
 from afterpython.builders.llms_txt import build_llms_txt
+from afterpython.builders.marimo_content import build_marimo_content
 from afterpython.builders.marimo_notebook import build_marimo_readme
 from afterpython.builders.markdown import build_markdown
 from afterpython.builders.metadata import build_metadata
 from afterpython.builders.url_md import build_url_md
 
 __all__ = (
+    "build_comments_json",
     "build_content_json",
     "build_faq_json",
     "build_jupyter_notebooks",
     "build_llms_txt",
+    "build_marimo_content",
     "build_marimo_readme",
     "build_markdown",
     "build_metadata",

{afterpython-0.4.0 → afterpython-0.4.2}/src/afterpython/builders/build_pdoc.py

@@ -19,9 +19,15 @@ def build_pdoc(base_path: str) -> None:
     project logo appears in the top-left of every API page and links
     back to the project website root (matches MyST's UX).
     """
+    from afterpython._io.toml import _from_tomlkit
+    from afterpython.tools._afterpython import read_afterpython
+
     package_dir = find_package_directory()
     output_dir = ap.paths.build_path / "api_reference"
     template_dir = ap.paths.templates_path / "pdoc"
+    # e.g. "google"; unset leaves it to pdoc (a module's __docformat__, else restructuredtext)
+    website = _from_tomlkit(read_afterpython().get("website", {}))
+    docformat = website.get("api_reference_docformat")
 
     click.echo("Building api_reference/...")
 
@@ -45,6 +51,7 @@ def build_pdoc(base_path: str) -> None:
             f"{base_path}/",
             "--template-directory",
             str(template_dir),
+            *(["--docformat", str(docformat)] if docformat else []),
             str(package_dir),
         ],
         env=env,

afterpython-0.4.2/src/afterpython/builders/comments_json.py

@@ -0,0 +1,107 @@
+from __future__ import annotations
+
+import json
+import re
+
+import click
+
+import afterpython as ap
+
+GISCUS_API = "https://giscus.app/api/discussions/categories"
+DEFAULT_CATEGORY = "Announcements"
+
+
+def _read_comments_config() -> dict:
+    from afterpython._io.toml import _from_tomlkit
+    from afterpython.tools._afterpython import read_afterpython
+
+    website = _from_tomlkit(read_afterpython().get("website", {}))
+    return dict(website.get("comments", {}))
+
+
+def _get_github_repo() -> str | None:
+    """Return "owner/repo" from pyproject.toml's repository URL, or the git remote."""
+    from afterpython.tools._git import get_github_url
+    from afterpython.tools.pyproject import read_metadata
+
+    url = str(read_metadata().urls.get("repository", "")) or get_github_url() or ""
+    match = re.search(r"github\.com[/:]([^/]+)/([^/]+?)(?:\.git)?/?$", url)
+    return f"{match[1]}/{match[2]}" if match else None
+
+
+def _fetch_giscus_categories(repo: str) -> dict:
+    """Fetch the repo and category IDs giscus needs. Raises click.ClickException on failure."""
+    import httpx2
+
+    try:
+        response = httpx2.get(GISCUS_API, params={"repo": repo}, timeout=10.0)
+    except httpx2.HTTPError as e:
+        raise click.ClickException(f"could not reach giscus.app ({e})") from e
+    try:
+        data = response.json()
+    except ValueError:
+        data = {}
+    if response.status_code != 200 or "repositoryId" not in data:
+        error = data.get("error") or f"HTTP {response.status_code}"
+        raise click.ClickException(error)
+    return data
+
+
+def build_comments_json():
+    """Build comments.json for the giscus comment section on content pages.
+
+    Reads [website.comments] in afterpython.toml. The website template only
+    shows comments when comments.json exists, so a disabled or failed setup
+    just leaves it out. Never fails the build.
+    """
+    stale = ap.paths.website_path / "static" / "comments.json"
+    stale.unlink(missing_ok=True)
+
+    config = _read_comments_config()
+    if not config.get("enabled", False):
+        click.echo("Comments are disabled, skip building comments.json")
+        return
+
+    def warn(reason: str):
+        click.secho(f"Warning: skip comments, {reason}", fg="yellow")
+
+    repo = _get_github_repo()
+    if not repo:
+        warn(
+            "no GitHub repository found "
+            "(set [project.urls] repository in pyproject.toml)"
+        )
+        return
+
+    category = str(config.get("category") or DEFAULT_CATEGORY)
+    try:
+        data = _fetch_giscus_categories(repo)
+    except click.ClickException as e:
+        warn(
+            f"giscus is not ready for {repo}: {e.message}\n"
+            f"  1. Enable Discussions: https://github.com/{repo}/settings\n"
+            "  2. Install the giscus app: https://github.com/apps/giscus\n"
+            "  Or set [website.comments] enabled = false in afterpython.toml"
+        )
+        return
+
+    category_id = next(
+        (c["id"] for c in data.get("categories", []) if c["name"] == category), None
+    )
+    if not category_id:
+        names = ", ".join(c["name"] for c in data.get("categories", []))
+        warn(
+            f'Discussions category "{category}" not found in {repo} '
+            f"(available: {names or 'none'})"
+        )
+        return
+
+    click.echo(f"Building comments.json ({repo}, {category})...")
+    comments = {
+        "repo": repo,
+        "repoId": data["repositoryId"],
+        "category": category,
+        "categoryId": category_id,
+    }
+    with open(ap.paths.build_path / "comments.json", "w") as f:
+        json.dump(comments, f, indent=2)

{afterpython-0.4.0 → afterpython-0.4.2}/src/afterpython/builders/jupyter_notebook.py

@@ -17,7 +17,7 @@ def _read_notebook(notebook_path: Path, content_path: Path) -> dict | None:
         Notebook dict if valid, None if invalid or error occurred
     """
     try:
-        with open(notebook_path) as f:
+        with open(notebook_path, encoding="utf-8") as f:
             notebook = json.load(f)
     except json.JSONDecodeError:
         click.echo(f"✗ Skipping {content_path} - invalid or empty JSON")
@@ -36,8 +36,11 @@ def _read_notebook(notebook_path: Path, content_path: Path) -> dict | None:
 
 def _write_notebook(notebook: dict, notebook_path: Path):
     """Write a notebook dict to file."""
-    with open(notebook_path, "w") as f:
-        json.dump(notebook, f, indent=1)
+    # match Jupyter's own formatting (unescaped unicode, trailing newline) so
+    # rewriting a committed notebook doesn't produce a noisy diff
+    with open(notebook_path, "w", encoding="utf-8") as f:
+        json.dump(notebook, f, indent=1, ensure_ascii=False)
+        f.write("\n")
 
 
 def _has_frontmatter(notebook: dict) -> bool:
@@ -243,8 +246,10 @@ def build_jupyter_notebooks():
 
         # Iterate over all .ipynb files once
         for notebook_path in path.rglob("*.ipynb"):
-            # Skip files in _build directory
-            if "_build" in notebook_path.parts:
+            # Skip MyST output and hidden tool dirs (.ipynb_checkpoints/,
+            # .virtual_documents/), which aren't content
+            rel_parts = notebook_path.relative_to(path).parts
+            if "_build" in rel_parts or any(p.startswith(".") for p in rel_parts):
                 continue
 
             # Get path relative to afterpython/
@@ -264,9 +269,20 @@ def build_jupyter_notebooks():
             # Track if notebook was modified
             modified = False
 
-            # Add molab badge if enabled
+            # Add molab badge if enabled. A notebook generated from a marimo .py
+            # isn't committed, so the badge must open the .py instead.
             if add_molab_badge and github_url:
-                _add_molab_badge_to_notebook(notebook, github_url, content_path)
+                generated_from = (
+                    notebook.get("metadata", {})
+                    .get("afterpython", {})
+                    .get("generated_from")
+                )
+                molab_path = (
+                    content_path.with_name(generated_from)
+                    if generated_from
+                    else content_path
+                )
+                _add_molab_badge_to_notebook(notebook, github_url, molab_path)
                 modified = True
 
             # Add thumbnail to frontmatter