dycw-pre-commit-hooks 0.9.24__tar.gz → 0.10.4__tar.gz

dycw_pre_commit_hooks-0.10.4/.envrc

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+use_uv_python

dycw_pre_commit_hooks-0.10.4/.github/workflows/pull-request.yml

@@ -0,0 +1,16 @@
+name: pull-request
+
+on:
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  lint:
+    name: lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: astral-sh/ruff-action@v3
+      - run: ruff check --fix
+      - run: ruff format

dycw_pre_commit_hooks-0.10.4/.github/workflows/push.yml

@@ -0,0 +1,38 @@
+name: push
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  tag:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: butlerlogic/action-autotag@1.1.2 # https://github.com/ButlerLogic/action-autotag/issues/45#issuecomment-1825726927
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+        with:
+          strategy: regex
+          root: pyproject.toml
+          regex_pattern: 'current_version = "(?<version>\d+\.\d+\.\d+)"'
+
+  publish:
+    runs-on: ubuntu-latest
+    needs:
+      - tag
+    environment:
+      name: pypi
+    permissions:
+      id-token: write
+    steps:
+      - uses: actions/checkout@v4
+      - uses: astral-sh/setup-uv@v5
+        with:
+          enable-cache: true
+      - uses: actions/setup-python@v5
+        with:
+          python-version-file: pyproject.toml
+      - run: uv build
+      - run: uv publish --trusted-publishing always

{dycw_pre_commit_hooks-0.9.24 → dycw_pre_commit_hooks-0.10.4}/.pre-commit-config.yaml

@@ -1,18 +1,23 @@
 repos:
   # fixers
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.9.3
+    rev: v0.9.10
     hooks:
       - id: ruff
         args: [--fix]
       - id: ruff-format
+  - repo: https://github.com/astral-sh/uv-pre-commit
+    rev: 0.6.5
+    hooks:
+      - id: uv-lock
+      - id: uv-sync
+        args: [--all-packages, --upgrade]
+        stages: [post-checkout, post-merge, post-rewrite]
   - repo: https://github.com/dycw/pre-commit-hooks
-    rev: 0.9.23
+    rev: 0.9.26
     hooks:
-      - id: run-hatch-version
+      # - id: run-hatch-version
       - id: run-ruff-format
-      - id: run-uv-pip-compile
-        args: [--python-version=3.11]
   - repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
     rev: v2.14.0
     hooks:
@@ -40,10 +45,6 @@ repos:
       - id: no-commit-to-branch
       - id: trailing-whitespace
   # linters
-  - repo: https://github.com/andreoliwa/nitpick
-    rev: v0.35.0
-    hooks:
-      - id: nitpick-check
   - repo: https://github.com/shellcheck-py/shellcheck-py
     rev: v0.10.0.1
     hooks:

{dycw_pre_commit_hooks-0.9.24 → dycw_pre_commit_hooks-0.10.4}/.pre-commit-hooks.yaml

@@ -5,6 +5,13 @@
   always_run: true
   pass_filenames: false
   description: Run `bump2version`
+- id: run-bump-my-version
+  name: run-bump-my-version
+  entry: run-bump-my-version
+  language: python
+  always_run: true
+  pass_filenames: false
+  description: Run `bump-my-version`
 - id: run-dockfmt
   name: run-dockfmt
   entry: run-dockfmt
@@ -32,3 +39,19 @@
   files: ^pyproject\.toml$
   pass_filenames: false
   description: Run `uv pip compile`
+- id: test-hook
+  name: test-hook
+  entry: run-uv-pip-compile
+  language: python
+  files: ^pyproject\.toml$
+  pass_filenames: false
+  description: Run `uv pip compile`
+  args: [
+      # --output-file=requirements-macos.txt,
+      # --extra=interactive,
+      # --python-platform=macos,
+      # --python-version=3.12,
+      --output-file=requirements-linux.txt,
+      --python-platform=linux,
+      --python-version=3.12,
+    ]

dycw_pre_commit_hooks-0.10.4/.python-version

@@ -0,0 +1 @@
+3.11

{dycw_pre_commit_hooks-0.9.24 → dycw_pre_commit_hooks-0.10.4}/PKG-INFO

@@ -1,18 +1,14 @@
 Metadata-Version: 2.4
 Name: dycw-pre-commit-hooks
-Version: 0.9.24
+Version: 0.10.4
 Author-email: Derek Wan <d.wan@icloud.com>
 Requires-Python: >=3.11
 Requires-Dist: click<8.2,>=8.1.8
-Requires-Dist: dycw-utilities<0.93,>=0.92.10
+Requires-Dist: dycw-utilities<0.96,>=0.95.21
 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
-Provides-Extra: dev
-Requires-Dist: dycw-utilities[test]; extra == 'dev'
-Requires-Dist: hatch<1.15,>=1.14.0; extra == 'dev'
-Requires-Dist: setuptools<75.9,>=75.8.0; extra == 'dev'
 Description-Content-Type: text/markdown
 
 # pre-commit-hooks

{dycw_pre_commit_hooks-0.9.24 → dycw_pre_commit_hooks-0.10.4}/pre_commit_hooks/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.9.24"
+__version__ = "0.10.4"

{dycw_pre_commit_hooks-0.9.24 → dycw_pre_commit_hooks-0.10.4}/pre_commit_hooks/common.py

@@ -18,12 +18,16 @@ PYPROJECT_TOML = _ROOT.joinpath("pyproject.toml")
 REQUIREMENTS_TXT = _ROOT.joinpath("requirements.txt")
 
 
+##
+
+
+_VERSION_BUMP_SCRIPTS = Literal[
+    "run-bump-my-version", "run-bump2version", "run-hatch-version"
+]
+
+
 def check_versions(
-    path: Path,
-    pattern: str,
-    /,
-    *,
-    name: Literal["run-bump2version", "run-hatch-version"],
+    path: Path, pattern: str, name: _VERSION_BUMP_SCRIPTS, /
 ) -> VersionInfo | None:
     """Check the versions: current & master.
 
@@ -32,7 +36,7 @@ def check_versions(
     """
     with path.open() as fh:
         current = _parse_version(pattern, fh.read())
-    master = _get_master_version(path, pattern, name=name)
+    master = _get_master_version(name, path, pattern)
     patched = master.bump_patch()
     if current in {master.bump_major(), master.bump_minor(), patched}:
         return None
@@ -46,11 +50,7 @@ def _parse_version(pattern: str, text: str, /) -> VersionInfo:
 
 
 def _get_master_version(
-    path: Path,
-    pattern: str,
-    /,
-    *,
-    name: Literal["run-bump2version", "run-hatch-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")
@@ -67,7 +67,10 @@ def _get_master_version(
         return version
 
 
-@dataclass
+##
+
+
+@dataclass(kw_only=True)
 class PyProject:
     contents: str
     doc: TOMLDocument
@@ -82,3 +85,13 @@ def read_pyproject() -> PyProject:
         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.9.24 → dycw_pre_commit_hooks-0.10.4}/pre_commit_hooks/run_bump2version/__init__.py

@@ -7,7 +7,11 @@ from typing import Literal
 from click import command, option
 from loguru import logger
 
-from pre_commit_hooks.common import check_versions
+from pre_commit_hooks.common import (
+    PYPROJECT_TOML,
+    check_versions,
+    trim_trailing_whitespaces,
+)
 
 
 @command()
@@ -23,7 +27,7 @@ def main(*, setup_cfg: bool) -> bool:
 def _process(*, filename: Literal["setup.cfg", ".bumpversion.cfg"]) -> bool:
     path = Path(filename)
     pattern = r"current_version = (\d+\.\d+\.\d+)$"
-    version = check_versions(path, pattern, name="run-bump2version")
+    version = check_versions(PYPROJECT_TOML, pattern, "run-bump2version")
     if version is None:
         return True
     cmd = ["bump2version", "--allow-dirty", f"--new-version={version}", "patch"]
@@ -37,13 +41,6 @@ def _process(*, filename: Literal["setup.cfg", ".bumpversion.cfg"]) -> bool:
             "Failed to run {cmd!r}. Is `bump2version` installed?", cmd=" ".join(cmd)
         )
     else:
-        _trim_trailing_whitespaces(path)
+        trim_trailing_whitespaces(path)
         return True
     return False
-
-
-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.4/pre_commit_hooks/run_bump_my_version/__init__.py

@@ -0,0 +1,34 @@
+from __future__ import annotations
+
+from subprocess import PIPE, STDOUT, CalledProcessError, check_call
+
+from click import command
+from loguru import logger
+
+from pre_commit_hooks.common import PYPROJECT_TOML, check_versions
+
+
+@command()
+def main() -> bool:
+    """CLI for the `run_bump_my_version` hook."""
+    return _process()
+
+
+def _process() -> bool:
+    pattern = r"current_version = (\d+\.\d+\.\d+)$"
+    version = check_versions(PYPROJECT_TOML, pattern, "run-bump-my-version")
+    if version is None:
+        return True
+    cmd = ["bump-my-version", "--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 `bump-my-version` installed?", cmd=" ".join(cmd)
+        )
+    else:
+        return True
+    return False

dycw_pre_commit_hooks-0.10.4/pre_commit_hooks/run_bump_my_version/__main__.py

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

{dycw_pre_commit_hooks-0.9.24 → dycw_pre_commit_hooks-0.10.4}/pre_commit_hooks/run_hatch_version/__init__.py

@@ -20,7 +20,7 @@ def main() -> bool:
 def _process() -> bool:
     path = _get_path_version_file()
     pattern = r'^__version__ = "(\d+\.\d+\.\d+)"$'
-    version = check_versions(path, pattern, name="run-hatch-version")
+    version = check_versions(path, pattern, "run-hatch-version")
     if version is None:
         return True
     cmd = ["hatch", "version", str(version)]

dycw_pre_commit_hooks-0.10.4/pre_commit_hooks/run_uv_pip_compile/__init__.py

@@ -0,0 +1,121 @@
+from __future__ import annotations
+
+from pathlib import Path
+from re import sub
+from subprocess import CalledProcessError, check_call
+from tempfile import TemporaryDirectory
+from typing import TYPE_CHECKING, Literal
+
+from click import Choice, command, option
+from loguru import logger
+
+from pre_commit_hooks.common import REQUIREMENTS_TXT
+
+if TYPE_CHECKING:
+    from collections.abc import Iterable
+
+
+@command()
+@option(
+    "--output-file",
+    default=REQUIREMENTS_TXT,
+    help="Write the compiled requirements to the given `requirements.txt` file",
+)
+@option("--extra", multiple=True, help="Optional dependencies")
+@option(
+    "--python-platform",
+    type=Choice(["windows", "linux", "macos"], case_sensitive=False),
+    help="The platform for which requirements should be resolved",
+)
+@option(
+    "--python-version", default=None, help="The Python version to use for resolution"
+)
+def main(
+    *,
+    output_file: Path | str = REQUIREMENTS_TXT,
+    extra: tuple[str, ...] = (),
+    python_platform: Literal["windows", "linux", "macos"] | None = None,
+    python_version: str | None = None,
+) -> bool:
+    """CLI for the `run-uv-pip-compile` hook."""
+    return _process(
+        output_file=Path(output_file),
+        extra=None if len(extra) == 0 else list(extra),
+        python_platform=python_platform,
+        python_version=python_version,
+    )
+
+
+def _process(
+    *,
+    extra: Iterable[str] | None = None,
+    output_file: Path = REQUIREMENTS_TXT,
+    python_platform: Literal["windows", "linux", "macos"] | None = None,
+    python_version: str | None = None,
+) -> bool:
+    curr = _read_requirements_txt(output_file)
+    latest = _run_uv_pip_compile(
+        extra=extra, python_platform=python_platform, python_version=python_version
+    )
+    if curr == latest:
+        return True
+    _write_requirements_txt(latest, path=output_file)
+    return False
+
+
+def _read_requirements_txt(path: Path, /) -> str | None:
+    try:
+        with path.open() as fh:
+            return fh.read()
+    except FileNotFoundError:
+        return None
+
+
+def _run_uv_pip_compile(
+    *,
+    extra: Iterable[str] | None = None,
+    python_platform: Literal["windows", "linux", "macos"] | None = None,
+    python_version: str | None = None,
+) -> str:
+    cmd: list[str] = [
+        "uv",
+        "pip",
+        "compile",
+        "--extra=dev",
+        "--prerelease=explicit",
+        "--quiet",
+        "--upgrade",
+    ]
+    if extra is not None:
+        cmd.extend(f"--extra={e}" for e in extra)
+    if python_platform is not None:
+        cmd.append(f"--python-platform={python_platform}")
+    if python_version is not None:
+        cmd.append(f"--python-version={python_version}")
+    with TemporaryDirectory() as temp:
+        temp_file = Path(temp, "temp.txt")
+        cmd.extend([
+            f"--output-file={temp_file.as_posix()}",
+            "pyproject.toml",  # don't use absolute path
+        ])
+        try:
+            _ = check_call(cmd)
+        except CalledProcessError:
+            logger.exception("Failed to run {cmd!r}", cmd=" ".join(cmd))
+            raise
+        with temp_file.open(mode="r") as fh:
+            contents = fh.read()
+        return _fix_header(contents, temp_file) + "\n"
+
+
+def _fix_header(text: str, temp_file: Path, /) -> str:
+    return "\n".join(_fix_header_line(line, temp_file) for line in text.splitlines())
+
+
+def _fix_header_line(line: str, temp_file: Path, /) -> str:
+    return sub(str(temp_file), temp_file.name, line)
+
+
+def _write_requirements_txt(contents: str, /, *, path: Path = REQUIREMENTS_TXT) -> None:
+    with path.open(mode="w") as fh:
+        _ = fh.write(contents)

{dycw_pre_commit_hooks-0.9.24 → dycw_pre_commit_hooks-0.10.4}/pyproject.toml

@@ -1,39 +1,51 @@
-# build-system
+#
 
+# build-system
 [build-system]
 build-backend = "hatchling.build"
 requires = ["hatchling"]
 
+# dependency groups
+[dependency-groups]
+dev = [
+  "dycw-utilities[test]>=0.94.29",
+  "setuptools >= 75.9.1",  # https://github.com/theY4Kman/pytest-only/issues/14
+]
+
 # project
 [project]
 authors = [{name = "Derek Wan", email = "d.wan@icloud.com"}]
 dependencies = [
   "click >= 8.1.8, < 8.2",
-  "dycw-utilities >= 0.92.10, < 0.93",
+  "dycw-utilities >= 0.95.21, < 0.96",
   "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",
 ]
-dynamic = ["version"]
 name = "dycw-pre-commit-hooks"
 readme = "README.md"
 requires-python = ">= 3.11"
-
-[project.optional-dependencies]
-dev = [
-  "dycw-utilities[test]",
-  "hatch >= 1.14.0, < 1.15",
-  "setuptools >= 75.8.0, < 75.9",  # https://github.com/theY4Kman/pytest-only/issues/14
-]
+version = "0.10.4"
 
 [project.scripts]
+run-bump-my-version = "pre_commit_hooks.run_bump-my-version:main"
 run-bump2version = "pre_commit_hooks.run_bump2version:main"
 run-dockfmt = "pre_commit_hooks.run_dockfmt:main"
 run-hatch-version = "pre_commit_hooks.run_hatch_version:main"
 run-ruff-format = "pre_commit_hooks.run_ruff_format:main"
 run-uv-pip-compile = "pre_commit_hooks.run_uv_pip_compile:main"
 
+# bump-my-version
+[tool.bumpversion]
+allow_dirty = true
+current_version = "0.10.4"
+
+[[tool.bumpversion.files]]
+filename = "src/pre_commit_hooks/__init__.py"
+replace = "__version__ = \"{new_version}\""
+search = "__version__ = \"{current_version}\""
+
 # coverage
 [tool.coverage]
 
@@ -60,9 +72,6 @@ sources = ["src"]
 [tool.hatch.build.targets.wheel]
 packages = ["src/pre_commit_hooks"]
 
-[tool.hatch.version]
-path = "src/pre_commit_hooks/__init__.py"
-
 # nitpick
 [tool.nitpick]
 style = [

dycw_pre_commit_hooks-0.10.4/run-test-hook.sh

@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+
+# usage: edit the following in `.pre-commit-hooks.yaml`
+#
+# - id: test-hook
+#   name: test-hook
+#   entry: run-uv-pip-compile
+#   language: python
+#   files: ^pyproject\.toml$
+#   pass_filenames: false
+#   description: Run `uv pip compile`
+#   args: [
+#       --output-file=requirements-macos.txt
+#       --extra=interactive
+#       --python-platform=macos
+#       --python-version=3.12,
+#     ]
+#
+# then, in your project, run:
+#
+# ❯ ../pre-commit-hooks/run-test-hook.sh
+
+PATH_DIR="$(
+	cd -- "$(dirname "$0")" >/dev/null 2>&1 || exit
+	pwd -P
+)"
+
+pre-commit try-repo --verbose --all-files "$PATH_DIR" test-hook