mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2026-11-09 12:17:13 +00:00
kevinveenbirkenbachandClaude Opus 4.7
26ef3ff504
Adds ``[tool.ruff.lint]`` with ``select = ["E", "F", "I", "B", "UP"]``
and ``target-version = "py311"``. ``E501`` is ignored because
``ruff format`` already reflows what it can; the remaining long lines
are unsplittable string literals / URLs.
Auto-fixed (2753 issues, behavior-preserving):
- UP006/UP035: ``List[X]`` → ``list[X]``, ``Dict[X]`` → ``dict[X]``,
``from typing import …`` redirected where superseded by builtins.
- UP045: ``Optional[X]`` → ``X | None``.
- UP010/UP009/UP015: dropped Python-2-era pragmas (``from __future__
import absolute_import, division, print_function``,
``# -*- coding: utf-8 -*-``), redundant ``open(..., "r")`` mode.
- UP004: dropped implicit ``class X(object):``.
- UP022/UP008/UP032: stdlib idiom modernization (``capture_output``,
super-call simplification, etc.).
- B905: ``zip(...)`` → ``zip(..., strict=False)`` (preserves prior
behavior; switching to ``strict=True`` is a separate semantic
choice not made here).
- I001: import-block ordering.
Hand-fixed (66 issues):
- B904 × 54: appended ``from <bound>`` (when the enclosing ``except``
binds a name) or ``from None`` (when it doesn't) so chained
exceptions stay distinguishable from errors-during-exception-
handling. Applied via a small AST-aware script that walked back to
the enclosing ``except`` clause and matched the binding.
- B017 × 4: narrowed broad ``assertRaises(Exception)`` to the actual
``AnsibleError`` / ``AnsibleFilterError`` raised by the code under
test.
- B023 × 2: bound captured loop variables via default args
(``def _record(name, *, _path_real=path_real, ...)``) so each
closure gets its own snapshot.
- B007 × 2: unused loop control variables renamed to ``_`` /
rewritten to ``.values()``.
- UP007 × 2: ``Union[X, Y]`` → ``X | Y`` (plus dropping the now-unused
``from typing import Union``).
- B018 × 1: Odoo addon manifests are bare dict expressions at module
level by design — suppressed with an inline ``# noqa: B018`` and
rationale comment.
- UP031 × 1: printf-style format → f-string.
The 65 ``# noqa: …`` markers introduced by the auto-fixer all carry
real ruff codes (``B018``, ``E402``, ``F401``, etc.), so
``test_noqa_only_ruff_codes`` stays green.
Verification
============
- ``ruff check .`` → All checks passed
- ``ruff format --check .`` → 894 files already formatted
- ``tests.lint.repository.{test_project_root_import,
test_no_direct_yaml_calls, test_noqa_only_ruff_codes}`` and
``tests.unit.utils.annotations.test_suppress`` → 20 tests OK
- 1621 unit tests → all pass
- Integration suite: 44 failures (pre-existing baseline, none from
this change), 1 skipped.
Going forward, the new rules block regressions on E (style), F
(pyflakes), I (import order), B (likely-bug patterns), and UP
(modernization to py311) for any new code.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
57 lines
1.9 KiB
Python
57 lines
1.9 KiB
Python
# cli/deploy/development/deps.py
|
|
from __future__ import annotations
|
|
|
|
from typing import TYPE_CHECKING
|
|
|
|
if TYPE_CHECKING:
|
|
# Import only for type checking to avoid runtime import cycles.
|
|
from .compose import Compose
|
|
|
|
|
|
def resolve_run_after(
|
|
compose: Compose,
|
|
role_name: str,
|
|
*,
|
|
services_overrides_container_path: str | None = None,
|
|
) -> list[str]:
|
|
"""
|
|
Calls resolver inside the infinito container:
|
|
python -m cli.meta.applications.resolution.combined <role_name>
|
|
[--services-overrides <path-inside-container>]
|
|
|
|
`services_overrides_container_path` is the in-container path to a
|
|
JSON file `{role_name: services_map}` whose entries replace each
|
|
listed role's `meta/services.yml` for the resolver. Callers
|
|
(variant-aware planner) write the file to a path that is shared
|
|
with the container before calling.
|
|
"""
|
|
cmd = ["python3", "-m", "cli.meta.applications.resolution.combined", role_name]
|
|
if services_overrides_container_path:
|
|
cmd.extend(["--services-overrides", services_overrides_container_path])
|
|
r = compose.exec(cmd, check=False, workdir="/opt/src/infinito", capture=True)
|
|
|
|
if r.returncode != 0:
|
|
raise RuntimeError(
|
|
f"resolution.combined failed for {role_name} (rc={r.returncode})\n"
|
|
f"STDOUT:\n{r.stdout}\nSTDERR:\n{r.stderr}"
|
|
)
|
|
|
|
txt = (r.stdout or "").strip()
|
|
if not txt:
|
|
return []
|
|
return [t for t in txt.split() if t.strip()]
|
|
|
|
|
|
def apps_with_deps(app_id: str, deps_role_names: list[str]) -> list[str]:
|
|
"""
|
|
The resolver returns role folder names. In your current inventory groups,
|
|
group names == application_ids (folder names). So we can include them directly.
|
|
"""
|
|
out: list[str] = []
|
|
for d in deps_role_names:
|
|
if d != app_id and d not in out:
|
|
out.append(d)
|
|
if app_id not in out:
|
|
out.append(app_id)
|
|
return out
|