dycw-pre-commit-hooks 0.12.2__tar.gz → 0.12.4__tar.gz

{dycw_pre_commit_hooks-0.12.2 → dycw_pre_commit_hooks-0.12.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dycw-pre-commit-hooks
-Version: 0.12.2
+Version: 0.12.4
 Author-email: Derek Wan <d.wan@icloud.com>
 Requires-Python: >=3.12
 Requires-Dist: click<8.3,>=8.2.1

{dycw_pre_commit_hooks-0.12.2 → dycw_pre_commit_hooks-0.12.4}/pyproject.toml

@@ -30,7 +30,7 @@ dependencies = [
 name = "dycw-pre-commit-hooks"
 readme = "README.md"
 requires-python = ">= 3.12"
-version = "0.12.2"
+version = "0.12.4"
 
 [project.scripts]
 format-requirements = "pre_commit_hooks.format_requirements:main"
@@ -41,7 +41,7 @@ tag-commits = "pre_commit_hooks.tag_commits:main"
 # bump-my-version
 [tool.bumpversion]
 allow_dirty = true
-current_version = "0.12.2"
+current_version = "0.12.4"
 
 [[tool.bumpversion.files]]
 filename = "src/pre_commit_hooks/__init__.py"

{dycw_pre_commit_hooks-0.12.2 → dycw_pre_commit_hooks-0.12.4}/src/pre_commit_hooks/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.12.2"
+__version__ = "0.12.4"

{dycw_pre_commit_hooks-0.12.2 → dycw_pre_commit_hooks-0.12.4}/src/pre_commit_hooks/common.py

@@ -1,20 +1,30 @@
 from __future__ import annotations
 
 from pathlib import Path
-from typing import assert_never
+from typing import Literal, assert_never
 
+from click import Choice, option
 from loguru import logger
 from tomlkit import TOMLDocument, parse
 from tomlkit.items import Table
-from utilities.pathlib import get_repo_root
+from utilities.typing import get_literal_elements
 from utilities.version import Version, parse_version
 
-PYPROJECT_TOML = get_repo_root().joinpath("pyproject.toml")
+type Mode = Literal["pyproject", "bumpversion"]
+DEFAULT_MODE: Mode = "pyproject"
+mode_option = option(
+    "--mode",
+    type=Choice(get_literal_elements(Mode), case_sensitive=False),
+    default=DEFAULT_MODE,
+    show_default=True,
+)
 
 
-def get_version(source: Path | str | bytes | TOMLDocument, /) -> Version:
+def get_version(source: Mode | Path | str | bytes | TOMLDocument, /) -> Version:
     """Get the `[tool.bumpversion]` version from a TOML file."""
     match source:
+        case "pyproject" | "bumpversion" as mode:
+            return get_version(get_toml_path(mode))
         case Path() as path:
             return get_version(path.read_text())
         case str() | bytes() as text:
@@ -53,4 +63,14 @@ def get_version(source: Path | str | bytes | TOMLDocument, /) -> Version:
             assert_never(never)
 
 
-__all__ = ["PYPROJECT_TOML", "get_version"]
+def get_toml_path(mode: Mode = DEFAULT_MODE, /) -> Path:
+    match mode:
+        case "pyproject":
+            return Path("pyproject.toml")
+        case "bumpversion":
+            return Path(".bumpversion.toml")
+        case never:  # pyright: ignore[reportUnnecessaryComparison]
+            assert_never(never)
+
+
+__all__ = ["DEFAULT_MODE", "Mode", "get_toml_path", "get_version", "mode_option"]

{dycw_pre_commit_hooks-0.12.2 → dycw_pre_commit_hooks-0.12.4}/src/pre_commit_hooks/format_requirements/__init__.py

@@ -15,8 +15,6 @@ from tomlkit import array, dumps, loads, string
 from tomlkit.items import Array, Table
 from utilities.atomicwrites import writer
 
-from pre_commit_hooks.common import PYPROJECT_TOML
-
 if TYPE_CHECKING:
     from collections.abc import Iterator
     from pathlib import Path
@@ -106,4 +104,4 @@ class _CustomSpecifierSet(SpecifierSet):
         return [">=", "<"].index(spec.operator)
 
 
-__all__ = ["PYPROJECT_TOML", "main"]
+__all__ = ["main"]

{dycw_pre_commit_hooks-0.12.2 → dycw_pre_commit_hooks-0.12.4}/src/pre_commit_hooks/run_bump_my_version/__init__.py

@@ -1,35 +1,30 @@
 from __future__ import annotations
 
-from pathlib import Path
 from subprocess import PIPE, STDOUT, CalledProcessError, check_call, check_output
-from typing import Literal, assert_never
 
-from click import Choice, command, option
+from click import command
 from loguru import logger
-from utilities.pathlib import get_repo_root
 
-from pre_commit_hooks.common import PYPROJECT_TOML, get_version
-
-type _Mode = Literal["pyproject", "bumpversion"]
-_MODE: _Mode = "pyproject"
+from pre_commit_hooks.common import (
+    DEFAULT_MODE,
+    Mode,
+    get_toml_path,
+    get_version,
+    mode_option,
+)
 
 
 @command()
-@option(
-    "--mode",
-    type=Choice(["pyproject", "bumpversion"], case_sensitive=False),
-    default=_MODE,
-    show_default=True,
-)
-def main(*, mode: _Mode = _MODE) -> bool:
+@mode_option
+def main(*, mode: Mode = DEFAULT_MODE) -> bool:
     """CLI for the `run_bump_my_version` hook."""
     return _process(mode=mode)
 
 
-def _process(*, mode: _Mode = _MODE) -> bool:
-    path = _get_rel_path(mode=mode)
-    current = get_version(path)
+def _process(*, mode: Mode = DEFAULT_MODE) -> bool:
+    current = get_version(mode)
     commit = check_output(["git", "rev-parse", "origin/master"], text=True).rstrip("\n")
+    path = get_toml_path(mode)
     contents = check_output(["git", "show", f"{commit}:{path}"], text=True)
     master = get_version(contents)
     if current in {master.bump_patch(), master.bump_minor(), master.bump_major()}:
@@ -55,15 +50,4 @@ def _process(*, mode: _Mode = _MODE) -> bool:
     return False
 
 
-def _get_rel_path(*, mode: _Mode = _MODE) -> Path:
-    match mode:
-        case "pyproject":
-            path = PYPROJECT_TOML
-        case "bumpversion":
-            path = get_repo_root().joinpath(".bumpversion.toml")
-        case never:  # pyright: ignore[reportUnnecessaryComparison]
-            assert_never(never)
-    return path.relative_to(Path.cwd())
-
-
 __all__ = ["main"]

{dycw_pre_commit_hooks-0.12.2 → dycw_pre_commit_hooks-0.12.4}/src/pre_commit_hooks/tag_commits/__init__.py

@@ -13,7 +13,13 @@ from utilities.whenever import from_timestamp, get_now_local
 from whenever import DateTimeDelta, ZonedDateTime
 from xdg_base_dirs import xdg_cache_home
 
-from pre_commit_hooks.common import get_version
+from pre_commit_hooks.common import (
+    DEFAULT_MODE,
+    Mode,
+    get_toml_path,
+    get_version,
+    mode_option,
+)
 
 if TYPE_CHECKING:
     from collections.abc import Set as AbstractSet
@@ -35,26 +41,29 @@ _MAX_AGE: DateTimeDelta | None = None
     default=_MAX_AGE,
     show_default=True,
 )
+@mode_option
 def main(
     *,
     run_every: DateTimeDelta | None = _RUN_EVERY,
     max_age: DateTimeDelta | None = _MAX_AGE,
+    mode: Mode = DEFAULT_MODE,
 ) -> bool:
     """CLI for the `tag_commits` hook."""
-    return _process(run_every=run_every, max_age=max_age)
+    return _process(run_every=run_every, max_age=max_age, mode=mode)
 
 
 def _process(
     *,
     run_every: DateTimeDelta | None = _RUN_EVERY,
     max_age: DateTimeDelta | None = _MAX_AGE,
+    mode: Mode = DEFAULT_MODE,
 ) -> bool:
     if run_every is not None:
         last = _get_last_run()
         min_date_time = get_now_local() - run_every
         if (last is not None) and (min_date_time <= last):
             return True
-    return _process_commits(max_age=max_age)
+    return _process_commits(max_age=max_age, mode=mode)
 
 
 def _get_last_run() -> ZonedDateTime | None:
@@ -70,13 +79,16 @@ def _get_last_run() -> ZonedDateTime | None:
         return None
 
 
-def _process_commits(*, max_age: DateTimeDelta | None = None) -> bool:
+def _process_commits(
+    *, max_age: DateTimeDelta | None = None, mode: Mode = DEFAULT_MODE
+) -> bool:
     repo = Repo(".", search_parent_directories=True)
     tagged = {tag.commit.hexsha for tag in repo.tags}
     min_date_time = None if max_age is None else (get_now_local() - max_age)
     commits = reversed(list(repo.iter_commits(repo.refs["origin/master"])))
     results = [
-        _process_commit(c, tagged, repo, min_date_time=min_date_time) for c in commits
+        _process_commit(c, tagged, repo, min_date_time=min_date_time, mode=mode)
+        for c in commits
     ]  # run all
     return all(results)
 
@@ -88,13 +100,14 @@ def _process_commit(
     /,
     *,
     min_date_time: ZonedDateTime | None = None,
+    mode: Mode = DEFAULT_MODE,
 ) -> bool:
     if (commit.hexsha in tagged) or (
         (min_date_time is not None) and (_get_date_time(commit) < min_date_time)
     ):
         return True
     try:
-        _tag_commit(commit, repo)
+        _tag_commit(commit, repo, mode=mode)
     except GitCommandError:
         return False
     return True
@@ -104,13 +117,14 @@ def _get_date_time(commit: Commit, /) -> ZonedDateTime:
     return from_timestamp(commit.committed_date, time_zone=LOCAL_TIME_ZONE_NAME)
 
 
-def _tag_commit(commit: Commit, repo: Repo, /) -> None:
+def _tag_commit(commit: Commit, repo: Repo, /, *, mode: Mode = DEFAULT_MODE) -> None:
     sha = commit.hexsha[:7]
     date = _get_date_time(commit)
+    path = get_toml_path(mode)
     try:
-        joined = commit.tree.join("pyproject.toml")
+        joined = commit.tree.join(str(path))
     except KeyError:
-        logger.exception(f"`pyproject.toml` not found; failed to tag {sha!r} ({date})")
+        logger.exception(f"`{str(path)!r}` not found; failed to tag {sha!r} ({date})")
         return
     text = joined.data_stream.read()
     version = get_version(text)