fix: switch to ubuntu-latest and fix black formatting drift

- CI: switch from self-hosted to ubuntu-latest (self-hosted runner has no
  passwordless sudo for apt-get; ubuntu-latest has full sudo + more pre-installed libs)
- Format 7 files with black (pre-existing drift)

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: chrisdpurcell

.github/workflows/ci.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   test:
-    runs-on: [self-hosted, linux, l3digital]
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         python-version: ["3.12", "3.13", "3.14"]
@@ -45,7 +45,7 @@ jobs:
         fail_ci_if_error: false
 
   lint:
-    runs-on: [self-hosted, linux, l3digital]
+    runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v4

src/utils/constants.py

@@ -9,8 +9,26 @@
 # File extensions shown in the QFileSystemModel tree.
 # Covers common text, config, markup, and script formats.
 TEXT_FILE_EXTENSIONS = [
-    "*.txt", "*.md", "*.rst", "*.csv", "*.log",
-    "*.json", "*.yaml", "*.yml", "*.toml", "*.xml", "*.html", "*.htm",
-    "*.css", "*.js", "*.ts", "*.py", "*.sh", "*.bash",
-    "*.conf", "*.cfg", "*.ini", "*.env",
+    "*.txt",
+    "*.md",
+    "*.rst",
+    "*.csv",
+    "*.log",
+    "*.json",
+    "*.yaml",
+    "*.yml",
+    "*.toml",
+    "*.xml",
+    "*.html",
+    "*.htm",
+    "*.css",
+    "*.js",
+    "*.ts",
+    "*.py",
+    "*.sh",
+    "*.bash",
+    "*.conf",
+    "*.cfg",
+    "*.ini",
+    "*.env",
 ]

src/views/main_window.py

@@ -235,7 +235,9 @@ def _setup_file_tree(self) -> None:
         self._fs_model = QFileSystemModel(self.ui)
         self._fs_model.setRootPath(QDir.homePath())
         self._fs_model.setNameFilters(TEXT_FILE_EXTENSIONS)
-        self._fs_model.setNameFilterDisables(False)  # hide non-matches (not just grey them)
+        self._fs_model.setNameFilterDisables(
+            False
+        )  # hide non-matches (not just grey them)
         self._file_tree_view.setModel(self._fs_model)
         self._file_tree_view.setRootIndex(self._fs_model.index(QDir.homePath()))
         # Hide size/type/date columns — name column only
@@ -324,7 +326,9 @@ def _connect_signals(self) -> None:
         self._plain_text_edit.cursorPositionChanged.connect(self._update_cursor_label)
         # contentsChanged fires on Delete/Backspace where cursor position does not
         # change — without this the char count goes stale after in-place deletions.
-        self._plain_text_edit.document().contentsChanged.connect(self._update_cursor_label)
+        self._plain_text_edit.document().contentsChanged.connect(
+            self._update_cursor_label
+        )
 
         # Keyboard shortcuts not present in the .ui file.
         # (Ctrl+S/O/Q/Shift+S are already wired via QAction shortcuts in main_window.ui.)

src/views/preferences_dialog.py

@@ -30,7 +30,9 @@
 
 def _require(widget: "_W | None", name: str) -> "_W":
     if widget is None:
-        raise RuntimeError(f"Required widget '{name}' not found in preferences_dialog.ui")
+        raise RuntimeError(
+            f"Required widget '{name}' not found in preferences_dialog.ui"
+        )
     return widget
 
 
@@ -98,7 +100,8 @@ def _load_ui(self, parent: QWidget | None) -> None:
             self.dialog.findChild(QCheckBox, "wordWrapCheckBox"), "wordWrapCheckBox"
         )
         self._line_numbers_cb = _require(
-            self.dialog.findChild(QCheckBox, "lineNumbersCheckBox"), "lineNumbersCheckBox"
+            self.dialog.findChild(QCheckBox, "lineNumbersCheckBox"),
+            "lineNumbersCheckBox",
         )
         self._theme_light_radio = _require(
             self.dialog.findChild(QRadioButton, "themeLightRadio"), "themeLightRadio"
@@ -161,7 +164,9 @@ def _write_to_settings(self) -> None:
         settings.setValue(KEY_FONT_SIZE, self._font_size_spin.value())
         settings.setValue(KEY_WORD_WRAP, self._word_wrap_cb.isChecked())
         settings.setValue(KEY_LINE_NUMBERS, self._line_numbers_cb.isChecked())
-        settings.setValue(KEY_THEME, "dark" if self._theme_dark_radio.isChecked() else "light")
+        settings.setValue(
+            KEY_THEME, "dark" if self._theme_dark_radio.isChecked() else "light"
+        )
         settings.setValue(KEY_DEFAULT_DIR, self._default_dir_edit.text())
 
     def _on_apply_clicked(self) -> None:

tests/integration/test_live_scenarios.py

@@ -87,9 +87,7 @@ def test_title_loses_star_after_save(self, app, tmp_path, qtbot):
 
 
 class TestCleaningWithRealService:
-    def test_trim_removes_trailing_spaces_and_blank_lines(
-        self, app, tmp_path, qtbot
-    ):
+    def test_trim_removes_trailing_spaces_and_blank_lines(self, app, tmp_path, qtbot):
         # trim_whitespace strips trailing spaces per line and removes trailing
         # blank lines, but does NOT strip leading spaces.
         f = tmp_path / "trim.txt"
@@ -148,9 +146,7 @@ def test_find_wraps_from_end_of_document(self, app, tmp_path, qtbot):
         app._on_find_clicked()  # wraps to start, then finds
         assert app._plain_text_edit.textCursor().selectedText() == "quick"
 
-    def test_replace_all_updates_editor_and_emits_signal(
-        self, app, tmp_path, qtbot
-    ):
+    def test_replace_all_updates_editor_and_emits_signal(self, app, tmp_path, qtbot):
         f = tmp_path / "rep.txt"
         f.write_text("cat cat cat", encoding="utf-8")
         app._file_name_edit.setText(str(f))

tests/integration/test_main_window.py

@@ -105,20 +105,25 @@ def test_title_keeps_star_after_cleaning(self, window, mock_text_svc, qtbot):
 class TestOrphanWidgets:
     def test_unnamed_checkboxes_not_present(self, window):
         from PySide6.QtWidgets import QCheckBox
+
         for name in ("checkBox_2", "checkBox_4", "checkBox_6"):
-            assert window.ui.findChild(QCheckBox, name) is None, \
-                f"Orphan widget {name!r} should not exist"
+            assert (
+                window.ui.findChild(QCheckBox, name) is None
+            ), f"Orphan widget {name!r} should not exist"
 
     def test_text_label_placeholders_not_present(self, window):
         from PySide6.QtWidgets import QLabel
+
         for name in ("label", "label_2"):
-            assert window.ui.findChild(QLabel, name) is None, \
-                f"Placeholder label {name!r} should not exist"
+            assert (
+                window.ui.findChild(QLabel, name) is None
+            ), f"Placeholder label {name!r} should not exist"
 
 
 class TestMergeTab:
     def test_merge_tab_has_expected_widgets(self, window):
         from PySide6.QtWidgets import QListWidget, QPushButton, QLineEdit
+
         assert window.ui.findChild(QListWidget, "mergeFileList") is not None
         assert window.ui.findChild(QPushButton, "mergeButton") is not None
         assert window.ui.findChild(QPushButton, "mergeAddCurrentButton") is not None
@@ -151,19 +156,15 @@ def test_raises_if_ui_file_unreadable(self, monkeypatch, qapp):
         from unittest.mock import MagicMock
         from src.views.main_window import MainWindow
 
-        monkeypatch.setattr(
-            "src.views.main_window.QFile.open", lambda *_: False
-        )
+        monkeypatch.setattr("src.views.main_window.QFile.open", lambda *_: False)
         with pytest.raises(RuntimeError, match="Cannot open UI file"):
             MainWindow(MagicMock())
 
     def test_raises_if_loader_returns_none(self, monkeypatch, qapp):
         from unittest.mock import MagicMock
         from src.views.main_window import MainWindow
 
-        monkeypatch.setattr(
-            "src.views.main_window.QUiLoader.load", lambda *_: None
-        )
+        monkeypatch.setattr("src.views.main_window.QUiLoader.load", lambda *_: None)
         with pytest.raises(RuntimeError, match="QUiLoader failed"):
             MainWindow(MagicMock())
 
@@ -198,9 +199,7 @@ def test_checking_trim_checkbox_triggers_cleaning(
         with qtbot.waitSignal(window._viewmodel.content_updated, timeout=1000):
             window._trim_cb.setChecked(True)
 
-    def test_clean_options_reflect_checkbox_states(
-        self, window, mock_text_svc, qtbot
-    ):
+    def test_clean_options_reflect_checkbox_states(self, window, mock_text_svc, qtbot):
         window._viewmodel.load_file("/tmp/test.txt")
         qtbot.wait(10)
         window._clean_cb.setChecked(False)
@@ -355,6 +354,7 @@ class TestDefaultTab:
     def test_opens_on_clean_tab(self, window):
         """Tab widget must default to index 0 (Clean tab), not 2 (Find/Replace)."""
         from PySide6.QtWidgets import QTabWidget
+
         tab = window.ui.findChild(QTabWidget, "tabWidget")
         assert tab is not None
         assert tab.currentIndex() == 0
@@ -377,6 +377,7 @@ class TestKeyboardShortcuts:
     def _shortcut_for(self, window, key_string: str):
         """Return the QShortcut whose key matches key_string, or raise."""
         from PySide6.QtGui import QKeySequence, QShortcut
+
         target = QKeySequence(key_string)
         shortcuts = window.ui.findChildren(QShortcut)
         for sc in shortcuts:
@@ -387,6 +388,7 @@ def _shortcut_for(self, window, key_string: str):
     def test_ctrl_f_switches_to_find_replace_tab(self, window, qtbot):
         """Ctrl+F switches to the Find/Replace tab (tab index matches _find_replace_tab_index)."""
         from PySide6.QtWidgets import QTabWidget
+
         tab = window.ui.findChild(QTabWidget, "tabWidget")
         assert tab.currentIndex() == 0, "precondition: starts on Clean tab"
         sc = self._shortcut_for(window, "Ctrl+F")
@@ -397,6 +399,7 @@ def test_ctrl_f_switches_to_find_replace_tab(self, window, qtbot):
     def test_ctrl_h_switches_to_find_replace_tab(self, window, qtbot):
         """Ctrl+H switches to the Find/Replace tab (tab index matches _find_replace_tab_index)."""
         from PySide6.QtWidgets import QTabWidget
+
         tab = window.ui.findChild(QTabWidget, "tabWidget")
         assert tab.currentIndex() == 0, "precondition: starts on Clean tab"
         sc = self._shortcut_for(window, "Ctrl+H")
@@ -425,6 +428,7 @@ class TestConvertEncodingHandler:
     def test_convert_button_calls_viewmodel(self, window, qtbot):
         """Clicking the Convert button must call viewmodel.convert_to_utf8."""
         from unittest.mock import patch
+
         window._plain_text_edit.setPlainText("hello")
         with patch.object(window._viewmodel, "convert_to_utf8") as mock_convert:
             window._convert_button.click()
@@ -473,6 +477,7 @@ def test_char_count_updates_on_delete_without_cursor_move(self, window, qtbot):
 def _real_save_svc(mock_file_svc):
     """Extends mock_file_svc with real FileService.save_file for disk-write assertions."""
     from src.services.file_service import FileService
+
     mock_file_svc.save_file.side_effect = FileService().save_file
     return mock_file_svc
 
@@ -519,6 +524,7 @@ def isolated_settings(self, tmp_path, monkeypatch):
         bodies can construct a matching QSettings instance to read/clear it.
         """
         from PySide6.QtCore import QSettings
+
         tmp_ini = str(tmp_path / "test_settings.ini")
         monkeypatch.setattr(
             "src.views.main_window.QSettings",
@@ -530,6 +536,7 @@ def isolated_settings(self, tmp_path, monkeypatch):
     def test_save_settings_writes_geometry(self, window, qtbot):
         """_save_settings must write window/geometry to QSettings."""
         from PySide6.QtCore import QSettings
+
         # Clear geometry in the same temp file the window will write to
         s = QSettings(self._tmp_ini, QSettings.Format.IniFormat)
         s.remove("window/geometry")
@@ -541,6 +548,7 @@ def test_save_settings_writes_geometry(self, window, qtbot):
     def test_load_settings_does_not_raise_when_empty(self, window):
         """_load_settings must not raise when no settings have been saved."""
         from PySide6.QtCore import QSettings
+
         QSettings(self._tmp_ini, QSettings.Format.IniFormat).clear()
         window._load_settings()  # must not raise
 
@@ -562,7 +570,9 @@ def test_save_and_restore_geometry(self, window, qtbot):
 class TestMergeWorkflow:
     """Integration tests for the merge tab — real files, real ViewModel signals."""
 
-    def test_add_current_and_merge(self, window, mock_file_svc, mock_text_svc, tmp_path, qtbot):
+    def test_add_current_and_merge(
+        self, window, mock_file_svc, mock_text_svc, tmp_path, qtbot
+    ):
         """Load a file, add it to the merge list, merge it, verify editor content."""
         from PySide6.QtWidgets import QListWidget
 
@@ -601,7 +611,9 @@ def test_add_current_and_merge(self, window, mock_file_svc, mock_text_svc, tmp_p
 
         assert window._plain_text_edit.toPlainText() == "aaa\nbbb"
 
-    def test_merge_tab_list_refreshes_on_add(self, window, mock_file_svc, tmp_path, qtbot):
+    def test_merge_tab_list_refreshes_on_add(
+        self, window, mock_file_svc, tmp_path, qtbot
+    ):
         """Adding a file to merge list refreshes the QListWidget display."""
         from PySide6.QtWidgets import QListWidget
 
@@ -631,7 +643,9 @@ def test_merge_empty_list_shows_error(self, window, monkeypatch, qtbot):
             "src.views.main_window.QMessageBox.critical",
             lambda *a, **kw: None,
         )
-        with qtbot.waitSignal(window._viewmodel.error_occurred, timeout=1000) as blocker:
+        with qtbot.waitSignal(
+            window._viewmodel.error_occurred, timeout=1000
+        ) as blocker:
             window._viewmodel.execute_merge()
         assert "No files in merge list" in blocker.args[0]
 
@@ -669,7 +683,9 @@ def test_word_wrap_enabled(self, window):
         from PySide6.QtWidgets import QPlainTextEdit
         from src.views.preferences_dialog import KEY_WORD_WRAP
 
-        QSettings(self._tmp_ini, QSettings.Format.IniFormat).setValue(KEY_WORD_WRAP, True)
+        QSettings(self._tmp_ini, QSettings.Format.IniFormat).setValue(
+            KEY_WORD_WRAP, True
+        )
         window._apply_preferences()
         assert (
             window._plain_text_edit.lineWrapMode()
@@ -682,8 +698,7 @@ def test_word_wrap_disabled_by_default(self, window):
 
         window._apply_preferences()  # no settings written — default False applies
         assert (
-            window._plain_text_edit.lineWrapMode()
-            == QPlainTextEdit.LineWrapMode.NoWrap
+            window._plain_text_edit.lineWrapMode() == QPlainTextEdit.LineWrapMode.NoWrap
         )
 
     def test_dark_theme_changes_palette(self, window, qapp):
@@ -714,6 +729,8 @@ def test_open_preferences_dialog(self, window, monkeypatch):
         from unittest.mock import MagicMock
 
         mock_dlg = MagicMock()
-        monkeypatch.setattr("src.views.main_window.PreferencesDialog", lambda *_: mock_dlg)
+        monkeypatch.setattr(
+            "src.views.main_window.PreferencesDialog", lambda *_: mock_dlg
+        )
         window._on_action_preferences()
         mock_dlg.exec.assert_called_once()

tests/unit/test_file_service.py

@@ -106,12 +106,14 @@ def test_ascii_content_returns_utf8(self):
         is always safe for ASCII content.
         """
         from src.services.file_service import _detect_encoding
+
         raw = b"hello world"  # pure ASCII
         assert _detect_encoding(raw) == "utf-8"
 
     def test_non_ascii_utf8_content_returns_utf8(self):
         """Non-ASCII UTF-8 bytes (é, ñ) must return utf-8."""
         from src.services.file_service import _detect_encoding
+
         raw = "café résumé naïve".encode("utf-8")
         assert _detect_encoding(raw) == "utf-8"
 
@@ -126,7 +128,9 @@ def _failing_replace(src: str, dst: str) -> None:
             raise OSError("simulated disk full")
 
         monkeypatch.setattr("src.services.file_service.os.replace", _failing_replace)
-        monkeypatch.setattr("src.services.file_service.os.unlink", lambda p: removed.append(p))
+        monkeypatch.setattr(
+            "src.services.file_service.os.unlink", lambda p: removed.append(p)
+        )
 
         doc = TextDocument(filepath=str(tmp_path / "out.txt"), content="data")
         with pytest.raises(OSError, match="simulated disk full"):

tests/unit/test_main_viewmodel.py

@@ -263,7 +263,9 @@ def test_move_merge_item_backward(self, vm, qtbot):
             vm.move_merge_item(2, 0)  # move c before a
         assert blocker.args[0] == ["c.txt", "a.txt", "b.txt"]
 
-    def test_execute_merge_emits_document_loaded(self, vm, mock_file_svc, mock_text_svc, qtbot):
+    def test_execute_merge_emits_document_loaded(
+        self, vm, mock_file_svc, mock_text_svc, qtbot
+    ):
         mock_text_svc.merge_documents.return_value = "merged content"
         vm.add_files_to_merge(["/tmp/a.txt", "/tmp/b.txt"])
         with qtbot.waitSignal(vm.document_loaded, timeout=1000) as blocker: