style: ruff format — collapse two-line hostname file path + version loop
All checks were successful
Build ISO / build-iso (push) Successful in 21m29s
CI / lint (push) Successful in 37s
CI / test (push) Successful in 58s
CI / validate-json (push) Successful in 42s
CI / markdown-links (push) Successful in 23s

Format-only diff from `ruff format`. The 26.5-alpha push's CI run failed
on `ruff format --check`; these three files had two-line constructs that
fit on one line at ruff's default line length. No behaviour change.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
Daniel Maksymilian Syrnicki 2026-04-20 12:41:58 +02:00
parent fec962e3d2
commit 54357aa2a3
3 changed files with 3 additions and 6 deletions

View file

@ -215,9 +215,7 @@ def test_refresh_caddyfile_substitutes_hostname_placeholder(updater, tmp_path):
# this the named-hostname :443 block ships with a literal # this the named-hostname :443 block ships with a literal
# `__FURTKA_HOSTNAME__` and Caddy refuses to load the config. # `__FURTKA_HOSTNAME__` and Caddy refuses to load the config.
src = tmp_path / "src" src = tmp_path / "src"
src.write_text( src.write_text("__FURTKA_HOSTNAME__.local, __FURTKA_HOSTNAME__ {\n\ttls internal\n}\n")
"__FURTKA_HOSTNAME__.local, __FURTKA_HOSTNAME__ {\n\ttls internal\n}\n"
)
assert updater._refresh_caddyfile(src) is True assert updater._refresh_caddyfile(src) is True
live = updater._CADDYFILE_LIVE.read_text() live = updater._CADDYFILE_LIVE.read_text()
assert "testbox.local, testbox {" in live assert "testbox.local, testbox {" in live

View file

@ -172,9 +172,7 @@ def test_post_install_substitutes_hostname_in_caddyfile(install_cmds):
# with the hostname the user picked in the form. The `testhost` value # with the hostname the user picked in the form. The `testhost` value
# comes from the install_cmds fixture. Without substitution Caddy's # comes from the install_cmds fixture. Without substitution Caddy's
# `tls internal` never issues a leaf cert for the real hostname. # `tls internal` never issues a leaf cert for the real hostname.
caddyfile_cmd = next( caddyfile_cmd = next((c for c in install_cmds if " > /etc/caddy/Caddyfile" in c), None)
(c for c in install_cmds if " > /etc/caddy/Caddyfile" in c), None
)
assert caddyfile_cmd is not None assert caddyfile_cmd is not None
written = _extract_written_content(caddyfile_cmd, "/etc/caddy/Caddyfile") written = _extract_written_content(caddyfile_cmd, "/etc/caddy/Caddyfile")
assert "__FURTKA_HOSTNAME__" not in written assert "__FURTKA_HOSTNAME__" not in written

View file

@ -49,6 +49,7 @@ FURTKA_VERSION = _resolve_version()
def _inject_version(): def _inject_version():
return {"furtka_version": FURTKA_VERSION} return {"furtka_version": FURTKA_VERSION}
LANGUAGES = { LANGUAGES = {
"en": {"locale": "en_US.UTF-8", "label": "English", "keyboard": "us"}, "en": {"locale": "en_US.UTF-8", "label": "English", "keyboard": "us"},
"de": {"locale": "de_DE.UTF-8", "label": "Deutsch", "keyboard": "de"}, "de": {"locale": "de_DE.UTF-8", "label": "Deutsch", "keyboard": "de"},