apexcodexpy 0.7.2__tar.gz → 0.7.3__tar.gz

{apexcodexpy-0.7.2 → apexcodexpy-0.7.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apexcodexpy
-Version: 0.7.2
+Version: 0.7.3
 Summary: The Non-Destructive Configuration Steward for Python Projects.
 License-File: LICENSE
 Author: Apex Dev

{apexcodexpy-0.7.2 → apexcodexpy-0.7.3}/codex/infra/program.py

@@ -1,12 +1,14 @@
 from __future__ import annotations
 
 import subprocess
-from collections.abc import Callable, Iterable, Iterator, MutableSequence
 from dataclasses import dataclass, field, replace
-from typing import Any, Protocol
+from typing import TYPE_CHECKING, Any, Protocol
 
 from codex.infra.result import ComboResult, ProgramResult, TaskResult
 
+if TYPE_CHECKING:
+    from collections.abc import Callable, Iterable, Iterator, MutableSequence
+
 
 @dataclass(frozen=True)
 class Program:
@@ -22,6 +24,7 @@ class Program:
                     text=True,
                     encoding="utf-8",
                     capture_output=True,
+                    check=False,
                 )
             ),
         )

{apexcodexpy-0.7.2 → apexcodexpy-0.7.3}/codex/infra/pyproject.py

@@ -1,14 +1,20 @@
 from __future__ import annotations
 
+import hashlib
 from dataclasses import dataclass, field
 from pathlib import Path
-from typing import Any
+from typing import TYPE_CHECKING, Any, Self
 
 import tomlkit
+from tomlkit import TOMLDocument
 
-from codex.infra.program import Executable
 from codex.infra.result import ProgramResult
 
+if TYPE_CHECKING:
+    from collections.abc import Mapping, MutableMapping
+
+    from codex.infra.program import Executable
+
 
 def _mypy_config() -> dict[str, Any]:
     return {
@@ -38,8 +44,21 @@ def _ruff_config() -> dict[str, Any]:
                 "I",
                 "N",
                 "UP",
+                "RUF",
+                "FURB",
+                "PERF",
+                "LOG",
+                "PIE",
+                "SLF",
+                "DTZ",
+                "PTH",
+                "TRY",
+                "PL",
+                "TCH",
             ],
-            "mccabe": {"max-complexity": 10},
+            "mccabe": {
+                "max-complexity": 10,
+            },
         }
     }
 
@@ -79,10 +98,9 @@ class PyProjectToml:
         if not pyproject.exists():
             return self._result.fail(message=f"{self.NAME} not found.")
 
-        document = tomlkit.parse(pyproject.read_text(encoding="utf-8"))
-        original = tomlkit.dumps(document)
-        deep_merge(STANDARDS, document)
-        modified = tomlkit.dumps(document)
+        document = Tomler.read(pyproject)
+        original = document.dumps()
+        modified = document.update_with(STANDARDS).dumps()
 
         if original == modified:
             return self._result.no_changes()
@@ -94,8 +112,35 @@ class PyProjectToml:
     def toml_on(self, path: Path) -> Path:
         return path / self.NAME
 
+    @staticmethod
+    def latest() -> Tomler:
+        return Tomler.read(Path("pyproject.toml")).update_with(STANDARDS)
+
+
+@dataclass(frozen=True)
+class Tomler:
+    document: TOMLDocument
+
+    @classmethod
+    def read(cls, path: Path) -> Tomler:
+        return cls(tomlkit.parse(path.read_text(encoding="utf-8")))
+
+    def dumps(self) -> str:
+        return tomlkit.dumps(self.document)
+
+    def update_with(self, source: Mapping[str, Any]) -> Self:
+        deep_merge(source, self.document)
+
+        return self
+
+    def hashed(self) -> str:
+        return hashlib.sha256(self.dumps().encode()).hexdigest()
+
 
-def deep_merge(source: dict[str, Any], destination: dict[str, Any]) -> None:
+def deep_merge(
+    source: Mapping[str, Any],
+    destination: MutableMapping[str, Any],
+) -> None:
     """Recursively merges the source into destination with TOML formatting."""
     for key, value in source.items():
         match value:

{apexcodexpy-0.7.2 → apexcodexpy-0.7.3}/codex/infra/reporters.py

@@ -1,11 +1,13 @@
 from __future__ import annotations
 
 from dataclasses import dataclass, field
-from typing import Protocol
+from typing import TYPE_CHECKING, Protocol
 
-from codex.infra.result import Reporter
 from codex.infra.typer.device import TyperDevice
 
+if TYPE_CHECKING:
+    from codex.infra.result import Reporter
+
 
 @dataclass(frozen=True)
 class SimpleReporter:

{apexcodexpy-0.7.2 → apexcodexpy-0.7.3}/codex/infra/result.py

@@ -1,8 +1,10 @@
 from __future__ import annotations
 
 from dataclasses import dataclass, field
-from subprocess import CompletedProcess
-from typing import Any, Protocol
+from typing import TYPE_CHECKING, Any, Protocol
+
+if TYPE_CHECKING:
+    from subprocess import CompletedProcess
 
 
 class TaskResult(Protocol):

{apexcodexpy-0.7.2 → apexcodexpy-0.7.3}/codex/infra/service.py

@@ -1,8 +1,8 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
-from pathlib import Path
 from time import time
+from typing import TYPE_CHECKING
 
 from codex.infra.program import Command, Executable, MultiProgram, Program
 from codex.infra.pyproject import PyProjectToml
@@ -24,6 +24,9 @@ from codex.infra.workflows import (
 )
 from codex.infra.workflows.lock import CodexLockWorkflow
 
+if TYPE_CHECKING:
+    from pathlib import Path
+
 
 @dataclass(frozen=True)
 class Codex:

{apexcodexpy-0.7.2 → apexcodexpy-0.7.3}/codex/infra/tools.py

@@ -4,6 +4,7 @@ import sys
 from dataclasses import dataclass, field
 from importlib import metadata
 from pathlib import Path
+from typing import TYPE_CHECKING
 
 from codex.infra.program import (
     BoundedProgram,
@@ -11,7 +12,9 @@ from codex.infra.program import (
     MultiProgram,
     Program,
 )
-from codex.infra.result import TaskResult
+
+if TYPE_CHECKING:
+    from codex.infra.result import TaskResult
 
 
 @dataclass(frozen=True, kw_only=True)

{apexcodexpy-0.7.2 → apexcodexpy-0.7.3}/codex/infra/workflows/base.py

@@ -3,13 +3,16 @@ from __future__ import annotations
 from abc import ABC, abstractmethod
 from dataclasses import dataclass
 from datetime import UTC, datetime
-from pathlib import Path
+from typing import TYPE_CHECKING
 
 from codex.infra.program import Executable, LazyExecutable
 from codex.infra.result import ProgramResult
 from codex.infra.tools import Version
 from codex.infra.yamler import Yamler
 
+if TYPE_CHECKING:
+    from pathlib import Path
+
 
 @dataclass(frozen=True, kw_only=True)
 class YamlWorkflow(ABC):

{apexcodexpy-0.7.2 → apexcodexpy-0.7.3}/codex/infra/workflows/ci.py

@@ -1,10 +1,13 @@
 from __future__ import annotations
 
-from collections.abc import MutableMapping, MutableSequence
 from dataclasses import dataclass, field, replace
+from typing import TYPE_CHECKING
 
 from codex.infra.yamler import Yamler
 
+if TYPE_CHECKING:
+    from collections.abc import MutableMapping, MutableSequence
+
 
 @dataclass(frozen=True)
 class CiWorkflow:

{apexcodexpy-0.7.2 → apexcodexpy-0.7.3}/codex/infra/workflows/lock.py

@@ -6,6 +6,7 @@ from pathlib import Path
 
 from codex.infra.yamler import Yamler
 
+from ..pyproject import PyProjectToml
 from .base import YamlWorkflow
 
 
@@ -24,10 +25,10 @@ class CodexLockWorkflow(YamlWorkflow):
         return Yamler.parse(
             {
                 "hashes": {
-                    "pyproject": hash_of(Path("pyproject.toml")),
+                    "pyproject": PyProjectToml.latest().hashed(),
                 },
             }
         )
 
     def verify(self) -> bool:
-        return self.path.exists() and self.standards == Yamler.read(self.path)
+        return not self.path.exists() or self.standards == Yamler.read(self.path)

{apexcodexpy-0.7.2 → apexcodexpy-0.7.3}/codex/infra/yamler.py

@@ -1,14 +1,16 @@
 from __future__ import annotations
 
-from collections.abc import Iterable, Mapping
 from dataclasses import dataclass
-from pathlib import Path
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 from ruamel.yaml import YAML
 from ruamel.yaml.comments import CommentedMap
 from ruamel.yaml.scalarstring import FoldedScalarString
 
+if TYPE_CHECKING:
+    from collections.abc import Iterable, Mapping
+    from pathlib import Path
+
 
 @dataclass(frozen=True, kw_only=True)
 class Yamler:

{apexcodexpy-0.7.2 → apexcodexpy-0.7.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "apexcodexpy"
-version = "0.7.2"
+version = "0.7.3"
 description = "The Non-Destructive Configuration Steward for Python Projects."
 readme = "README.md"
 authors = [
@@ -54,6 +54,24 @@ select = [
     "I",
     "N",
     "UP",
+    "RUF",
+    "FURB",
+    "PERF",
+    "LOG",
+    "PIE",
+    "SLF",
+    "DTZ",
+    "PTH",
+    "TRY",
+    "PL",
+    "TCH",
+]
+
+ignore = [
+    "TRY003",
+    "PLR0913",
+    "PLR0917",
+    "PLR2004",
 ]
 
 [tool.ruff.lint.mccabe]

{apexcodexpy-0.7.2 → apexcodexpy-0.7.3}/codex/infra/workflows/__init__.py

@@ -3,7 +3,7 @@ from .dependabot import DependabotWorkflow
 from .validate import CheckCodeWorkflow
 
 __all__ = [
-    "DependabotWorkflow",
     "BuildCodeWorkflow",
     "CheckCodeWorkflow",
+    "DependabotWorkflow",
 ]