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

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

@@ -1,11 +1,13 @@
 Metadata-Version: 2.4
 Name: dycw-pre-commit-hooks
-Version: 0.11.0
+Version: 0.11.2
 Author-email: Derek Wan <d.wan@icloud.com>
 Requires-Python: >=3.12
 Requires-Dist: click<8.3,>=8.2.1
-Requires-Dist: dycw-utilities<0.126,>=0.125.10
+Requires-Dist: dycw-utilities<0.151,>=0.150.11
+Requires-Dist: libcst<1.9,>=1.8.2
 Requires-Dist: loguru<0.8,>=0.7.3
+Requires-Dist: packaging<25.1,>=25.0
 Requires-Dist: tomlkit<0.14,>=0.13.2
 Description-Content-Type: text/markdown
 
@@ -26,6 +28,7 @@ My [`pre-commit`](https://pre-commit.com/) hooks.
      - repo: https://github.com/dycw/pre-commit-hooks
        rev: master
        hooks:
+         - id: replace-sequence-str
          - id: run-bump-my-version
          - id: run-ruff-format
    ```

{dycw_pre_commit_hooks-0.11.0 → dycw_pre_commit_hooks-0.11.2}/README.md

@@ -15,6 +15,7 @@ My [`pre-commit`](https://pre-commit.com/) hooks.
      - repo: https://github.com/dycw/pre-commit-hooks
        rev: master
        hooks:
+         - id: replace-sequence-str
          - id: run-bump-my-version
          - id: run-ruff-format
    ```

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

@@ -9,7 +9,8 @@ requires = ["hatchling"]
 [dependency-groups]
 dev = [
   "dycw-utilities[test]",
-  "pyright[nodejs]>=1.1.401",
+  "pyright[nodejs]",
+  "rich",
 ]
 
 # project
@@ -17,24 +18,27 @@ dev = [
 authors = [{name = "Derek Wan", email = "d.wan@icloud.com"}]
 dependencies = [
   "click >= 8.2.1, < 8.3",
-  "dycw-utilities >= 0.125.10, < 0.126",
+  "dycw-utilities >= 0.150.11, < 0.151",
+  "libcst >= 1.8.2, < 1.9",
   "loguru >= 0.7.3, < 0.8",
+  "packaging >= 25.0, < 25.1",
   "tomlkit >= 0.13.2, < 0.14",
 ]
 name = "dycw-pre-commit-hooks"
 readme = "README.md"
 requires-python = ">= 3.12"
-version = "0.11.0"
+version = "0.11.2"
 
 [project.scripts]
+format-requirements = "pre_commit_hooks.format_requirements:main"
+replace-sequence-str = "pre_commit_hooks.replace_sequence_str:main"
 run-bump-my-version = "pre_commit_hooks.run_bump_my_version:main"
-run-bump2version = "pre_commit_hooks.run_bump2version:main"
 run-ruff-format = "pre_commit_hooks.run_ruff_format:main"
 
 # bump-my-version
 [tool.bumpversion]
 allow_dirty = true
-current_version = "0.11.0"
+current_version = "0.11.2"
 
 [[tool.bumpversion.files]]
 filename = "src/pre_commit_hooks/__init__.py"
@@ -106,7 +110,15 @@ typeCheckingMode = "strict"
 [tool.pytest]
 
 [tool.pytest.ini_options]
-addopts = ["-ra", "-vv", "--color=auto", "--strict-markers"]
+addopts = [
+  "-ra",
+  "-vv",
+  "--color=auto",
+  "--strict-markers",
+]
+asyncio_default_fixture_loop_scope = "function"
+asyncio_mode = "auto"
+collect_imported_tests = false
 filterwarnings = ["error"]
 minversion = "8.0"
 testpaths = ["src/tests"]
@@ -120,8 +132,10 @@ unsafe-fixes = true
 
 [tool.ruff.format]
 preview = true
+skip-magic-trailing-comma = true
 
 [tool.ruff.lint]
+explicit-preview-rules = true
 fixable = ["ALL"]
 ignore = [
   "ANN401",  # any-type
@@ -137,14 +151,17 @@ ignore = [
   "D107",  # undocumented-public-init
   "D203",  # one-blank-line-before-class
   "D213",  # multi-line-summary-second-line
+  "DOC",  # pydoclint
   "E501",  # line-too-long
   "PD",  # pandas-vet
   "PERF203",  # try-except-in-loop
+  "PLC0415",  # import-outside-top-level
   "PLR0911",  # too-many-return-statements
   "PLR0912",  # too-many-branches
   "PLR0913",  # too-many-arguments
   "PLR0915",  # too-many-statements
   "PLR2004",  # magic-value-comparison
+  "PT012",  # pytest-raises-with-multiple-statements
   "PT013",  # pytest-incorrect-pytest-import
   "S311",  # suspicious-non-cryptographic-random-usage
   "S603",  # subprocess-without-shell-equals-true
@@ -167,19 +184,10 @@ ignore = [
   "ISC001",  # single-line-implicit-string-concatenation
   "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
+preview = true
+select = [
+  "ALL",
+  "RUF022",  # unsorted-dunder-all
 ]
 
 [tool.ruff.lint.extend-per-file-ignores]
@@ -199,3 +207,4 @@ ban-relative-imports = "all"
 
 [tool.ruff.lint.isort]
 required-imports = ["from __future__ import annotations"]
+split-on-trailing-comma = false

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

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

{dycw_pre_commit_hooks-0.11.0 → dycw_pre_commit_hooks-0.11.2}/src/pre_commit_hooks/common.py

@@ -4,7 +4,7 @@ from dataclasses import dataclass
 
 from loguru import logger
 from tomlkit import TOMLDocument, parse
-from utilities.git import get_repo_root
+from utilities.pathlib import get_repo_root
 
 _ROOT = get_repo_root()
 PYPROJECT_TOML = _ROOT.joinpath("pyproject.toml")

dycw_pre_commit_hooks-0.11.2/src/pre_commit_hooks/format_requirements/__init__.py

@@ -0,0 +1,109 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, override
+
+from click import argument, command
+from packaging._tokenizer import ParserSyntaxError
+from packaging.requirements import (
+    InvalidRequirement,
+    Requirement,
+    _parse_requirement,  # pyright: ignore[reportPrivateImportUsage]
+)
+from packaging.specifiers import Specifier, SpecifierSet
+from tomlkit import array, dumps, loads, string
+from tomlkit.items import Array, Table
+from utilities.atomicwrites import writer
+from utilities.click import FilePath
+
+from pre_commit_hooks.common import PYPROJECT_TOML
+
+if TYPE_CHECKING:
+    from collections.abc import Iterator
+    from pathlib import Path
+
+    from tomlkit.toml_document import TOMLDocument
+
+
+@command()
+@argument("paths", nargs=-1, type=FilePath)
+def main(*, paths: tuple[Path, ...]) -> bool:
+    """CLI for the `format_requirements` hook."""
+    results = list(map(_process, paths))
+    return all(results)
+
+
+def _process(path: Path, /) -> bool:
+    doc = loads(path.read_text())
+    expected = _format_path(path)
+    if doc == expected:
+        return True
+    with writer(path, overwrite=True) as temp:
+        _ = temp.write_text(dumps(expected))
+    return False
+
+
+def _format_path(path: Path, /) -> TOMLDocument:
+    doc = loads(path.read_text())
+    if isinstance(dep_grps := doc.get("dependency-groups"), Table):
+        for key, value in dep_grps.items():
+            if isinstance(value, Array):
+                dep_grps[key] = _format_array(value)
+    if isinstance(project := doc["project"], Table):
+        if isinstance(deps := project["dependencies"], Array):
+            project["dependencies"] = _format_array(deps)
+        if isinstance(optional := project.get("optional-dependencies"), Table):
+            for key, value in optional.items():
+                if isinstance(value, Array):
+                    optional[key] = _format_array(value)
+    return doc
+
+
+def _format_array(dependencies: Array, /) -> Array:
+    new = array().multiline(multiline=True)
+    new.extend(map(_format_item, dependencies))
+    return new
+
+
+def _format_item(item: Any, /) -> Any:
+    if not isinstance(item, str):
+        return item
+    return string(str(_CustomRequirement(item)))
+
+
+class _CustomRequirement(Requirement):
+    @override
+    def __init__(self, requirement_string: str) -> None:
+        super().__init__(requirement_string)
+        try:
+            parsed = _parse_requirement(requirement_string)
+        except ParserSyntaxError as e:
+            raise InvalidRequirement(str(e)) from e
+        self.specifier = _CustomSpecifierSet(parsed.specifier)
+
+    @override
+    def _iter_parts(self, name: str) -> Iterator[str]:
+        yield name
+        if self.extras:
+            formatted_extras = ",".join(sorted(self.extras))
+            yield f"[{formatted_extras}]"
+        if self.specifier:
+            yield f" {self.specifier}"
+        if self.url:
+            yield f"@ {self.url}"
+            if self.marker:
+                yield " "
+        if self.marker:
+            yield f"; {self.marker}"
+
+
+class _CustomSpecifierSet(SpecifierSet):
+    @override
+    def __str__(self) -> str:
+        specs = sorted(self._specs, key=self._key)
+        return ", ".join(map(str, specs))
+
+    def _key(self, spec: Specifier, /) -> int:
+        return [">=", "<"].index(spec.operator)
+
+
+__all__ = ["PYPROJECT_TOML", "main"]

dycw_pre_commit_hooks-0.11.2/src/pre_commit_hooks/format_requirements/__main__.py

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

dycw_pre_commit_hooks-0.11.2/src/pre_commit_hooks/replace_sequence_str/__init__.py

@@ -0,0 +1,55 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, override
+
+from click import argument, command
+from libcst import CSTTransformer, Name, Subscript, parse_module
+from libcst.matchers import Index as MIndex
+from libcst.matchers import Name as MName
+from libcst.matchers import Subscript as MSubscript
+from libcst.matchers import SubscriptElement as MSubscriptElement
+from libcst.matchers import matches
+from libcst.metadata import MetadataWrapper
+from utilities.click import FilePath
+
+if TYPE_CHECKING:
+    from pathlib import Path
+
+
+@command()
+@argument("paths", nargs=-1, type=FilePath)
+def main(*, paths: tuple[Path, ...]) -> bool:
+    """CLI for the `replace_sequence_str` hook."""
+    results = list(map(_process, paths))
+    return all(results)
+
+
+def _process(path: Path, /) -> bool:
+    existing = path.read_text()
+    wrapper = MetadataWrapper(parse_module(existing))
+    transformed = wrapper.module.visit(SequenceToListTransformer())
+    new = transformed.code
+    if existing == new:
+        return True
+    _ = path.write_text(new)
+    return False
+
+
+class SequenceToListTransformer(CSTTransformer):
+    @override
+    def leave_Subscript(
+        self, original_node: Subscript, updated_node: Subscript
+    ) -> Subscript:
+        _ = original_node
+        if matches(
+            updated_node,
+            MSubscript(
+                value=MName("Sequence"),
+                slice=[MSubscriptElement(slice=MIndex(value=MName("str")))],
+            ),
+        ):
+            return updated_node.with_changes(value=Name("list"))
+        return updated_node
+
+
+__all__ = ["main"]

dycw_pre_commit_hooks-0.11.2/src/pre_commit_hooks/replace_sequence_str/__main__.py

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

dycw_pre_commit_hooks-0.11.2/src/tests/format_requirements/in.toml

@@ -0,0 +1,30 @@
+[dependency-groups]
+group = [
+  "unbounded",
+  "lower>=1.2.3",
+  "upper<1.3",
+  "lower-and-upper1>=1.2.3,<1.3",
+]
+
+[project]
+dependencies = [
+  "unbounded",
+  "lower1>=1.2.3",
+  "lower2  >=  1.2.3",
+  "upper1<1.3",
+  "upper2  <  1.3",
+  "lower-and-upper1>=1.2.3,<1.3",
+  "lower-and-upper2<1.3,>=1.2.3",
+  "lower-and-upper3  >=  1.2.3  ,  <1.3",
+  "with-extra[extra]",
+  "with-extra[extra]>=1.2.3",
+  "with-extra[extra]  >=  1.2.3",
+]
+
+[project.optional-dependencies]
+group = [
+  "unbounded",
+  "lower>=1.2.3",
+  "upper<1.3",
+  "lower-and-upper1>=1.2.3,<1.3",
+]

dycw_pre_commit_hooks-0.11.2/src/tests/format_requirements/out.toml

@@ -0,0 +1,30 @@
+[dependency-groups]
+group = [
+    "unbounded",
+    "lower >=1.2.3",
+    "upper <1.3",
+    "lower-and-upper1 >=1.2.3, <1.3",
+]
+
+[project]
+dependencies = [
+    "unbounded",
+    "lower1 >=1.2.3",
+    "lower2 >=1.2.3",
+    "upper1 <1.3",
+    "upper2 <1.3",
+    "lower-and-upper1 >=1.2.3, <1.3",
+    "lower-and-upper2 >=1.2.3, <1.3",
+    "lower-and-upper3 >=1.2.3, <1.3",
+    "with-extra[extra]",
+    "with-extra[extra] >=1.2.3",
+    "with-extra[extra] >=1.2.3",
+]
+
+[project.optional-dependencies]
+group = [
+    "unbounded",
+    "lower >=1.2.3",
+    "upper <1.3",
+    "lower-and-upper1 >=1.2.3, <1.3",
+]

dycw_pre_commit_hooks-0.11.2/src/tests/format_requirements/test_format_requirements.py

@@ -0,0 +1,15 @@
+from __future__ import annotations
+
+from pathlib import Path
+
+from tomlkit import dumps
+
+from pre_commit_hooks.format_requirements import _format_path
+
+
+class TestFormatRequirements:
+    def test_basic(self) -> None:
+        root = Path(__file__).parent
+        result = dumps(_format_path(root.joinpath("in.toml")))
+        expected = root.joinpath("out.toml").read_text()
+        assert result == expected