dycw-pre-commit-hooks 0.10.19__tar.gz → 0.10.21__tar.gz

{dycw_pre_commit_hooks-0.10.19 → dycw_pre_commit_hooks-0.10.21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dycw-pre-commit-hooks
-Version: 0.10.19
+Version: 0.10.21
 Author-email: Derek Wan <d.wan@icloud.com>
 Requires-Python: >=3.11
 Requires-Dist: click<8.2,>=8.1.8
@@ -29,13 +29,8 @@ My [`pre-commit`](https://pre-commit.com/) hooks.
      - repo: https://github.com/dycw/pre-commit-hooks
        rev: master
        hooks:
-         - id: run-bump2version
-           args: [--setup-cfg]
-         - id: run-dockfmt
-         - id: run-hatch-version
+         - id: run-bump-my-version
          - id: run-ruff-format
-         - id: run-uv-pip-compile
-           args: [--python-version=3.9]
    ```
 
 1. Update your `.pre-commit-config.yaml`:

{dycw_pre_commit_hooks-0.10.19 → dycw_pre_commit_hooks-0.10.21}/README.md

@@ -15,13 +15,8 @@ My [`pre-commit`](https://pre-commit.com/) hooks.
      - repo: https://github.com/dycw/pre-commit-hooks
        rev: master
        hooks:
-         - id: run-bump2version
-           args: [--setup-cfg]
-         - id: run-dockfmt
-         - id: run-hatch-version
+         - id: run-bump-my-version
          - id: run-ruff-format
-         - id: run-uv-pip-compile
-           args: [--python-version=3.9]
    ```
 
 1. Update your `.pre-commit-config.yaml`:

{dycw_pre_commit_hooks-0.10.19 → dycw_pre_commit_hooks-0.10.21}/pyproject.toml

@@ -27,20 +27,17 @@ dependencies = [
 name = "dycw-pre-commit-hooks"
 readme = "README.md"
 requires-python = ">= 3.11"
-version = "0.10.19"
+version = "0.10.21"
 
 [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.19"
+current_version = "0.10.21"
 
 [[tool.bumpversion.files]]
 filename = "src/pre_commit_hooks/__init__.py"
@@ -67,8 +64,8 @@ parallel = true
 # hatch
 [tool.hatch]
 
-[tool.hatch.build]
-sources = ["src"]
+[tool.hatch.build.targets.sdist]
+include = ["src"]
 
 [tool.hatch.build.targets.wheel]
 packages = ["src/pre_commit_hooks"]

{dycw_pre_commit_hooks-0.10.19 → dycw_pre_commit_hooks-0.10.21/src}/pre_commit_hooks/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.10.19"
+__version__ = "0.10.21"

{dycw_pre_commit_hooks-0.10.19 → dycw_pre_commit_hooks-0.10.21/src}/pre_commit_hooks/common.py

@@ -15,7 +15,6 @@ from xdg_base_dirs import xdg_cache_home
 
 _ROOT = get_repo_root()
 PYPROJECT_TOML = _ROOT.joinpath("pyproject.toml")
-REQUIREMENTS_TXT = _ROOT.joinpath("requirements.txt")
 
 
 ##

dycw_pre_commit_hooks-0.10.19/.envrc

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

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

@@ -1,16 +0,0 @@
-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.19/.github/workflows/push.yml

@@ -1,38 +0,0 @@
-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.10.19/.pre-commit-config.yaml

@@ -1,46 +0,0 @@
-repos:
-  # fixers
-  - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.9.10
-    hooks:
-      - id: ruff
-        args: [--fix]
-  - repo: https://github.com/dycw/pre-commit-hooks
-    rev: 0.10.14
-    hooks:
-      - id: run-bump-my-version
-      - id: run-ruff-format
-  - repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
-    rev: v2.14.0
-    hooks:
-      - id: pretty-format-toml
-        args: [--autofix, --trailing-commas]
-  - repo: https://github.com/astral-sh/uv-pre-commit
-    rev: 0.6.5
-    hooks:
-      - id: uv-sync # after version bump
-        args: [--all-packages, --upgrade]
-        stages: [pre-commit, pre-push]
-  # 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:
-      - id: shellcheck
-  # fixers/linters
-  - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
-    hooks:
-      - id: check-executables-have-shebangs
-      - id: check-merge-conflict
-      - id: check-symlinks
-      - id: destroyed-symlinks
-      - id: detect-private-key
-      - id: end-of-file-fixer
-      - id: mixed-line-ending
-        args: [--fix=lf]
-      - id: no-commit-to-branch
-      - id: trailing-whitespace

dycw_pre_commit_hooks-0.10.19/.pre-commit-hooks.yaml

@@ -1,57 +0,0 @@
-- id: run-bump2version
-  name: run-bump2version
-  entry: run-bump2version
-  language: python
-  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
-  language: python
-  files: Dockerfile
-  description: Run `dockfmt`
-- id: run-hatch-version
-  name: run-hatch-version
-  entry: run-hatch-version
-  language: python
-  always_run: true
-  pass_filenames: false
-  description: Run `hatch version bump/minor/major`
-- id: run-ruff-format
-  name: run-ruff-format
-  entry: run-ruff-format
-  language: python
-  always_run: true
-  pass_filenames: false
-  description: Run `ruff format`
-- id: run-uv-pip-compile
-  name: run-uv-pip-compile
-  entry: run-uv-pip-compile
-  language: python
-  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.19/.python-version

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

dycw_pre_commit_hooks-0.10.19/pre_commit_hooks/run_dockfmt/__init__.py

@@ -1,45 +0,0 @@
-from __future__ import annotations
-
-from pathlib import Path
-from subprocess import check_output
-from typing import TYPE_CHECKING
-
-import click
-from click import argument, command
-
-if TYPE_CHECKING:
-    from collections.abc import Iterator
-
-
-@command()
-@argument(
-    "paths",
-    nargs=-1,
-    type=click.Path(
-        exists=True, file_okay=True, dir_okay=False, readable=True, path_type=Path
-    ),
-)
-def main(paths: tuple[Path, ...], /) -> bool:
-    """CLI for the `run-dockfmt` hook."""
-    results = list(_yield_outcomes(*paths))  # run all
-    return all(results)
-
-
-def _yield_outcomes(*paths: Path) -> Iterator[bool]:
-    for path in paths:
-        if path.name == "Dockerfile":
-            yield _process(path)
-
-
-def _process(path: Path, /) -> bool:
-    with path.open() as fh:
-        current = fh.read()
-    strip = "\t\n"
-    proposed = check_output(["dockfmt", "fmt", path.as_posix()], text=True).lstrip(
-        strip
-    )
-    if current == proposed:
-        return True
-    with path.open(mode="w") as fh:
-        _ = fh.write(proposed)
-    return False

dycw_pre_commit_hooks-0.10.19/pre_commit_hooks/run_dockfmt/__main__.py

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

dycw_pre_commit_hooks-0.10.19/pre_commit_hooks/run_hatch_version/__init__.py

@@ -1,58 +0,0 @@
-from __future__ import annotations
-
-from pathlib import Path
-from subprocess import PIPE, STDOUT, CalledProcessError, check_call
-from typing import Any, cast
-
-from click import command
-from loguru import logger
-from tomlkit.container import Container
-
-from pre_commit_hooks.common import check_versions, read_pyproject
-
-
-@command()
-def main() -> bool:
-    """CLI for the `run-hatch-version` hook."""
-    return _process()
-
-
-def _process() -> bool:
-    path = _get_path_version_file()
-    pattern = r'^__version__ = "(\d+\.\d+\.\d+)"$'
-    version = check_versions(path, pattern, "run-hatch-version")
-    if version is None:
-        return True
-    cmd = ["hatch", "version", str(version)]
-    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 `hatch` installed?", cmd=" ".join(cmd)
-        )
-    else:
-        return True
-    return False
-
-
-def _get_path_version_file() -> Path:
-    pyproject = read_pyproject()
-    try:
-        tool = cast(Container, pyproject.doc["tool"])
-    except KeyError:
-        logger.exception('pyproject.toml has no "tool" section')
-        raise
-    try:
-        hatch = cast(Container, tool["hatch"])
-    except KeyError:
-        logger.exception('pyproject.toml has no "tool.hatch" section')
-        raise
-    try:
-        version = cast(Container, hatch["version"])
-    except KeyError:
-        logger.exception('pyproject.toml has no "tool.hatch.version" section')
-        raise
-    return Path(cast(Any, version["path"]))

dycw_pre_commit_hooks-0.10.19/pre_commit_hooks/run_hatch_version/__main__.py

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

dycw_pre_commit_hooks-0.10.19/pre_commit_hooks/run_uv_pip_compile/__init__.py

@@ -1,121 +0,0 @@
-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.10.19/pre_commit_hooks/run_uv_pip_compile/__main__.py

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

dycw_pre_commit_hooks-0.10.19/run-test-hook.sh

@@ -1,28 +0,0 @@
-#!/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