dycw-pre-commit-hooks 0.11.0__py3-none-any.whl → 0.11.2__py3-none-any.whl

{dycw_pre_commit_hooks-0.11.0.dist-info → dycw_pre_commit_hooks-0.11.2.dist-info}/METADATA

@@ -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.2.dist-info/RECORD

@@ -0,0 +1,15 @@
+pre_commit_hooks/__init__.py,sha256=lAKdthArx0NmOOdvqV2oArnC7ufTxG7U4dfzJERu5Rg,59
+pre_commit_hooks/common.py,sha256=JDpKC4-T4ucPZkK3bAQZ9xrYKsJ7wi1mTo5gVXFGe80,695
+pre_commit_hooks/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pre_commit_hooks/format_requirements/__init__.py,sha256=OXqdd3J5p9sstWcdEOCQb5wH3tDAZStecO6CKRZvBuA,3381
+pre_commit_hooks/format_requirements/__main__.py,sha256=15JSp_rhjI_Ddoj4MRkHFShfnYxs6GggUhLRlGtrQ0E,156
+pre_commit_hooks/replace_sequence_str/__init__.py,sha256=bPkc3KHbu8RMFykIsegW06hAKUXtXjJD36KtECDsNR8,1607
+pre_commit_hooks/replace_sequence_str/__main__.py,sha256=B1dxOxngV4vUVnDVrXSywiySOs1P_zF30_4ZMRsOSaY,157
+pre_commit_hooks/run_bump_my_version/__init__.py,sha256=9RpVVqTmtmKkV8rMR4sMfI-i_7gaLOmNrfi2GWgtNSk,1953
+pre_commit_hooks/run_bump_my_version/__main__.py,sha256=w2V3y61jrSau-zxjl8ciHtWPlJQwXbYxNJ2tGYVyI4s,156
+pre_commit_hooks/run_ruff_format/__init__.py,sha256=4QYVE-ktOZjJZGqLMpy4_Te1dASzEkEYVBHzpa1EdGM,2062
+pre_commit_hooks/run_ruff_format/__main__.py,sha256=faesqqpMaesg5r-LvkkQt1W9kahvNr-60K3SMYv1NgY,152
+dycw_pre_commit_hooks-0.11.2.dist-info/METADATA,sha256=bY5QDsslyHwR37tAwZiLdBPROljDO1uNx0gUbr4JQAY,884
+dycw_pre_commit_hooks-0.11.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+dycw_pre_commit_hooks-0.11.2.dist-info/entry_points.txt,sha256=V5pxLTDfSr4UJAWI-1bNEazF1SCSkkpYr0nRx3B0QTg,268
+dycw_pre_commit_hooks-0.11.2.dist-info/RECORD,,

{dycw_pre_commit_hooks-0.11.0.dist-info → dycw_pre_commit_hooks-0.11.2.dist-info}/entry_points.txt

@@ -1,4 +1,5 @@
 [console_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

pre_commit_hooks/__init__.py

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

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")

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"]

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()))

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"]

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.0.dist-info/RECORD

@@ -1,11 +0,0 @@
-pre_commit_hooks/__init__.py,sha256=lh8ioZVWPAfeUxjmKuyUNzuciJwPUGFpTLYQARsjt5s,59
-pre_commit_hooks/common.py,sha256=sApXaiGpUrPfzlneJQYPYonm8ikWQWNdI6BK7Is8bcA,691
-pre_commit_hooks/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pre_commit_hooks/run_bump_my_version/__init__.py,sha256=9RpVVqTmtmKkV8rMR4sMfI-i_7gaLOmNrfi2GWgtNSk,1953
-pre_commit_hooks/run_bump_my_version/__main__.py,sha256=w2V3y61jrSau-zxjl8ciHtWPlJQwXbYxNJ2tGYVyI4s,156
-pre_commit_hooks/run_ruff_format/__init__.py,sha256=4QYVE-ktOZjJZGqLMpy4_Te1dASzEkEYVBHzpa1EdGM,2062
-pre_commit_hooks/run_ruff_format/__main__.py,sha256=faesqqpMaesg5r-LvkkQt1W9kahvNr-60K3SMYv1NgY,152
-dycw_pre_commit_hooks-0.11.0.dist-info/METADATA,sha256=G02WHjfL3dfXNyD9pl0Xj05cTiK-bbUGQrif_pVkbto,777
-dycw_pre_commit_hooks-0.11.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-dycw_pre_commit_hooks-0.11.0.dist-info/entry_points.txt,sha256=URODtkWLHrg6PagXnVbubNWnEUjExjCM_lCPf2LEllo,196
-dycw_pre_commit_hooks-0.11.0.dist-info/RECORD,,