mirror of
https://github.com/kuhyx/screen-locker.git
synced 2026-11-10 20:27:13 +01:00
Krzysztof kuhy Rudnicki
ec0946f64e
`requires-python` and the CI pin already said 3.14, but ruff, mypy and pylint were still grading against 3.10 -- three tools judging an interpreter nothing runs any more, and ruff withholding the pyupgrade fixes that only become safe at the newer target. `pin_ci_python.py` rewrites exactly these three knobs. What the stale target was hiding: 118 sites on `datetime.timezone.utc` instead of `datetime.UTC` (UP017), two classes still written with `Generic[...]` rather than PEP 695 syntax, and ruff's stable formatter applying PEP 758 -- `except (A, B):` becomes `except A, B:`. That last one makes the source 3.14-only at the syntax level, which is what `requires-python = ">=3.14"` already promised; kuhy chose it deliberately over holding ruff a release back (2026-08-29). The PEP 695 fix needed a hand: ruff rewrote `class WidgetGroup(Generic[_W])` to `class WidgetGroup[W: tk.Misc]` but left the body annotated with the module-level `_W`, a *different* type variable -- mypy caught it as "a function returning TypeVar should receive at least one argument containing the same TypeVar". Renamed the body to the new parameter, gave `FrameGroup.__init__` the concrete `list[tk.Frame]` it always wrapped, and deleted the two now-dead module-level TypeVars. ruff, ruff-format, mypy --strict and both pylint passes clean at the new target. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01SfnJmxxsZ534AKk16rC2Gr
74 lines
2.1 KiB
Python
74 lines
2.1 KiB
Python
"""Shared factory for unlock_screen tests.
|
|
|
|
Extracted from test_screen_lock_coverage_part2.py when it was split for the
|
|
250-line cap, so both halves build their locker the same way. Named with a
|
|
leading underscore so pre-commit's name-tests-test hook skips it.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
from datetime import UTC, datetime
|
|
import json
|
|
from typing import TYPE_CHECKING
|
|
from unittest.mock import MagicMock
|
|
|
|
from screen_locker.tests.conftest import create_locker
|
|
|
|
if TYPE_CHECKING:
|
|
from pathlib import Path
|
|
|
|
|
|
def setup_unlock(
|
|
mock_tk: MagicMock,
|
|
tmp_path: Path,
|
|
weekly_count: int = 5,
|
|
streak: int = 0,
|
|
adjust_ok: bool = True,
|
|
seed_today_type: str | None = None,
|
|
):
|
|
"""Create a locker ready to call unlock_screen.
|
|
|
|
``seed_today_type`` pre-logs a counted workout for today under a
|
|
different ``workout_id``, so the unlock's own verified workout is an
|
|
ADDITIONAL same-day one — the case that now earns the +1h bonus.
|
|
"""
|
|
log_file = tmp_path / "log.json"
|
|
if seed_today_type is None:
|
|
log_file.write_text("{}")
|
|
else:
|
|
today = datetime.now(tz=UTC).strftime("%Y-%m-%d")
|
|
log_file.write_text(
|
|
json.dumps(
|
|
{
|
|
today: [
|
|
{
|
|
"timestamp": f"{today}T06:00:00+00:00",
|
|
"workout_data": {"type": seed_today_type},
|
|
"workout_id": f"{seed_today_type}:{today}",
|
|
}
|
|
]
|
|
}
|
|
)
|
|
)
|
|
locker = create_locker(mock_tk, tmp_path)
|
|
locker.log_file = log_file
|
|
locker.workout_data = {"type": "phone_verified"}
|
|
|
|
object.__setattr__(
|
|
locker, "_try_adjust_shutdown_for_workout", MagicMock(return_value=False)
|
|
)
|
|
object.__setattr__(
|
|
locker, "_clear_debt_on_verified_workout", MagicMock(return_value=None)
|
|
)
|
|
object.__setattr__(
|
|
locker,
|
|
"_adjust_shutdown_time_by",
|
|
MagicMock(return_value=adjust_ok),
|
|
)
|
|
object.__setattr__(
|
|
locker,
|
|
"_read_shutdown_config",
|
|
MagicMock(return_value=(22, 22, 5)),
|
|
)
|
|
return locker
|