dycw-pre-commit-hooks 0.10.22__tar.gz → 0.11.0__tar.gz

{dycw_pre_commit_hooks-0.10.22 → dycw_pre_commit_hooks-0.11.0}/PKG-INFO

@@ -1,14 +1,12 @@
 Metadata-Version: 2.4
 Name: dycw-pre-commit-hooks
-Version: 0.10.22
+Version: 0.11.0
 Author-email: Derek Wan <d.wan@icloud.com>
 Requires-Python: >=3.12
-Requires-Dist: click<8.2,>=8.1.8
-Requires-Dist: dycw-utilities<0.98,>=0.97.2
+Requires-Dist: click<8.3,>=8.2.1
+Requires-Dist: dycw-utilities<0.126,>=0.125.10
 Requires-Dist: loguru<0.8,>=0.7.3
-Requires-Dist: semver<3.1,>=3.0.4
 Requires-Dist: tomlkit<0.14,>=0.13.2
-Requires-Dist: xdg-base-dirs<6.1,>=6.0.2
 Description-Content-Type: text/markdown
 
 # pre-commit-hooks

{dycw_pre_commit_hooks-0.10.22 → dycw_pre_commit_hooks-0.11.0}/pyproject.toml

@@ -9,23 +9,22 @@ requires = ["hatchling"]
 [dependency-groups]
 dev = [
   "dycw-utilities[test]",
+  "pyright[nodejs]>=1.1.401",
 ]
 
 # project
 [project]
 authors = [{name = "Derek Wan", email = "d.wan@icloud.com"}]
 dependencies = [
-  "click >= 8.1.8, < 8.2",
-  "dycw-utilities >= 0.97.2, < 0.98",
+  "click >= 8.2.1, < 8.3",
+  "dycw-utilities >= 0.125.10, < 0.126",
   "loguru >= 0.7.3, < 0.8",
-  "semver >= 3.0.4, < 3.1",
   "tomlkit >= 0.13.2, < 0.14",
-  "xdg-base-dirs >= 6.0.2, < 6.1",
 ]
 name = "dycw-pre-commit-hooks"
 readme = "README.md"
 requires-python = ">= 3.12"
-version = "0.10.22"
+version = "0.11.0"
 
 [project.scripts]
 run-bump-my-version = "pre_commit_hooks.run_bump_my_version:main"
@@ -35,7 +34,7 @@ run-ruff-format = "pre_commit_hooks.run_ruff_format:main"
 # bump-my-version
 [tool.bumpversion]
 allow_dirty = true
-current_version = "0.10.22"
+current_version = "0.11.0"
 
 [[tool.bumpversion.files]]
 filename = "src/pre_commit_hooks/__init__.py"
@@ -79,6 +78,7 @@ style = [
 [tool.pyright]
 deprecateTypingAliases = true
 enableReachabilityAnalysis = false
+ignore = ["**/_typeshed/**"]
 pythonVersion = "3.12"
 reportAny = false
 reportCallInDefaultInitializer = true

{dycw_pre_commit_hooks-0.10.22 → dycw_pre_commit_hooks-0.11.0}/src/pre_commit_hooks/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.10.22"
+__version__ = "0.11.0"

dycw_pre_commit_hooks-0.11.0/src/pre_commit_hooks/common.py

@@ -0,0 +1,33 @@
+from __future__ import annotations
+
+from dataclasses import dataclass
+
+from loguru import logger
+from tomlkit import TOMLDocument, parse
+from utilities.git import get_repo_root
+
+_ROOT = get_repo_root()
+PYPROJECT_TOML = _ROOT.joinpath("pyproject.toml")
+
+
+##
+
+
+@dataclass(kw_only=True)
+class PyProject:
+    contents: str
+    doc: TOMLDocument
+
+
+def read_pyproject() -> PyProject:
+    try:
+        with PYPROJECT_TOML.open(mode="r") as fh:
+            contents = fh.read()
+    except FileNotFoundError:
+        logger.exception("pyproject.toml not found")
+        raise
+    doc = parse(contents)
+    return PyProject(contents=contents, doc=doc)
+
+
+__all__ = ["PYPROJECT_TOML", "read_pyproject"]

{dycw_pre_commit_hooks-0.10.22 → dycw_pre_commit_hooks-0.11.0}/src/pre_commit_hooks/run_bump_my_version/__init__.py

@@ -26,7 +26,13 @@ def _process() -> bool:
     master = _parse_version_from_file_or_text(contents)
     if current in {master.bump_patch(), master.bump_minor(), master.bump_major()}:
         return True
-    cmd = ["bump-my-version", "bump", "patch"]
+    cmd = [
+        "bump-my-version",
+        "replace",
+        "--new-version",
+        str(master.bump_patch()),
+        str(path),
+    ]
     try:
         _ = check_call(cmd, stdout=PIPE, stderr=STDOUT)
     except CalledProcessError as error:
@@ -53,3 +59,6 @@ def _parse_version_from_file_or_text(path_or_text: Path | str, /) -> Version:
         case str() as text:
             (match,) = _PATTERN.findall(text)
             return parse_version(match)
+
+
+__all__ = ["main"]

{dycw_pre_commit_hooks-0.10.22 → dycw_pre_commit_hooks-0.11.0}/src/pre_commit_hooks/run_ruff_format/__init__.py

@@ -1,15 +1,17 @@
 from __future__ import annotations
 
 from subprocess import CalledProcessError, check_call
-from typing import cast
+from typing import TYPE_CHECKING, cast
 
 from click import command
 from loguru import logger
 from tomlkit import dumps, table
-from tomlkit.container import Container
 
 from pre_commit_hooks.common import PYPROJECT_TOML, PyProject, read_pyproject
 
+if TYPE_CHECKING:
+    from tomlkit.container import Container
+
 
 @command()
 def main() -> bool:
@@ -30,25 +32,25 @@ def _get_modified_pyproject() -> PyProject:
     pyproject = read_pyproject()
     doc = pyproject.doc
     try:
-        tool = cast(Container, doc["tool"])
+        tool = cast("Container", doc["tool"])
     except KeyError:
         tool = table()
     try:
-        ruff = cast(Container, tool["ruff"])
+        ruff = cast("Container", tool["ruff"])
     except KeyError:
         ruff = table()
     ruff["line-length"] = 320
     try:
-        format_ = cast(Container, ruff["format"])
+        format_ = cast("Container", ruff["format"])
     except KeyError:
         format_ = table()
     format_["skip-magic-trailing-comma"] = True
     try:
-        lint = cast(Container, ruff["lint"])
+        lint = cast("Container", ruff["lint"])
     except KeyError:
         lint = table()
     try:
-        isort = cast(Container, lint["isort"])
+        isort = cast("Container", lint["isort"])
     except KeyError:
         isort = table()
     isort["split-on-trailing-comma"] = False
@@ -74,3 +76,6 @@ def _run_ruff_format(pyproject: PyProject, /) -> bool:
 def _write_pyproject(pyproject: PyProject, /) -> None:
     with PYPROJECT_TOML.open(mode="w") as fh:
         _ = fh.write(pyproject.contents)
+
+
+__all__ = ["main"]

dycw_pre_commit_hooks-0.10.22/src/pre_commit_hooks/common.py

@@ -1,96 +0,0 @@
-from __future__ import annotations
-
-from dataclasses import dataclass
-from hashlib import md5
-from pathlib import Path
-from re import MULTILINE, findall
-from subprocess import check_output
-from typing import Literal
-
-from loguru import logger
-from semver import VersionInfo
-from tomlkit import TOMLDocument, parse
-from utilities.git import get_repo_root
-from xdg_base_dirs import xdg_cache_home
-
-_ROOT = get_repo_root()
-PYPROJECT_TOML = _ROOT.joinpath("pyproject.toml")
-
-
-##
-
-
-_VERSION_BUMP_SCRIPTS = Literal[
-    "run-bump-my-version", "run-bump2version", "run-hatch-version"
-]
-
-
-def check_versions(
-    path: Path, pattern: str, name: _VERSION_BUMP_SCRIPTS, /
-) -> VersionInfo | None:
-    """Check the versions: current & master.
-
-    If the current is a correct bumping of master, then return `None`. Else,
-    return the patch-bumped master.
-    """
-    with path.open() as fh:
-        current = _parse_version(pattern, fh.read())
-    master = _get_master_version(name, path, pattern)
-    patched = master.bump_patch()
-    if current in {master.bump_major(), master.bump_minor(), patched}:
-        return None
-    return patched
-
-
-def _parse_version(pattern: str, text: str, /) -> VersionInfo:
-    """Parse the version from a block of text."""
-    (match,) = findall(pattern, text, flags=MULTILINE)
-    return VersionInfo.parse(match)
-
-
-def _get_master_version(
-    name: _VERSION_BUMP_SCRIPTS, path: Path, pattern: str, /
-) -> VersionInfo:
-    repo = md5(Path.cwd().as_posix().encode(), usedforsecurity=False).hexdigest()
-    commit = check_output(["git", "rev-parse", "origin/master"], text=True).rstrip("\n")
-    cache = xdg_cache_home().joinpath("pre-commit-hooks", name, repo, commit)
-    try:
-        with cache.open() as fh:
-            return VersionInfo.parse(fh.read())
-    except FileNotFoundError:
-        cache.parent.mkdir(parents=True, exist_ok=True)
-        text = check_output(["git", "show", f"{commit}:{path}"], text=True)
-        version = _parse_version(pattern, text)
-        with cache.open(mode="w") as fh:
-            _ = fh.write(str(version))
-        return version
-
-
-##
-
-
-@dataclass(kw_only=True)
-class PyProject:
-    contents: str
-    doc: TOMLDocument
-
-
-def read_pyproject() -> PyProject:
-    try:
-        with PYPROJECT_TOML.open(mode="r") as fh:
-            contents = fh.read()
-    except FileNotFoundError:
-        logger.exception("pyproject.toml not found")
-        raise
-    doc = parse(contents)
-    return PyProject(contents=contents, doc=doc)
-
-
-##
-
-
-def trim_trailing_whitespaces(path: Path, /) -> None:
-    with path.open() as fh:
-        lines = fh.readlines()
-    with path.open(mode="w") as fh:
-        fh.writelines([line.rstrip(" ") for line in lines])

dycw_pre_commit_hooks-0.10.22/src/pre_commit_hooks/run_bump2version/__init__.py

@@ -1,46 +0,0 @@
-from __future__ import annotations
-
-from pathlib import Path
-from subprocess import PIPE, STDOUT, CalledProcessError, check_call
-from typing import Literal
-
-from click import command, option
-from loguru import logger
-
-from pre_commit_hooks.common import (
-    PYPROJECT_TOML,
-    check_versions,
-    trim_trailing_whitespaces,
-)
-
-
-@command()
-@option(
-    "--setup-cfg", is_flag=True, help="Read `setup.cfg` instead of `bumpversion.cfg`"
-)
-def main(*, setup_cfg: bool) -> bool:
-    """CLI for the `run_bump2version` hook."""
-    filename = "setup.cfg" if setup_cfg else ".bumpversion.cfg"
-    return _process(filename=filename)
-
-
-def _process(*, filename: Literal["setup.cfg", ".bumpversion.cfg"]) -> bool:
-    path = Path(filename)
-    pattern = r"current_version = (\d+\.\d+\.\d+)$"
-    version = check_versions(PYPROJECT_TOML, pattern, "run-bump2version")
-    if version is None:
-        return True
-    cmd = ["bump2version", "--allow-dirty", f"--new-version={version}", "patch"]
-    try:
-        _ = check_call(cmd, stdout=PIPE, stderr=STDOUT)
-    except CalledProcessError as error:
-        if error.returncode != 1:
-            logger.exception("Failed to run {cmd!r}", cmd=" ".join(cmd))
-    except FileNotFoundError:
-        logger.exception(
-            "Failed to run {cmd!r}. Is `bump2version` installed?", cmd=" ".join(cmd)
-        )
-    else:
-        trim_trailing_whitespaces(path)
-        return True
-    return False

dycw_pre_commit_hooks-0.10.22/src/pre_commit_hooks/run_bump2version/__main__.py

@@ -1,6 +0,0 @@
-from __future__ import annotations
-
-from pre_commit_hooks.run_bump2version import main
-
-if __name__ == "__main__":
-    raise SystemExit(int(not main()))