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

dycw_pre_commit_hooks-0.9.17/.envrc

@@ -0,0 +1 @@
+layout pyenv 3.11.9

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

@@ -1,22 +1,28 @@
 repos:
   # fixers
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.4.0
+    rev: v0.5.7
     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.16
     hooks:
       - id: run-hatch-version
       - id: run-ruff-format
       - id: run-uv-pip-compile
-        args: [--python-version=3.10]
+        args: [--python-version=3.11]
   - repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
-    rev: v2.13.0
+    rev: v2.14.0
     hooks:
       - id: pretty-format-toml
         args: [--autofix, --trailing-commas]
+  - repo: https://github.com/pamoller/xmlformatter
+    rev: v0.2.6
+    hooks:
+      - id: xml-formatter
   - repo: https://github.com/pre-commit/mirrors-prettier
     rev: v4.0.0-alpha.8
     hooks:
@@ -26,7 +32,6 @@ repos:
     hooks:
       - id: check-executables-have-shebangs
       - id: check-merge-conflict
-      - id: check-shebang-scripts-are-executable
       - id: check-symlinks
       - id: destroyed-symlinks
       - id: detect-private-key

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

@@ -1,17 +1,18 @@
 Metadata-Version: 2.3
 Name: dycw-pre-commit-hooks
-Version: 0.9.15
+Version: 0.9.17
 Author-email: Derek Wan <d.wan@icloud.com>
-Requires-Python: >=3.10
+Requires-Python: >=3.11
 Requires-Dist: click<8.2,>=8.1.7
-Requires-Dist: dycw-utilities<0.26,>=0.25.1
+Requires-Dist: dycw-utilities<0.41,>=0.40.12
 Requires-Dist: loguru<0.8,>=0.7.2
 Requires-Dist: semver<3.1,>=3.0.2
-Requires-Dist: tomlkit<0.13,>=0.12.3
+Requires-Dist: tomlkit<0.14,>=0.13.2
 Requires-Dist: xdg-base-dirs<6.1,>=6.0.1
 Provides-Extra: dev
+Requires-Dist: basedpyright<1.17,>=1.16.0; extra == 'dev'
 Requires-Dist: dycw-utilities[test]; extra == 'dev'
-Requires-Dist: hatch; extra == 'dev'
+Requires-Dist: hatch<1.13,>=1.12.0; extra == 'dev'
 Description-Content-Type: text/markdown
 
 # pre-commit-hooks

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

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

{dycw_pre_commit_hooks-0.9.15 → dycw_pre_commit_hooks-0.9.17}/pre_commit_hooks/run_hatch_version/__init__.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from pathlib import Path
 from subprocess import PIPE, STDOUT, CalledProcessError, check_call
-from typing import cast
+from typing import Any, cast
 
 from click import command
 from loguru import logger
@@ -55,4 +55,4 @@ def _get_path_version_file() -> Path:
     except KeyError:
         logger.exception('pyproject.toml has no "tool.hatch.version" section')
         raise
-    return Path(cast(str, version["path"]))
+    return Path(cast(Any, version["path"]))

{dycw_pre_commit_hooks-0.9.15 → dycw_pre_commit_hooks-0.9.17}/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.17}/pyproject.toml

@@ -9,19 +9,23 @@ requires = ["hatchling"]
 authors = [{name = "Derek Wan", email = "d.wan@icloud.com"}]
 dependencies = [
   "click >= 8.1.7, < 8.2",
-  "dycw-utilities >= 0.25.1, < 0.26",
+  "dycw-utilities >= 0.40.12, < 0.41",
   "loguru >= 0.7.2, < 0.8",
   "semver >= 3.0.2, < 3.1",
-  "tomlkit >= 0.12.3, < 0.13",
+  "tomlkit >= 0.13.2, < 0.14",
   "xdg-base-dirs >= 6.0.1, < 6.1",
 ]
 dynamic = ["version"]
 name = "dycw-pre-commit-hooks"
 readme = "README.md"
-requires-python = ">= 3.10"
+requires-python = ">= 3.11"
 
 [project.optional-dependencies]
-dev = ["dycw-utilities[test]", "hatch"]
+dev = [
+  "basedpyright >= 1.16.0, < 1.17",
+  "dycw-utilities[test]",
+  "hatch >= 1.12.0, < 1.13",
+]
 
 [project.scripts]
 run-bump2version = "pre_commit_hooks.run_bump2version:main"
@@ -30,6 +34,21 @@ 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"
 
+# basedpyright
+[tool.basedpyright]
+include = ["src"]
+pythonVersion = "3.11"
+reportAny = false
+reportMissingTypeArgument = false
+reportMissingTypeStubs = false
+reportPrivateUsage = false
+reportUnknownArgumentType = false
+reportUnknownMemberType = false
+reportUnknownParameterType = false
+reportUnknownVariableType = false
+reportUnusedImport = false
+reportUnusedVariable = false
+
 # coverage
 [tool.coverage]
 
@@ -62,34 +81,10 @@ path = "src/pre_commit_hooks/__init__.py"
 # nitpick
 [tool.nitpick]
 style = [
-  "https://raw.githubusercontent.com/dycw/nitpick/master/styles/3.10.toml",
+  "https://raw.githubusercontent.com/dycw/nitpick/master/styles/3.11.toml",
   "https://raw.githubusercontent.com/dycw/nitpick/master/styles/common.toml",
 ]
 
-# pyright
-[tool.pyright]
-executionEnvironments = [{root = "src"}]
-include = ["src"]
-pythonVersion = "3.10"
-reportImplicitOverride = "error"
-reportImportCycles = "error"
-reportMissingSuperCall = "error"
-reportMissingTypeArgument = false
-reportMissingTypeStubs = false
-reportPrivateImportUsage = false
-reportPrivateUsage = false
-reportPropertyTypeMismatch = "error"
-reportShadowedImports = "error"
-reportUninitializedInstanceVariable = "error"
-reportUnknownArgumentType = false
-reportUnknownMemberType = false
-reportUnknownParameterType = false
-reportUnknownVariableType = false
-reportUnnecessaryTypeIgnoreComment = "error"
-reportUntypedBaseClass = false
-reportUnusedCallResult = "error"
-typeCheckingMode = "strict"
-
 # pytest
 [tool.pytest]
 
@@ -103,27 +98,43 @@ xfail_strict = true
 # ruff
 [tool.ruff]
 src = ["src"]
-target-version = "py310"
+target-version = "py311"
 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 +152,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.17}/requirements.txt

@@ -1,38 +1,35 @@
 # 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
+#    uv pip compile --extra=dev --prerelease=disallow --output-file=requirements.txt --python-version=3.11 pyproject.toml
+anyio==4.4.0
     # via httpx
-attrs==23.2.0
+attrs==24.2.0
     # via hypothesis
-backports-tarfile==1.1.0
+backports-tarfile==1.2.0
     # via jaraco-context
-certifi==2024.2.2
+basedpyright==1.16.0
+    # via dycw-pre-commit-hooks (pyproject.toml)
+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
-exceptiongroup==1.2.1
-    # via
-    #   anyio
-    #   dycw-utilities
-    #   hypothesis
-    #   pytest
+dycw-utilities==0.40.12
+    # via dycw-pre-commit-hooks (pyproject.toml)
 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 +37,14 @@ httpx==0.27.0
     # via hatch
 hyperlink==21.0.0
     # via hatch
-hypothesis==6.100.1
+hypothesis==6.111.0
     # via dycw-utilities
 idna==3.7
     # via
     #   anyio
     #   httpx
     #   hyperlink
-importlib-metadata==7.1.0
+importlib-metadata==8.2.0
     # via keyring
 iniconfig==2.0.0
     # via pytest
@@ -55,52 +52,60 @@ jaraco-classes==3.4.0
     # via keyring
 jaraco-context==5.3.0
     # via keyring
-jaraco-functools==4.0.1
+jaraco-functools==4.0.2
     # via keyring
-keyring==25.1.0
+keyring==25.3.0
     # 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.4.0
     # via
     #   jaraco-classes
     #   jaraco-functools
-packaging==24.0
+nodejs-wheel-binaries==20.16.0
+    # via basedpyright
+packaging==24.1
     # via
     #   hatch
     #   hatchling
     #   pytest
+    #   pytest-rerunfailures
 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.3.2
     # via
     #   dycw-utilities
     #   pytest-randomly
+    #   pytest-rerunfailures
     #   pytest-xdist
 pytest-randomly==3.15.0
     # via dycw-utilities
-pytest-xdist==3.5.0
+pytest-rerunfailures==14.0
+    # via dycw-utilities
+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
@@ -109,26 +114,25 @@ sniffio==1.3.1
     #   httpx
 sortedcontainers==2.4.0
     # via hypothesis
-tomli==2.0.1
-    # via
-    #   hatchling
-    #   pytest
 tomli-w==1.0.0
     # via hatch
-tomlkit==0.12.4
-    # via hatch
-trove-classifiers==2024.4.10
-    # via hatchling
-typing-extensions==4.11.0
+tomlkit==0.13.2
     # via
-    #   anyio
-    #   dycw-utilities
+    #   dycw-pre-commit-hooks (pyproject.toml)
+    #   hatch
+trove-classifiers==2024.7.2
+    # via hatchling
+typing-extensions==4.12.2
+    # via dycw-utilities
 userpath==1.9.2
     # via hatch
-virtualenv==20.25.3
+uv==0.2.36
+    # 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.20.0
     # via importlib-metadata
-zstandard==0.22.0
+zstandard==0.23.0
     # via hatch

dycw_pre_commit_hooks-0.9.15/.envrc

@@ -1 +0,0 @@
-layout pyenv 3.10.14