dycw-pre-commit-hooks 0.9.15__tar.gz → 0.9.16__tar.gz

{dycw_pre_commit_hooks-0.9.15 → dycw_pre_commit_hooks-0.9.16}/.pre-commit-config.yaml

@@ -1,12 +1,14 @@
 repos:
   # fixers
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.4.0
+    rev: v0.5.1
     hooks:
       - id: ruff
         args: [--fix]
+      - id: ruff-format
+        types_or: [python, pyi, jupyter]
   - repo: https://github.com/dycw/pre-commit-hooks
-    rev: 0.9.14
+    rev: 0.9.15
     hooks:
       - id: run-hatch-version
       - id: run-ruff-format

{dycw_pre_commit_hooks-0.9.15 → dycw_pre_commit_hooks-0.9.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: dycw-pre-commit-hooks
-Version: 0.9.15
+Version: 0.9.16
 Author-email: Derek Wan <d.wan@icloud.com>
 Requires-Python: >=3.10
 Requires-Dist: click<8.2,>=8.1.7

{dycw_pre_commit_hooks-0.9.15 → dycw_pre_commit_hooks-0.9.16}/pre_commit_hooks/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.9.15"
+__version__ = "0.9.16"

{dycw_pre_commit_hooks-0.9.15 → dycw_pre_commit_hooks-0.9.16}/pre_commit_hooks/run_ruff_format/__init__.py

@@ -1,18 +1,14 @@
 from __future__ import annotations
 
-from contextlib import contextmanager
 from subprocess import CalledProcessError, check_call
-from typing import TYPE_CHECKING, cast
+from typing import cast
 
 from click import command
 from loguru import logger
-from tomlkit import TOMLDocument, dumps, table
+from tomlkit import dumps, table
 from tomlkit.container import Container
 
-from pre_commit_hooks.common import PYPROJECT_TOML, read_pyproject
-
-if TYPE_CHECKING:
-    from collections.abc import Iterator
+from pre_commit_hooks.common import PYPROJECT_TOML, PyProject, read_pyproject
 
 
 @command()
@@ -22,24 +18,15 @@ def main() -> bool:
 
 
 def _process() -> bool:
-    with _yield_modified_pyproject():
-        result1 = _run_ruff_format()
-    result2 = _run_ruff_format()
-    return result1 and result2
-
-
-@contextmanager
-def _yield_modified_pyproject() -> Iterator[None]:
     curr = read_pyproject()
     new = _get_modified_pyproject()
-    with PYPROJECT_TOML.open(mode="w") as fh:
-        _ = fh.write(dumps(new))
-    yield
-    with PYPROJECT_TOML.open(mode="w") as fh:
-        _ = fh.write(curr.contents)
+    result1 = _run_ruff_format(new)
+    result2 = _run_ruff_format(curr)
+    _write_pyproject(curr)
+    return result1 and result2
 
 
-def _get_modified_pyproject() -> TOMLDocument:
+def _get_modified_pyproject() -> PyProject:
     pyproject = read_pyproject()
     doc = pyproject.doc
     try:
@@ -70,14 +57,20 @@ def _get_modified_pyproject() -> TOMLDocument:
     ruff["format"] = format_
     ruff["lint"] = lint
     lint["isort"] = isort
-    return doc
+    return PyProject(contents=dumps(doc), doc=doc)
 
 
-def _run_ruff_format() -> bool:
+def _run_ruff_format(pyproject: PyProject, /) -> bool:
+    _write_pyproject(pyproject)
     cmd = ["ruff", "format", "."]
     try:
         code = check_call(cmd)
     except CalledProcessError:
         logger.exception("Failed to run {cmd!r}", cmd=" ".join(cmd))
-        raise
+        return False
     return code == 0
+
+
+def _write_pyproject(pyproject: PyProject, /) -> None:
+    with PYPROJECT_TOML.open(mode="w") as fh:
+        _ = fh.write(pyproject.contents)

{dycw_pre_commit_hooks-0.9.15 → dycw_pre_commit_hooks-0.9.16}/pyproject.toml

@@ -106,24 +106,40 @@ src = ["src"]
 target-version = "py310"
 unsafe-fixes = true
 
+[tool.ruff.format]
+preview = true
+
 [tool.ruff.lint]
+fixable = ["ALL"]
 ignore = [
   "ANN101",  # missing-type-self
   "ANN102",  # missing-type-cls
-  "ANN401",  # dynamically-typed-expression
-  "D",  # pydocstyle
+  "ANN401",  # any-type
+  "C901",  # complex-structure
+  "D100",  # undocumented-public-module
+  "D101",  # undocumented-public-class
+  "D102",  # undocumented-public-method
+  "D103",  # undocumented-public-function
+  "D104",  # undocumented-public-package
+  "D105",  # undocumented-magic-method
+  "D106",  # undocumented-public-nested-class
+  "D107",  # undocumented-public-init
+  "D203",  # one-blank-line-before-class
+  "D213",  # multi-line-summary-second-line
   "E501",  # line-too-long
-  "F403",  # undefined-local-with-import-star
-  "F405",  # undefined-local-with-import-star-usage
-  "PLE1142",  # await-outside-async
+  "PD901",  # pandas-df-variable-name
+  "PERF203",  # try-except-in-loop
   "PLR0911",  # too-many-return-statements
+  "PLR0912",  # too-many-branches
   "PLR0913",  # too-many-arguments
   "PLR0915",  # too-many-statements
   "PLR2004",  # magic-value-comparison
   "PT013",  # pytest-incorrect-pytest-import
-  "S101",  # assert-used
+  "S311",  # suspicious-non-cryptographic-random-usage
   "S603",  # subprocess-without-shell-equals-true
   "S607",  # start-process-with-partial-path
+  # preview
+  "S101",  # assert
   # formatter
   "W191",  # tab-indentation
   "E111",  # indentation-with-invalid-multiple
@@ -141,6 +157,19 @@ ignore = [
   "ISC002",  # multi-line-implicit-string-concatenation
 ]
 select = ["ALL"]
+unfixable = [
+  "B007",  # unused-loop-control-variable
+  "F541",  # f-string-missing-placeholders
+  "F601",  # multi-value-repeated-key-literal
+  "PIE794",  # duplicate-class-field-definition
+  "PLR5501",  # collapsible-else-if
+  "PT014",  # pytest-duplicate-parametrize-test-cases
+  "RET504",  # unnecessary-assign
+  "SIM102",  # collapsible-if
+  "SIM105",  # suppressible-exception
+  "SIM114",  # if-with-same-arms
+  "T201",  # print
+]
 
 [tool.ruff.lint.extend-per-file-ignores]
 "*.ipynb" = [

{dycw_pre_commit_hooks-0.9.15 → dycw_pre_commit_hooks-0.9.16}/requirements.txt

@@ -1,24 +1,24 @@
 # This file was autogenerated by uv via the following command:
 #    uv pip compile --extra=dev --prerelease=disallow --output-file=requirements.txt --python-version=3.10 pyproject.toml
-anyio==4.3.0
+anyio==4.4.0
     # via httpx
 attrs==23.2.0
     # via hypothesis
-backports-tarfile==1.1.0
+backports-tarfile==1.2.0
     # via jaraco-context
-certifi==2024.2.2
+certifi==2024.7.4
     # via
     #   httpcore
     #   httpx
 click==8.1.7
     # via
+    #   dycw-pre-commit-hooks (pyproject.toml)
     #   hatch
     #   userpath
 distlib==0.3.8
     # via virtualenv
 dycw-utilities==0.25.2
-editables==0.5
-    # via hatchling
+    # via dycw-pre-commit-hooks (pyproject.toml)
 exceptiongroup==1.2.1
     # via
     #   anyio
@@ -27,12 +27,13 @@ exceptiongroup==1.2.1
     #   pytest
 execnet==2.1.1
     # via pytest-xdist
-filelock==3.13.4
+filelock==3.15.4
     # via virtualenv
 h11==0.14.0
     # via httpcore
-hatch==1.9.4
-hatchling==1.21.1
+hatch==1.12.0
+    # via dycw-pre-commit-hooks (pyproject.toml)
+hatchling==1.25.0
     # via hatch
 httpcore==1.0.5
     # via httpx
@@ -40,14 +41,14 @@ httpx==0.27.0
     # via hatch
 hyperlink==21.0.0
     # via hatch
-hypothesis==6.100.1
+hypothesis==6.105.1
     # via dycw-utilities
 idna==3.7
     # via
     #   anyio
     #   httpx
     #   hyperlink
-importlib-metadata==7.1.0
+importlib-metadata==8.0.0
     # via keyring
 iniconfig==2.0.0
     # via pytest
@@ -57,18 +58,19 @@ jaraco-context==5.3.0
     # via keyring
 jaraco-functools==4.0.1
     # via keyring
-keyring==25.1.0
+keyring==25.2.1
     # via hatch
 loguru==0.7.2
+    # via dycw-pre-commit-hooks (pyproject.toml)
 markdown-it-py==3.0.0
     # via rich
 mdurl==0.1.2
     # via markdown-it-py
-more-itertools==10.2.0
+more-itertools==10.3.0
     # via
     #   jaraco-classes
     #   jaraco-functools
-packaging==24.0
+packaging==24.1
     # via
     #   hatch
     #   hatchling
@@ -77,30 +79,31 @@ pathspec==0.12.1
     # via hatchling
 pexpect==4.9.0
     # via hatch
-platformdirs==4.2.0
+platformdirs==4.2.2
     # via
     #   hatch
     #   virtualenv
-pluggy==1.4.0
+pluggy==1.5.0
     # via
     #   hatchling
     #   pytest
 ptyprocess==0.7.0
     # via pexpect
-pygments==2.17.2
+pygments==2.18.0
     # via rich
-pytest==8.1.1
+pytest==8.2.2
     # via
     #   dycw-utilities
     #   pytest-randomly
     #   pytest-xdist
 pytest-randomly==3.15.0
     # via dycw-utilities
-pytest-xdist==3.5.0
+pytest-xdist==3.6.1
     # via dycw-utilities
 rich==13.7.1
     # via hatch
 semver==3.0.2
+    # via dycw-pre-commit-hooks (pyproject.toml)
 shellingham==1.5.4
     # via hatch
 sniffio==1.3.1
@@ -115,20 +118,25 @@ tomli==2.0.1
     #   pytest
 tomli-w==1.0.0
     # via hatch
-tomlkit==0.12.4
-    # via hatch
-trove-classifiers==2024.4.10
+tomlkit==0.12.5
+    # via
+    #   dycw-pre-commit-hooks (pyproject.toml)
+    #   hatch
+trove-classifiers==2024.7.2
     # via hatchling
-typing-extensions==4.11.0
+typing-extensions==4.12.2
     # via
     #   anyio
     #   dycw-utilities
 userpath==1.9.2
     # via hatch
-virtualenv==20.25.3
+uv==0.2.22
+    # via hatch
+virtualenv==20.26.3
     # via hatch
 xdg-base-dirs==6.0.1
-zipp==3.18.1
+    # via dycw-pre-commit-hooks (pyproject.toml)
+zipp==3.19.2
     # via importlib-metadata
 zstandard==0.22.0
     # via hatch