afterpython 0.1.0.dev11__tar.gz → 0.1.0.dev15__tar.gz

{afterpython-0.1.0.dev11 → afterpython-0.1.0.dev15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: afterpython
-Version: 0.1.0.dev11
+Version: 0.1.0.dev15
 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

{afterpython-0.1.0.dev11 → afterpython-0.1.0.dev15}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "afterpython"
-version = "0.1.0.dev11"
+version = "0.1.0.dev15"
 description = "CLI tool to streamline Python package maintenance and generate a dedicated project website"
 license = "Apache-2.0"
 authors = [

{afterpython-0.1.0.dev11 → afterpython-0.1.0.dev15}/src/afterpython/cli/commands/bump.py

@@ -1,6 +1,9 @@
 import subprocess
 
 import click
+from click.exceptions import Exit
+
+from afterpython.utils import has_pixi
 
 
 @click.command(
@@ -86,3 +89,9 @@ def bump(ctx, release: bool, pre: bool):
                 args = ["--prerelease", prerelease_type, *ctx.args]
 
         subprocess.run(["ap", "cz", "bump", *args])
+
+    # Update pixi.lock after version bump (editable install requires lock refresh)
+    if has_pixi():
+        result = subprocess.run(["pixi", "install"], check=False)
+        if result.returncode != 0:
+            raise Exit(result.returncode)

{afterpython-0.1.0.dev11 → afterpython-0.1.0.dev15}/src/afterpython/cli/commands/init.py

@@ -7,38 +7,13 @@ import afterpython as ap
 
 
 def init_ruff_toml():
-    from afterpython.tools.pre_commit import update_pre_commit
-
-    afterpython_path = ap.paths.afterpython_path
-    ruff_toml_path = afterpython_path / "ruff.toml"
+    ruff_toml_path = ap.paths.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.6",
-                "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():
@@ -46,6 +21,24 @@ 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",
@@ -85,6 +78,9 @@ def init(ctx, yes):
 
     init_website()
 
+    # TODO: add type checking related stuff here
+    init_py_typed()
+
     create_workflow("deploy")
     create_workflow("ci")
 

afterpython-0.1.0.dev15/src/afterpython/templates/cz-template.toml

@@ -0,0 +1,8 @@
+[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

afterpython-0.1.0.dev15/src/afterpython/templates/pre-commit-config-template.yaml

@@ -0,0 +1,48 @@
+default_install_hook_types:
+- pre-commit
+- commit-msg
+- pre-push
+exclude: ^afterpython/_website/
+repos:
+- repo: https://github.com/pre-commit/pre-commit-hooks
+  rev: v6.0.0
+  hooks:
+  - id: trailing-whitespace
+    stages:
+    - pre-commit
+  - id: end-of-file-fixer
+    stages:
+    - pre-commit
+  - id: check-yaml
+    stages:
+    - pre-commit
+  - id: check-toml
+    stages:
+    - pre-commit
+  - id: check-added-large-files
+    stages:
+    - pre-commit
+- repo: https://github.com/astral-sh/ruff-pre-commit
+  rev: v0.14.6
+  hooks:
+  - id: ruff-check
+    stages:
+    - pre-commit
+    args:
+    - --config
+    - ./afterpython/ruff.toml
+  - id: ruff-format
+    stages:
+    - pre-commit
+    args:
+    - --config
+    - ./afterpython/ruff.toml
+- repo: https://github.com/commitizen-tools/commitizen
+  rev: v4.10.0
+  hooks:
+  - id: commitizen
+    stages:
+    - commit-msg
+  - id: commitizen-branch
+    stages:
+    - pre-push

afterpython-0.1.0.dev15/src/afterpython/tools/commitizen.py

@@ -0,0 +1,13 @@
+import shutil
+
+import afterpython as ap
+
+
+def init_commitizen():
+    commitizen_toml_path = ap.paths.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)
+    print(f"Created {commitizen_toml_path}")

afterpython-0.1.0.dev15/src/afterpython/tools/pre_commit.py

@@ -0,0 +1,37 @@
+import shutil
+import subprocess
+
+import afterpython as ap
+from afterpython._io.yaml import read_yaml, write_yaml
+
+
+def install_pre_commit():
+    # installed in .git/hooks
+    subprocess.run(["ap", "pre-commit", "install", "--install-hooks"], check=True)
+
+
+def update_pre_commit(data_update: dict):
+    from afterpython.utils import deep_merge
+
+    pre_commit_path = ap.paths.afterpython_path / ".pre-commit-config.yaml"
+    if not pre_commit_path.exists():
+        raise FileNotFoundError(
+            f".pre-commit-config.yaml not found at {pre_commit_path}"
+        )
+    existing_data = read_yaml(pre_commit_path)
+    existing_data = deep_merge(existing_data, data_update)
+    write_yaml(pre_commit_path, existing_data)
+    install_pre_commit()
+
+
+def init_pre_commit():
+    pre_commit_path = ap.paths.afterpython_path / ".pre-commit-config.yaml"
+    if pre_commit_path.exists():
+        print(f".pre-commit-config.yaml already exists at {pre_commit_path}")
+        return
+    pre_commit_template_path = (
+        ap.paths.templates_path / "pre-commit-config-template.yaml"
+    )
+    shutil.copy(pre_commit_template_path, pre_commit_path)
+    print(f"Created {pre_commit_path}")
+    install_pre_commit()

{afterpython-0.1.0.dev11 → afterpython-0.1.0.dev15}/src/afterpython/tools/pyproject.py

@@ -6,6 +6,7 @@ if TYPE_CHECKING:
     from tomlkit.toml_document import TOMLDocument
 
 import asyncio
+from pathlib import Path
 
 from pyproject_metadata import StandardMetadata
 
@@ -27,6 +28,41 @@ def read_metadata() -> StandardMetadata:
     return StandardMetadata.from_pyproject(read_pyproject())
 
 
+def find_package_directory() -> Path:
+    """Find the user's package directory.
+
+    Supports both common Python project layouts:
+    - src layout: user_project/src/package_name/__init__.py
+    - flat layout: user_project/package_name/__init__.py
+
+    Returns:
+        Path to the package directory containing __init__.py
+
+    Raises:
+        FileNotFoundError: If package directory cannot be found in either layout
+    """
+    metadata = read_metadata()
+    package_name = metadata.name
+    project_root = ap.paths.user_path
+
+    # Try src layout first (recommended layout)
+    src_layout_dir = project_root / "src" / package_name
+    if (src_layout_dir / "__init__.py").exists():
+        return src_layout_dir
+
+    # Try flat layout
+    flat_layout_dir = project_root / package_name
+    if (flat_layout_dir / "__init__.py").exists():
+        return flat_layout_dir
+
+    # Package not found in either location
+    raise FileNotFoundError(
+        f"Could not find package '{package_name}' in either src layout "
+        f"({src_layout_dir}) or flat layout ({flat_layout_dir}). "
+        f"Expected to find __init__.py in one of these locations."
+    )
+
+
 def init_pyproject():
     """Initialize pyproject.toml with sensible defaults
     - add [build-system] section with uv build backend (same as `uv init --package`)

afterpython-0.1.0.dev11/src/afterpython/tools/commitizen.py

@@ -1,52 +0,0 @@
-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():
-    from afterpython._io.toml import write_toml
-    from afterpython.tools.pre_commit import update_pre_commit
-
-    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
-
-    # 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-0.1.0.dev11/src/afterpython/tools/pre_commit.py

@@ -1,60 +0,0 @@
-import subprocess
-
-import afterpython as ap
-from afterpython._io.yaml import read_yaml, write_yaml
-
-pre_commit_default = {
-    # default is only ["pre-commit"], without changing the default,
-    # we need to explicitly pass in --hook-type whenever we run "pre-commit install --hook-type ..."
-    "default_install_hook_types": ["pre-commit", "commit-msg", "pre-push"],
-    "exclude": "^afterpython/_website/",  # do not check the project website template
-    "repos": [
-        {
-            "repo": "https://github.com/pre-commit/pre-commit-hooks",
-            "rev": "v6.0.0",
-            "hooks": [
-                {"id": "trailing-whitespace", "stages": ["pre-commit"]},
-                {"id": "end-of-file-fixer", "stages": ["pre-commit"]},
-                {"id": "check-yaml", "stages": ["pre-commit"]},
-                {"id": "check-toml", "stages": ["pre-commit"]},
-                {"id": "check-added-large-files", "stages": ["pre-commit"]},
-            ],
-        },
-        # {
-        #     "repo": "https://github.com/astral-sh/uv-pre-commit",
-        #     "rev": "0.9.8",
-        #     "hooks": [
-        #         {"id": "uv-lock"},  # Update the uv lockfile
-        #     ]
-        # },
-    ],
-}
-
-
-def install_pre_commit():
-    # installed in .git/hooks
-    subprocess.run(["ap", "pre-commit", "install", "--install-hooks"], check=True)
-
-
-def update_pre_commit(data_update: dict):
-    from afterpython.utils import deep_merge
-
-    pre_commit_path = ap.paths.afterpython_path / ".pre-commit-config.yaml"
-    if not pre_commit_path.exists():
-        raise FileNotFoundError(
-            f".pre-commit-config.yaml not found at {pre_commit_path}"
-        )
-    existing_data = read_yaml(pre_commit_path)
-    existing_data = deep_merge(existing_data, data_update)
-    write_yaml(pre_commit_path, existing_data)
-    install_pre_commit()
-
-
-def init_pre_commit():
-    pre_commit_path = ap.paths.afterpython_path / ".pre-commit-config.yaml"
-    if pre_commit_path.exists():
-        print(f".pre-commit-config.yaml already exists at {pre_commit_path}")
-        return
-    write_yaml(pre_commit_path, pre_commit_default)
-    print(f"Created {pre_commit_path}")
-    install_pre_commit()