fix(drift): F1+F2 — the sweep refuses false greens, and CI provisions the real floor (t39)
t38 found two holes in the drift gate itself. F2 — the job could never run where it mattered. Home Assistant 2026.10.1 declares ``Requires-Python >=3.14.2`` (PyPI metadata), so the old guard let a 3.13 runner through and the ``homeassistant>=2026.10`` install then failed with a resolver error. The job now provisions its own interpreter (``actions/setup-python@v5`` with ``python-version: "3.14"``) and the guard runs against the REAL floor, read from ``ha_api_drift.HOMEASSISTANT_PYTHON_FLOOR`` — one source of truth, pinned by a test against the installed distribution's own ``Requires-Python`` metadata. Verified: on 3.13.16 the guard refuses with "Home Assistant needs Python >= 3.14.2, but this job runs 3.13.16 / Fix: raise actions/setup-python…"; on 3.14.8 it reports "interpreter ok"; and ``uvx --python 3.14 --with 'homeassistant>=2026.10'`` resolves 2026.10.1. F1 — the standalone entry point was a false green. It printed counters and exited 0 even when it had walked nothing, which is exactly how the manual red-proof tool gets misused. The non-vacuity floors now live in ``ha_api_drift.FLOORS`` and are enforced in ONE place, ``Report.floor_violations()``, used by the pytest wrapper and by ``__main__`` (so the constants cannot drift apart; a test asserts the wrapper holds no floor-like constants of its own). On top of that the sweep can no longer lie in either direction: * an empty or mis-targeted directory reports ``FLOOR:`` lines and ``drift sweep FAILED`` and exits 1 (a non-existent path is a ``bad-path`` finding, not a traceback and not a silent zero-module sweep); * with no homeassistant installed it returns a single ``no-homeassistant`` finding with zero counters — never a wall of phantom "broken-import"s, never a green exit. Verified in the CI-equivalent environment (Python 3.14.8 + homeassistant 2026.10.1): HEAD exits 0 with "no Home-Assistant API drift (13 modules, 60 imports, 35 call arguments, 7 awaited HA calls)"; the empty directory exits 1 with 4 FLOOR lines and no findings; a missing path exits 1 with the ``bad-path`` finding; and the full pre-fix tree (``git archive 5ede4fe``) exits 1 with exactly the three t36 drifts (media_player.py:965 BrowseMediaSource, diagnostics.py:93 homeassistant.util.diagnostic, config_flow.py:425 missing-await) and 0 floor violations. The fast ``test`` job and ``release.yml`` are untouched; the workflow is unchanged in shape except the new provisioning + guard steps, and parses as valid YAML.
This commit is contained in:
1 parent
824d6192a1
commit
fd62d850b7
3 files changed
+222
-18
No files matched your search
+105
-2
@@ -39,7 +39,17 @@ method our own class overrides is not resolved against HA. Those gaps are
|
||||
visible in the ``Report`` counters, which the pytest wrapper asserts on so the
|
||||
sweep cannot silently become vacuous.
|
||||
|
||||
Without homeassistant installed nothing can be resolved; the pytest wrapper
|
||||
The standalone entry point (``python tests/ha_api_drift.py [path …]``) exits
|
||||
non-zero on findings *and* on counters below ``FLOORS`` — an empty or
|
||||
mis-targeted directory is a failure, never a green sweep. ``FLOORS`` is the one
|
||||
source of truth for both that entry point and the pytest wrapper, and the
|
||||
interpreter floor Home Assistant itself declares lives here too
|
||||
(``HOMEASSISTANT_PYTHON_FLOOR``), where CI's guard reads it instead of repeating
|
||||
the number.
|
||||
|
||||
Without homeassistant installed the sweep cannot resolve anything: ``scan()``
|
||||
returns a single ``no-homeassistant`` finding, the counters stay at zero (so the
|
||||
floors fail on purpose) and nothing is ever reported green. The pytest wrapper
|
||||
(``tests/test_ha_api_drift.py``) skips cleanly in that case, and CI runs one job
|
||||
with homeassistant installed for exactly this check.
|
||||
"""
|
||||
@@ -48,7 +58,9 @@ from __future__ import annotations
|
||||
|
||||
import ast
|
||||
import importlib
|
||||
import importlib.util
|
||||
import inspect
|
||||
import re
|
||||
from dataclasses import dataclass, field
|
||||
from pathlib import Path
|
||||
|
||||
@@ -76,6 +88,25 @@ HA_CALL_OWNERS: dict[str, tuple[str, str]] = {
|
||||
"async_add_executor_job": ("homeassistant.core", "HomeAssistant"),
|
||||
}
|
||||
|
||||
#: Non-vacuity floors — the ONE source of truth for the standalone entry point
|
||||
#: and the pytest wrapper (t39 F1). They sit below the current walk (13 modules,
|
||||
#: 60 imports, 35 checked arguments, 7 awaited HA calls) so a broken or
|
||||
#: mis-targeted walk fails loudly instead of printing zeros and exiting 0.
|
||||
FLOORS: dict[str, int] = {
|
||||
"modules": 10,
|
||||
"imports": 40,
|
||||
"call_args": 20,
|
||||
"awaited_calls": 5,
|
||||
}
|
||||
|
||||
#: The interpreter floor Home Assistant itself declares: PyPI metadata for
|
||||
#: 2026.10.1 is ``Requires-Python >=3.14.2``, so a 3.13 runner cannot even
|
||||
#: install the version this sweep must run against. CI's ``ha-api-drift`` job
|
||||
#: provisions a matching interpreter and guards with THIS constant, so the
|
||||
#: number is written once; tests/test_ha_api_drift.py pins it against the
|
||||
#: installed distribution's own metadata.
|
||||
HOMEASSISTANT_PYTHON_FLOOR: tuple[int, int, int] = (3, 14, 2)
|
||||
|
||||
_MISSING = object()
|
||||
|
||||
|
||||
@@ -102,6 +133,19 @@ class Report:
|
||||
call_args: int = 0
|
||||
awaited_calls: int = 0
|
||||
|
||||
def floor_violations(self, floors: dict[str, int] | None = None) -> list[str]:
|
||||
"""Counters below the non-vacuity floors — a sweep nobody should trust.
|
||||
|
||||
The floors default to module-level ``FLOORS`` so the standalone entry
|
||||
point and the pytest wrapper cannot drift apart (t39 F1).
|
||||
"""
|
||||
floors = FLOORS if floors is None else floors
|
||||
return [
|
||||
f"only {getattr(self, name)} {name} (floor: {floor})"
|
||||
for name, floor in floors.items()
|
||||
if getattr(self, name) < floor
|
||||
]
|
||||
|
||||
def __str__(self) -> str:
|
||||
if not self.findings:
|
||||
return (
|
||||
@@ -372,9 +416,31 @@ def _scan_awaits(tree: ast.AST, path: str, report: Report) -> None:
|
||||
_AwaitVisitor(bases, path, report).visit(statement)
|
||||
|
||||
|
||||
# ------------------------------------------------------ floors and versioning
|
||||
|
||||
|
||||
def parse_requires_python(spec: str | None) -> tuple[int, ...] | None:
|
||||
"""Parse a ``>=X.Y[.Z]`` Requires-Python string into a version tuple.
|
||||
|
||||
The CI interpreter guard and the metadata pin in the pytest wrapper both
|
||||
need the same reading of Home Assistant's own declaration.
|
||||
"""
|
||||
if not spec:
|
||||
return None
|
||||
match = re.match(r"\s*>=\s*(\d+(?:\.\d+)*)", spec)
|
||||
if match is None:
|
||||
return None
|
||||
return tuple(int(part) for part in match.group(1).split("."))
|
||||
|
||||
|
||||
# ----------------------------------------------------------------------- scan
|
||||
|
||||
|
||||
def homeassistant_available() -> bool:
|
||||
"""True when a real homeassistant is importable in this interpreter."""
|
||||
return importlib.util.find_spec("homeassistant") is not None
|
||||
|
||||
|
||||
def scan(paths=None) -> Report:
|
||||
"""Resolve every Home-Assistant API use in the production tree."""
|
||||
if paths is None:
|
||||
@@ -383,8 +449,35 @@ def scan(paths=None) -> Report:
|
||||
paths = [paths]
|
||||
|
||||
report = Report()
|
||||
if not homeassistant_available():
|
||||
# Neither a false green nor a wall of phantom findings: with no package
|
||||
# to resolve against, every import would "fail", so the sweep reports
|
||||
# that it cannot judge and leaves the counters at zero — which trips the
|
||||
# floors below on purpose.
|
||||
report.findings.append(
|
||||
Finding(
|
||||
"<environment>",
|
||||
0,
|
||||
"no-homeassistant",
|
||||
"homeassistant is not installed in this interpreter, so nothing "
|
||||
"can be resolved; install it (uvx --with homeassistant --python "
|
||||
"3.14 ...) or run tests/test_ha_api_drift.py, which skips cleanly",
|
||||
)
|
||||
)
|
||||
return report
|
||||
|
||||
for root in paths:
|
||||
root = Path(root)
|
||||
if not root.exists():
|
||||
report.findings.append(
|
||||
Finding(
|
||||
str(root),
|
||||
0,
|
||||
"bad-path",
|
||||
"path does not exist — nothing was scanned",
|
||||
)
|
||||
)
|
||||
continue
|
||||
files = sorted(root.glob("*.py")) if root.is_dir() else [root]
|
||||
for file in files:
|
||||
report.modules += 1
|
||||
@@ -402,4 +495,14 @@ if __name__ == "__main__": # pragma: no cover - manual red-proof entry point
|
||||
targets = sys.argv[1:] or None
|
||||
result = scan(targets)
|
||||
print(result)
|
||||
raise SystemExit(1 if result.findings else 0)
|
||||
violations = result.floor_violations()
|
||||
if result.findings or violations:
|
||||
for line in violations:
|
||||
print(f"FLOOR: {line}", file=sys.stderr)
|
||||
print(
|
||||
f"drift sweep FAILED ({len(result.findings)} finding(s), "
|
||||
f"{len(violations)} floor violation(s))",
|
||||
file=sys.stderr,
|
||||
)
|
||||
raise SystemExit(1)
|
||||
raise SystemExit(0)
|
||||
Reference in new issue
Block a user