preen 0.7.0__tar.gz → 0.7.2__tar.gz

{preen-0.7.0 → preen-0.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: preen
-Version: 0.7.0
+Version: 0.7.2
 Summary: Conformance and adoption CLI for the py-canon fleet standard
 Keywords: packaging,release,conformance,copier,cli,python
 Author: Gaurav Sood

{preen-0.7.0 → preen-0.7.2}/pyproject.toml

@@ -5,7 +5,7 @@ readme = "README.md"
 license = "MIT"
 license-files = ["LICENSE"]
 requires-python = ">=3.12"
-version = "0.7.0"
+version = "0.7.2"
 keywords = [
     "packaging",
     "release",
@@ -51,7 +51,7 @@ Repository = "https://github.com/gojiplus/preen"
 preen = "preen.cli:run"
 
 [build-system]
-requires = ["uv_build>=0.12.5,<0.13"]
+requires = ["uv_build>=0.12.5,<0.14"]
 build-backend = "uv_build"
 
 [tool.uv.build-backend]
@@ -140,6 +140,8 @@ allow-init-docstring = true
 exclude = '\.venv|tests|docs'
 
 [tool.codespell]
+builtin = "clear,rare,en-GB_to_en-US"
+ignore-regex = '''\bLICENCE\b|["']licence["']'''
 ignore-words-list = "leary,sav"
 
 [tool.pytest.ini_options]

{preen-0.7.0 → preen-0.7.2}/pyproject.toml.orig

@@ -6,7 +6,7 @@ license = "MIT"
 license-files = ["LICENSE"]
 authors = [{ name = "Gaurav Sood", email = "contact@gsood.com" }]
 requires-python = ">=3.12"
-version = "0.7.0"
+version = "0.7.2"
 keywords = ["packaging", "release", "conformance", "copier", "cli", "python"]
 classifiers = [
     "Intended Audience :: Developers",
@@ -52,7 +52,7 @@ Repository = "https://github.com/gojiplus/preen"
 preen = "preen.cli:run"
 
 [build-system]
-requires = ["uv_build>=0.12.5,<0.13"]
+requires = ["uv_build>=0.12.5,<0.14"]
 build-backend = "uv_build"
 
 [tool.uv.build-backend]
@@ -114,6 +114,9 @@ allow-init-docstring = true
 exclude = '\.venv|tests|docs'
 
 [tool.codespell]
+builtin = "clear,rare,en-GB_to_en-US"
+# Preserve supported license filenames.
+ignore-regex = '''\bLICENCE\b|["']licence["']'''  # codespell:ignore licence
 # "Leary" is a surname in the worked example of why auto-fixing spelling in
 # data files is unsafe; "sav" is a serialized-model filename extension checked
 # by runtime-assets.

{preen-0.7.0 → preen-0.7.2}/src/preen/adopt.py

@@ -21,7 +21,7 @@ from packaging.version import InvalidVersion, Version
 from tomlkit.items import Table
 
 CANON_TEMPLATE = "gh:gojiplus/py-canon"
-UV_BUILD_REQUIREMENT = "uv_build>=0.12.5,<0.13"
+UV_BUILD_REQUIREMENT = "uv_build>=0.12.5,<0.14"
 
 # [tool.*] sections merged onto the repo's own (see `_merge_canon`).
 CANON_TOOL_TOML = """
@@ -60,6 +60,9 @@ check-yield-types = false
 check-class-attributes = false
 allow-init-docstring = true
 exclude = '\\.venv|tests|docs'
+
+[tool.codespell]
+builtin = "clear,rare,en-GB_to_en-US"
 """
 
 LEGACY_TOOL_SECTIONS = ("black", "isort", "flake8", "mypy")
@@ -800,7 +803,7 @@ def _merge_canon(
     """Merge a repo's table onto the canon table for the same path, in place.
 
     Canon wins on every key it defines, except array settings on the union
-    allowlist, where the repo's extra entries are appended. Keys and
+    allowlist and codespell dictionaries, where extra entries are appended. Keys and
     subtables canon says nothing about — a repo's ``exclude`` list, its
     ``flake8-bugbear`` settings, its extra per-file-ignore patterns — are
     preserved verbatim, so adoption never silently drops deliberate config.
@@ -820,6 +823,19 @@ def _merge_canon(
             preserved.append(_describe(sub_path, repo_value))
             continue
         canon_value = canon[key]
+        if sub_path == ("codespell", "builtin"):
+            entries = str(canon_value).split(",")
+            selected = (
+                repo_value.split(",") if isinstance(repo_value, str) else repo_value
+            )
+            extra = sorted({str(entry).strip() for entry in selected} - set(entries))
+            extra = [entry for entry in extra if entry]
+            if extra:
+                canon[key] = ",".join([*entries, *extra])
+                preserved.append(
+                    f"{_describe(sub_path, repo_value)} entries: " + ", ".join(extra)
+                )
+            continue
         if isinstance(canon_value, dict) and isinstance(repo_value, dict):
             _merge_canon(canon_value, repo_value, sub_path, preserved)
         elif (
@@ -866,7 +882,7 @@ def rewrite_pyproject(
     preserved: list[str] = []
 
     tool = _ensure_table(doc, "tool")
-    for section in ("ruff", "pyright", "pydoclint"):
+    for section in ("ruff", "pyright", "pydoclint", "codespell"):
         canon_section = canon["tool"][section]  # type: ignore[index]
         if section in tool:
             changes.append(f"merged canon into [tool.{section}]")

{preen-0.7.0 → preen-0.7.2}/src/preen/checks/deptree.py

@@ -1,11 +1,41 @@
 """Circular dependency check using a simple Python implementation."""
 
 import ast
+from collections.abc import Iterable, Iterator
 from pathlib import Path
 
 from .base import Check, CheckResult, Impact, Issue, Severity
 
 
+def _is_type_checking(test: ast.expr) -> bool:
+    """Return whether ``test`` is ``TYPE_CHECKING`` or ``<module>.TYPE_CHECKING``."""
+    if isinstance(test, ast.Name):
+        return test.id == "TYPE_CHECKING"
+    return isinstance(test, ast.Attribute) and test.attr == "TYPE_CHECKING"
+
+
+def _load_time_nodes(node: ast.AST) -> Iterator[ast.AST]:
+    """Yield the nodes under ``node`` that execute when the module is imported.
+
+    A circular import only fails through imports that run while a module loads.
+    Deferring an import into a function body, or guarding it with
+    ``if TYPE_CHECKING:``, is the standard way to break a cycle, so neither is
+    an edge. Class bodies and the ``else`` branch of a TYPE_CHECKING test do run.
+    """
+    yield from _scan(ast.iter_child_nodes(node))
+
+
+def _scan(nodes: Iterable[ast.AST]) -> Iterator[ast.AST]:
+    for node in nodes:
+        if isinstance(node, (ast.FunctionDef, ast.AsyncFunctionDef, ast.Lambda)):
+            continue
+        if isinstance(node, ast.If) and _is_type_checking(node.test):
+            yield from _scan(node.orelse)
+            continue
+        yield node
+        yield from _scan(ast.iter_child_nodes(node))
+
+
 class DeptreeCheck(Check):
     """Check for circular dependencies in Python code."""
 
@@ -36,7 +66,7 @@ class DeptreeCheck(Check):
 
             tree = ast.parse(content, filename=str(file_path))
 
-            for node in ast.walk(tree):
+            for node in _load_time_nodes(tree):
                 if isinstance(node, ast.Import):
                     for alias in node.names:
                         imports.add(alias.name)

{preen-0.7.0 → preen-0.7.2}/src/preen/checks/metadata.py

@@ -53,7 +53,7 @@ def _compatible_requirement(declared: Any, expected: str) -> bool:
     if len(found.specifier) != 2 or set(bounds) != {">=", "<"}:
         return False
     minimum, ceiling = Version(bounds[">="]), Version(bounds["<"])
-    return standard[">="] <= minimum < ceiling == standard["<"]
+    return standard[">="] <= minimum < ceiling <= standard["<"]
 
 
 class MetadataCheck(Check):
@@ -166,7 +166,8 @@ class MetadataCheck(Check):
                 impact=Impact.IMPORTANT,
                 explanation=(
                     "The minimum may increase within the approved compatibility "
-                    "range; keep its exclusive upper bound. Run preen adopt "
+                    "range; the exclusive upper bound must not exceed the approved "
+                    "ceiling. Run preen adopt "
                     "--release-migration to migrate an older backend."
                 ),
             )

{preen-0.7.0 → preen-0.7.2}/src/preen/commands/release.py

@@ -6,7 +6,7 @@ publishing, GitHub Release). This command runs the checks, verifies that the tag
 and project metadata agree, asks for informed consent, then tags and pushes.
 """
 
-import datetime
+import datetime as dt
 import json
 import re
 import subprocess
@@ -498,7 +498,7 @@ def release_package(
     )
     # Local date, explicitly zoned: a changelog heading should carry the date
     # the releaser sees, not UTC's.
-    today = datetime.datetime.now().astimezone().date().isoformat()
+    today = dt.datetime.now().astimezone().date().isoformat()
     rename_unreleased = False
     if not has_version_entry(changelog_text, version):
         unreleased = unreleased_section_text(changelog_text)