afterpython 0.1.0.dev14__py3-none-any.whl → 0.1.0.dev16__py3-none-any.whl

afterpython/cli/commands/bump.py

@@ -95,3 +95,24 @@ def bump(ctx, release: bool, pre: bool):
         result = subprocess.run(["pixi", "install"], check=False)
         if result.returncode != 0:
             raise Exit(result.returncode)
+
+        # Check if pixi.lock was modified
+        status = subprocess.run(
+            ["git", "diff", "--name-only", "pixi.lock"],
+            capture_output=True,
+            text=True,
+            check=False,
+        )
+        if status.stdout.strip():
+            # Stage and commit pixi.lock
+            subprocess.run(["git", "add", "pixi.lock"], check=True)
+            subprocess.run(
+                [
+                    "git",
+                    "commit",
+                    "-m",
+                    "build: update pixi.lock after version bump",
+                ],
+                check=True,
+            )
+            click.echo("✓ Committed pixi.lock update")

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

@@ -1,52 +1,13 @@
-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,
-        }
-    }
-}
+import shutil
 
-
-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"],
-                },
-            ],
-        },
-    ]
-}
+import afterpython as ap
 
 
 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"
+    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
-
-    # Create commitizen configuration with default values
-    write_toml(commitizen_toml_path, commitizen_default)
+    cz_template_path = ap.paths.templates_path / "cz-template.toml"
+    shutil.copy(cz_template_path, commitizen_toml_path)
     print(f"Created {commitizen_toml_path}")
-
-    # add commitizen hook to .pre-commit-config.yaml
-    update_pre_commit(commitizen_pre_commit_hook)

afterpython/tools/pre_commit.py

@@ -1,35 +1,9 @@
+import shutil
 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
@@ -55,6 +29,9 @@ def init_pre_commit():
     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)
+    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/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.dev14.dist-info → afterpython-0.1.0.dev16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: afterpython
-Version: 0.1.0.dev14
+Version: 0.1.0.dev16
 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.dev14.dist-info → afterpython-0.1.0.dev16.dist-info}/RECORD

@@ -9,14 +9,14 @@ afterpython/builders/molab.py,sha256=viQ3HY5tnMiHjrgsm4BAMuYtTpiFJ0SDYzcm1TyoRDI
 afterpython/cli/__init__.py,sha256=G4AB-rllhmr7tURFc5cXJfkjZZ2bXtMBg3oy4zUGEFw,84
 afterpython/cli/commands/add.py,sha256=Ppp4msdvOwN9_-fdG5-b0-IV9p0Eef9CiIEU3srUjYk,1792
 afterpython/cli/commands/build.py,sha256=kFVdu0tNn82qaHVDS9tUKHYwH73zE3adkRBG_c2t44c,8020
-afterpython/cli/commands/bump.py,sha256=SczcDBkdabqaP72EKP2sfiFDGOosZIui2iKcGnGEXZA,3408
+afterpython/cli/commands/bump.py,sha256=2MZBQ1kxjr0bWhA--_xHwdwjsUlCyrXPn3pJ5NDZO4k,4088
 afterpython/cli/commands/check.py,sha256=cLP4Vle3ENQHCXBv1okDlWK-L1XK-fv80m66xW3LQkg,1097
 afterpython/cli/commands/clean.py,sha256=ZNhOwxcdxhkzqLPwDJ2_NPLnvMz3C1EKyNttXTyIHnI,2532
 afterpython/cli/commands/commit.py,sha256=TKhlybJxbcChMzZJuTfYafCrYUraqyBpLJ4TP0WA-xs,1335
 afterpython/cli/commands/commitizen.py,sha256=naI8j4pfXIMsiOLmPMeZTGh831I3665_1_Sbn7yoKyE,811
 afterpython/cli/commands/dev.py,sha256=zuto7Z6nfD1FAhZkhZNoLhxVH78Eo3W3iO6QujOMXII,6753
 afterpython/cli/commands/format.py,sha256=cXvuc-6XwULM1VJjS2B2bJBvnV1TVHFl1CeSs0SYQ24,738
-afterpython/cli/commands/init.py,sha256=lyNcE-fmgXyLGoSRkvHg_xpDt9gnySemTh-0m6lX0Ws,3354
+afterpython/cli/commands/init.py,sha256=TW8uIl_pt0HH9QCQLgFkJhM86VF_vwP1Wlqq0fXR8VI,3124
 afterpython/cli/commands/init_branch_rules.py,sha256=fzAm8D5qbW3u4bEMpqPuRgO-0akuCGG7pu09JlKhYn4,243
 afterpython/cli/commands/install.py,sha256=K3xYzU7XOts_xdERyd4q3wUFv0hythy7ZP6jr9N_6L4,777
 afterpython/cli/commands/lock.py,sha256=WAfZY4Jb7XLl7_zcjxCAs8VCGitX-zPlkXLTkPtOqDs,605
@@ -32,21 +32,23 @@ afterpython/const.py,sha256=B_yUBmHPyu98aOibwt7idWbhKNBBed0TeYXNBd8tPTk,157
 afterpython/main.py,sha256=w0z6mTib3u4p2HxMrk-tIJlZtur7uRaqsbE0ewlYlSs,490
 afterpython/pcu.py,sha256=EoEhSzFZ49b5qc9KH2RLxIHSzY8YFM5uhtw07chcrr8,6093
 afterpython/templates/ci-workflow-template.yml,sha256=2L-SRPB2GKlfR4bQAgpdq4r9bFdT9vCYo4oWjnIzKfg,5933
+afterpython/templates/cz-template.toml,sha256=AS7ZaPhfgbPEwUdHW6pAJueC3ZXneABkfPg2SQdznmU,209
 afterpython/templates/dependabot-template.yml,sha256=CBQEgh8EsXw2X7IqzGtFI7lVT9liF6PW4DvGLB0X2LY,1136
 afterpython/templates/deploy-workflow-template.yml,sha256=2W4K3lKMYjSTPrlXIsMweBzqP9IoLtZXAAcUu5FA5NA,2365
+afterpython/templates/pre-commit-config-template.yaml,sha256=Dv2BnTxgdzwKC9_QXkWkpRys8zN1tdqZ3ApQ1Zjl1ww,915
 afterpython/templates/release-workflow-template.yml,sha256=3YBkgrqmi--uznslpMxPz7Vj7L4_NPlhDxgwYBt-Ui8,1606
 afterpython/templates/ruff-template.toml,sha256=lNCd4EthoLScr4cyVEgGUH4xK5CfIX3f9I3zkJHAYgg,1008
 afterpython/tools/_afterpython.py,sha256=aZdRJ9dprA1HFchDFTqreJbrsI_HTPUaxtuBinVz10I,1905
 afterpython/tools/_git.py,sha256=aO-qDEQ4OevD_B74DYKK4nQKYeiaS1BXmYc8paJRfbQ,3772
 afterpython/tools/branch_rules.py,sha256=ciQ2H2YBnoCZu_plyVeIHzf2FcAILRFhpjzOR2_IfJg,3159
-afterpython/tools/commitizen.py,sha256=xpLZJuEqrRxCYz8la6po1PIlECk9O1BuAgsmSE1EY3I,1468
+afterpython/tools/commitizen.py,sha256=ZO1qHmzUU0myd85tncv76WtIR7DB_AoQGSUvaf78Ohg,438
 afterpython/tools/github_actions.py,sha256=zVmg9aqUg-EO0CnbRHl9i8TmFtXpt7nd0VjzckqqE30,1527
 afterpython/tools/myst.py,sha256=fh0FtgL9A1dmFa98QKsWFqExsG7hPRP3nrj62U9PmaA,6603
-afterpython/tools/pre_commit.py,sha256=U4cazFxaZmyamk_n-85sL6BLOttURm-I2giksgE0qb8,2191
-afterpython/tools/pyproject.py,sha256=YiSbW-bXYtFCkXRl_Ibdca2OeYZT0lsqzRRjZFxMcp4,2327
+afterpython/tools/pre_commit.py,sha256=oNsrUkPI13rSSBSyhyTTKPnQGhDxLIPYhxu6kL0fDmo,1206
+afterpython/tools/pyproject.py,sha256=kb7BDn24yH_xS2F5_L0dK-GL4KgOJS-MIIUQhHnLorI,3507
 afterpython/utils.py,sha256=Uh4pTGeavH5pf8GCeMYQGqs3iPpZzjjAJ_R7t2mhEyY,7045
 afterpython/version.py,sha256=hihRV1S-gc1m46OaXD32ikkEkqzs-Gtq7AcAqOQV-wY,1603
-afterpython-0.1.0.dev14.dist-info/WHEEL,sha256=3id4o64OvRm9dUknh3mMJNcfoTRK08ua5cU6DFyVy-4,79
-afterpython-0.1.0.dev14.dist-info/entry_points.txt,sha256=roa0PDgBueM1JPbRG0G2OSxzaN394OUL_oS9iEwVLBc,80
-afterpython-0.1.0.dev14.dist-info/METADATA,sha256=0w7h6S6kh0OKV_LMX2BEOV89VnPTJ-AP-U-w1llWp_0,5907
-afterpython-0.1.0.dev14.dist-info/RECORD,,
+afterpython-0.1.0.dev16.dist-info/WHEEL,sha256=3id4o64OvRm9dUknh3mMJNcfoTRK08ua5cU6DFyVy-4,79
+afterpython-0.1.0.dev16.dist-info/entry_points.txt,sha256=roa0PDgBueM1JPbRG0G2OSxzaN394OUL_oS9iEwVLBc,80
+afterpython-0.1.0.dev16.dist-info/METADATA,sha256=4gsBrNsjJOZvPnC5rqUknR41gYYiD1EV2pCn8v6BO0w,5907
+afterpython-0.1.0.dev16.dist-info/RECORD,,