isort followed by black

tests/conftest.py

@@ -106,7 +106,7 @@ def freeze_qt_time(monkeypatch):
     QTime.currentTime().addSecs(3600) is still the same calendar day.
     """
     import bouquin.main_window as _mwmod
-    from PySide6.QtCore import QDate, QTime, QDateTime
+    from PySide6.QtCore import QDate, QDateTime, QTime
 
     today = QDate.currentDate()
     fixed_time = QTime(12, 0)

tests/test_bug_report_dialog.py

@@ -1,8 +1,8 @@
 import bouquin.bug_report_dialog as bugmod
-from bouquin.bug_report_dialog import BugReportDialog
 from bouquin import strings
-from PySide6.QtWidgets import QMessageBox
+from bouquin.bug_report_dialog import BugReportDialog
 from PySide6.QtGui import QTextCursor
+from PySide6.QtWidgets import QMessageBox
 
 
 def test_bug_report_truncates_text_to_max_chars(qtbot):

tests/test_code_block_editor_dialog.py

@@ -1,13 +1,11 @@
-from PySide6.QtWidgets import QPushButton
 from bouquin import strings
-
-from PySide6.QtCore import QRect, QSize
-from PySide6.QtGui import QPaintEvent, QFont
-
 from bouquin.code_block_editor_dialog import (
     CodeBlockEditorDialog,
     CodeEditorWithLineNumbers,
 )
+from PySide6.QtCore import QRect, QSize
+from PySide6.QtGui import QFont, QPaintEvent
+from PySide6.QtWidgets import QPushButton
 
 
 def _find_button_by_text(widget, text):

tests/test_code_highlighter.py

@@ -1,5 +1,5 @@
-from bouquin.code_highlighter import CodeHighlighter, CodeBlockMetadata
-from PySide6.QtGui import QTextCharFormat, QFont
+from bouquin.code_highlighter import CodeBlockMetadata, CodeHighlighter
+from PySide6.QtGui import QFont, QTextCharFormat
 
 
 def test_get_language_patterns_python(app):

tests/test_db.py

@@ -1,10 +1,12 @@
-import pytest
-import json, csv
+import csv
 import datetime as dt
-from sqlcipher3 import dbapi2 as sqlite
-from bouquin.db import DBManager
+import json
 from datetime import date, timedelta
 
+import pytest
+from bouquin.db import DBManager
+from sqlcipher3 import dbapi2 as sqlite
+
 
 def _today():
     return dt.date.today().isoformat()

tests/test_document_utils.py

@@ -1,10 +1,10 @@
-from unittest.mock import patch
-from pathlib import Path
 import tempfile
+from pathlib import Path
+from unittest.mock import patch
 
 from PySide6.QtCore import QUrl
-from PySide6.QtWidgets import QMessageBox, QWidget
 from PySide6.QtGui import QDesktopServices
+from PySide6.QtWidgets import QMessageBox, QWidget
 
 
 def test_open_document_from_db_success(qtbot, app, fresh_db):

tests/test_documents.py

@@ -1,13 +1,12 @@
-from unittest.mock import patch, MagicMock
-from pathlib import Path
 import tempfile
+from pathlib import Path
+from unittest.mock import MagicMock, patch
 
 from bouquin.db import DBConfig
-from bouquin.documents import TodaysDocumentsWidget, DocumentsDialog
+from bouquin.documents import DocumentsDialog, TodaysDocumentsWidget
 from PySide6.QtCore import Qt, QUrl
-from PySide6.QtWidgets import QMessageBox, QDialog, QFileDialog
 from PySide6.QtGui import QDesktopServices
-
+from PySide6.QtWidgets import QDialog, QFileDialog, QMessageBox
 
 # =============================================================================
 # TodaysDocumentsWidget Tests

tests/test_find_bar.py

@@ -1,10 +1,9 @@
 import pytest
-
+from bouquin.find_bar import FindBar
+from bouquin.markdown_editor import MarkdownEditor
+from bouquin.theme import Theme, ThemeConfig, ThemeManager
 from PySide6.QtGui import QTextCursor
 from PySide6.QtWidgets import QTextEdit, QWidget
-from bouquin.markdown_editor import MarkdownEditor
-from bouquin.theme import ThemeManager, ThemeConfig, Theme
-from bouquin.find_bar import FindBar
 
 
 @pytest.fixture

tests/test_history_dialog.py

@@ -1,7 +1,6 @@
-from PySide6.QtWidgets import QWidget, QMessageBox, QApplication
-from PySide6.QtCore import Qt, QTimer
-
 from bouquin.history_dialog import HistoryDialog
+from PySide6.QtCore import Qt, QTimer
+from PySide6.QtWidgets import QApplication, QMessageBox, QWidget
 
 
 def test_history_dialog_lists_and_revert(qtbot, fresh_db):

tests/test_invoices.py

@@ -1,19 +1,17 @@
-import pytest
 from datetime import date, timedelta
 
-from PySide6.QtCore import Qt, QDate
-from PySide6.QtWidgets import QMessageBox
-
+import pytest
 from bouquin.invoices import (
-    InvoiceDetailMode,
-    InvoiceLineItem,
-    _invoice_due_reminder_text,
-    InvoiceDialog,
-    InvoicesDialog,
     _INVOICE_REMINDER_TIME,
+    InvoiceDetailMode,
+    InvoiceDialog,
+    InvoiceLineItem,
+    InvoicesDialog,
+    _invoice_due_reminder_text,
 )
 from bouquin.reminders import Reminder, ReminderType
-
+from PySide6.QtCore import QDate, Qt
+from PySide6.QtWidgets import QMessageBox
 
 # ============================================================================
 # Tests for InvoiceDetailMode enum

tests/test_key_prompt.py

@@ -1,5 +1,4 @@
 from bouquin.key_prompt import KeyPrompt
-
 from PySide6.QtCore import QTimer
 from PySide6.QtWidgets import QFileDialog, QLineEdit
 

tests/test_lock_overlay.py

@@ -1,7 +1,7 @@
+from bouquin.lock_overlay import LockOverlay
+from bouquin.theme import Theme, ThemeConfig, ThemeManager
 from PySide6.QtCore import QEvent
 from PySide6.QtWidgets import QWidget
-from bouquin.lock_overlay import LockOverlay
-from bouquin.theme import ThemeManager, ThemeConfig, Theme
 
 
 def test_lock_overlay_reacts_to_theme(app, qtbot):

tests/test_main.py

@@ -1,5 +1,6 @@
 import importlib
 import runpy
+
 import pytest
 
 

tests/test_main_window.py

@@ -1,22 +1,19 @@
-import pytest
 import importlib.metadata
-
 from datetime import date, timedelta
 from pathlib import Path
-
-import bouquin.main_window as mwmod
-from bouquin.main_window import MainWindow
-from bouquin.theme import Theme, ThemeConfig, ThemeManager
-from bouquin.settings import get_settings
-from bouquin.key_prompt import KeyPrompt
-from bouquin.db import DBConfig, DBManager
-from PySide6.QtCore import QEvent, QDate, QTimer, Qt, QPoint, QRect
-from PySide6.QtWidgets import QTableView, QApplication, QWidget, QMessageBox, QDialog
-from PySide6.QtGui import QMouseEvent, QKeyEvent, QTextCursor, QCloseEvent
-
 from unittest.mock import Mock, patch
 
+import bouquin.main_window as mwmod
 import bouquin.version_check as version_check
+import pytest
+from bouquin.db import DBConfig, DBManager
+from bouquin.key_prompt import KeyPrompt
+from bouquin.main_window import MainWindow
+from bouquin.settings import get_settings
+from bouquin.theme import Theme, ThemeConfig, ThemeManager
+from PySide6.QtCore import QDate, QEvent, QPoint, QRect, Qt, QTimer
+from PySide6.QtGui import QCloseEvent, QKeyEvent, QMouseEvent, QTextCursor
+from PySide6.QtWidgets import QApplication, QDialog, QMessageBox, QTableView, QWidget
 
 
 def test_main_window_loads_and_saves(qtbot, app, tmp_db_cfg, fresh_db):

tests/test_markdown_editor.py

@@ -1,21 +1,20 @@
 import base64
+
 import pytest
-
-from PySide6.QtCore import Qt, QPoint, QMimeData, QUrl
-from PySide6.QtGui import (
-    QImage,
-    QColor,
-    QKeyEvent,
-    QTextCursor,
-    QTextDocument,
-    QFont,
-    QTextCharFormat,
-)
-from PySide6.QtWidgets import QApplication, QTextEdit
-
 from bouquin.markdown_editor import MarkdownEditor
 from bouquin.markdown_highlighter import MarkdownHighlighter
-from bouquin.theme import ThemeManager, ThemeConfig, Theme
+from bouquin.theme import Theme, ThemeConfig, ThemeManager
+from PySide6.QtCore import QMimeData, QPoint, Qt, QUrl
+from PySide6.QtGui import (
+    QColor,
+    QFont,
+    QImage,
+    QKeyEvent,
+    QTextCharFormat,
+    QTextCursor,
+    QTextDocument,
+)
+from PySide6.QtWidgets import QApplication, QTextEdit
 
 
 def _today():

tests/test_markdown_editor_additional.py

@@ -4,19 +4,18 @@ These tests should be added to test_markdown_editor.py.
 """
 
 import pytest
-from PySide6.QtCore import Qt, QPoint
+from bouquin.markdown_editor import MarkdownEditor
+from bouquin.theme import Theme, ThemeConfig, ThemeManager
+from PySide6.QtCore import QPoint, Qt
 from PySide6.QtGui import (
-    QImage,
     QColor,
+    QImage,
     QKeyEvent,
+    QMouseEvent,
     QTextCursor,
     QTextDocument,
-    QMouseEvent,
 )
 
-from bouquin.markdown_editor import MarkdownEditor
-from bouquin.theme import ThemeManager, ThemeConfig, Theme
-
 
 def text(editor) -> str:
     return editor.toPlainText()
@@ -145,8 +144,8 @@ def test_edit_code_block_checks_document(app, qtbot):
 
 def test_edit_code_block_dialog_cancelled(editor, qtbot, monkeypatch):
     """Test _edit_code_block when dialog is cancelled."""
-    from PySide6.QtWidgets import QDialog
     import bouquin.markdown_editor as markdown_editor
+    from PySide6.QtWidgets import QDialog
 
     class CancelledDialog:
         def __init__(self, code, language, parent=None, allow_delete=False):
@@ -175,8 +174,8 @@ def test_edit_code_block_dialog_cancelled(editor, qtbot, monkeypatch):
 
 def test_edit_code_block_with_delete(editor, qtbot, monkeypatch):
     """Test _edit_code_block when user deletes the block."""
-    from PySide6.QtWidgets import QDialog
     import bouquin.markdown_editor as markdown_editor
+    from PySide6.QtWidgets import QDialog
 
     class DeleteDialog:
         def __init__(self, code, language, parent=None, allow_delete=False):
@@ -214,8 +213,8 @@ def test_edit_code_block_with_delete(editor, qtbot, monkeypatch):
 
 def test_edit_code_block_language_change(editor, qtbot, monkeypatch):
     """Test _edit_code_block with language change."""
-    from PySide6.QtWidgets import QDialog
     import bouquin.markdown_editor as markdown_editor
+    from PySide6.QtWidgets import QDialog
 
     class LanguageChangeDialog:
         def __init__(self, code, language, parent=None, allow_delete=False):

tests/test_pomodoro_timer.py

@@ -1,8 +1,9 @@
 from unittest.mock import Mock, patch
-from bouquin.pomodoro_timer import PomodoroTimer, PomodoroManager
-from bouquin.theme import ThemeManager, ThemeConfig, Theme
-from PySide6.QtWidgets import QWidget, QVBoxLayout, QToolBar, QLabel
+
+from bouquin.pomodoro_timer import PomodoroManager, PomodoroTimer
+from bouquin.theme import Theme, ThemeConfig, ThemeManager
 from PySide6.QtGui import QAction
+from PySide6.QtWidgets import QLabel, QToolBar, QVBoxLayout, QWidget
 
 
 class DummyTimeLogWidget(QWidget):

tests/test_reminders.py

@@ -1,17 +1,16 @@
-import pytest
-
-from unittest.mock import patch, MagicMock
-from bouquin.reminders import (
-    Reminder,
-    ReminderType,
-    ReminderDialog,
-    UpcomingRemindersWidget,
-    ManageRemindersDialog,
-)
-from PySide6.QtCore import QDateTime, QDate, QTime
-from PySide6.QtWidgets import QDialog, QMessageBox, QWidget
-
 from datetime import date, timedelta
+from unittest.mock import MagicMock, patch
+
+import pytest
+from bouquin.reminders import (
+    ManageRemindersDialog,
+    Reminder,
+    ReminderDialog,
+    ReminderType,
+    UpcomingRemindersWidget,
+)
+from PySide6.QtCore import QDate, QDateTime, QTime
+from PySide6.QtWidgets import QDialog, QMessageBox, QWidget
 
 
 @pytest.fixture
@@ -851,9 +850,9 @@ def test_edit_reminder_dialog(qtbot, fresh_db):
 def test_upcoming_reminders_context_menu_shows(
     qtbot, app, fresh_db, freeze_reminders_time, monkeypatch
 ):
-    from PySide6 import QtWidgets, QtGui
-    from PySide6.QtCore import QPoint
     from bouquin.reminders import Reminder, ReminderType, UpcomingRemindersWidget
+    from PySide6 import QtGui, QtWidgets
+    from PySide6.QtCore import QPoint
 
     # Add a future reminder for today
     r = Reminder(
@@ -909,9 +908,9 @@ def test_upcoming_reminders_context_menu_shows(
 def test_upcoming_reminders_delete_selected_dedupes(
     qtbot, app, fresh_db, freeze_reminders_time, monkeypatch
 ):
-    from PySide6.QtWidgets import QMessageBox
-    from PySide6.QtCore import QItemSelectionModel
     from bouquin.reminders import Reminder, ReminderType, UpcomingRemindersWidget
+    from PySide6.QtCore import QItemSelectionModel
+    from PySide6.QtWidgets import QMessageBox
 
     r = Reminder(
         id=None,

tests/test_settings.py

@@ -1,9 +1,5 @@
-from bouquin.settings import (
-    get_settings,
-    load_db_config,
-    save_db_config,
-)
 from bouquin.db import DBConfig
+from bouquin.settings import get_settings, load_db_config, save_db_config
 
 
 def _clear_db_settings():

tests/test_settings_dialog.py

@@ -1,11 +1,11 @@
-from bouquin.db import DBManager, DBConfig
-from bouquin.key_prompt import KeyPrompt
 import bouquin.settings_dialog as sd
-from bouquin.settings_dialog import SettingsDialog
-from bouquin.theme import ThemeManager, ThemeConfig, Theme
+from bouquin.db import DBConfig, DBManager
+from bouquin.key_prompt import KeyPrompt
 from bouquin.settings import get_settings
+from bouquin.settings_dialog import SettingsDialog
+from bouquin.theme import Theme, ThemeConfig, ThemeManager
 from PySide6.QtCore import QTimer
-from PySide6.QtWidgets import QApplication, QMessageBox, QWidget, QDialog
+from PySide6.QtWidgets import QApplication, QDialog, QMessageBox, QWidget
 
 
 def test_settings_dialog_config_roundtrip(qtbot, tmp_db_cfg, fresh_db):

tests/test_statistics_dialog.py

@@ -1,13 +1,11 @@
 import datetime as _dt
-from datetime import datetime, timedelta, date
+from datetime import date, datetime, timedelta
 
 from bouquin import strings
-
-from PySide6.QtCore import Qt, QPoint, QDate
-from PySide6.QtWidgets import QLabel, QWidget
-from PySide6.QtTest import QTest
-
 from bouquin.statistics_dialog import DateHeatmap, StatisticsDialog
+from PySide6.QtCore import QDate, QPoint, Qt
+from PySide6.QtTest import QTest
+from PySide6.QtWidgets import QLabel, QWidget
 
 
 class FakeStatsDB:

tests/test_tabs.py

@@ -1,12 +1,11 @@
 import types
-from PySide6.QtWidgets import QFileDialog
-from PySide6.QtGui import QTextCursor
 
-
-from bouquin.theme import ThemeManager, ThemeConfig, Theme
-from bouquin.settings import get_settings
-from bouquin.main_window import MainWindow
 from bouquin.history_dialog import HistoryDialog
+from bouquin.main_window import MainWindow
+from bouquin.settings import get_settings
+from bouquin.theme import Theme, ThemeConfig, ThemeManager
+from PySide6.QtGui import QTextCursor
+from PySide6.QtWidgets import QFileDialog
 
 
 def test_tabs_open_and_deduplicate(qtbot, app, tmp_db_cfg, fresh_db):

tests/test_tags.py

@@ -1,24 +1,21 @@
+import bouquin.strings as strings
 import pytest
-
-from PySide6.QtCore import Qt, QPoint, QEvent, QDate
-from PySide6.QtGui import QMouseEvent, QColor
+from bouquin.db import DBManager
+from bouquin.flow_layout import FlowLayout
+from bouquin.strings import load_strings
+from bouquin.tag_browser import TagBrowserDialog
+from bouquin.tags_widget import PageTagsWidget, TagChip
+from PySide6.QtCore import QDate, QEvent, QPoint, Qt
+from PySide6.QtGui import QColor, QMouseEvent
 from PySide6.QtWidgets import (
     QApplication,
-    QMessageBox,
-    QInputDialog,
     QColorDialog,
     QDialog,
+    QInputDialog,
+    QMessageBox,
 )
-from bouquin.db import DBManager
-from bouquin.strings import load_strings
-from bouquin.tags_widget import PageTagsWidget, TagChip
-from bouquin.tag_browser import TagBrowserDialog
-from bouquin.flow_layout import FlowLayout
 from sqlcipher3.dbapi2 import IntegrityError
 
-import bouquin.strings as strings
-
-
 # ============================================================================
 # DB Layer Tag Tests
 # ============================================================================
@@ -1649,7 +1646,7 @@ def test_default_tag_colour_none(fresh_db):
 
 def test_flow_layout_take_at_invalid_index(app):
     """Test FlowLayout.takeAt with out-of-bounds index"""
-    from PySide6.QtWidgets import QWidget, QLabel
+    from PySide6.QtWidgets import QLabel, QWidget
 
     widget = QWidget()
     layout = FlowLayout(widget)
@@ -1673,7 +1670,7 @@ def test_flow_layout_take_at_invalid_index(app):
 
 def test_flow_layout_take_at_boundary(app):
     """Test FlowLayout.takeAt at exact boundary"""
-    from PySide6.QtWidgets import QWidget, QLabel
+    from PySide6.QtWidgets import QLabel, QWidget
 
     widget = QWidget()
     layout = FlowLayout(widget)

tests/test_theme.py

@@ -1,8 +1,7 @@
+from bouquin.theme import Theme, ThemeConfig, ThemeManager
 from PySide6.QtGui import QPalette
 from PySide6.QtWidgets import QApplication, QCalendarWidget, QWidget
 
-from bouquin.theme import Theme, ThemeConfig, ThemeManager
-
 
 def test_theme_manager_apply_light_and_dark(app):
     cfg = ThemeConfig(theme=Theme.LIGHT)

tests/test_time_log.py

@@ -1,24 +1,18 @@
-import pytest
 from datetime import date, timedelta
-from PySide6.QtCore import Qt, QDate
-from PySide6.QtWidgets import (
-    QMessageBox,
-    QInputDialog,
-    QFileDialog,
-    QDialog,
-)
-from sqlcipher3.dbapi2 import IntegrityError
+from unittest.mock import MagicMock, patch
 
-from bouquin.theme import ThemeManager, ThemeConfig, Theme
+import bouquin.strings as strings
+import pytest
+from bouquin.theme import Theme, ThemeConfig, ThemeManager
 from bouquin.time_log import (
-    TimeLogWidget,
-    TimeLogDialog,
     TimeCodeManagerDialog,
+    TimeLogDialog,
+    TimeLogWidget,
     TimeReportDialog,
 )
-import bouquin.strings as strings
-
-from unittest.mock import patch, MagicMock
+from PySide6.QtCore import QDate, Qt
+from PySide6.QtWidgets import QDialog, QFileDialog, QInputDialog, QMessageBox
+from sqlcipher3.dbapi2 import IntegrityError
 
 
 @pytest.fixture

tests/test_toolbar.py

@@ -1,8 +1,8 @@
 import pytest
-from PySide6.QtWidgets import QWidget
 from bouquin.markdown_editor import MarkdownEditor
-from bouquin.theme import ThemeManager, ThemeConfig, Theme
+from bouquin.theme import Theme, ThemeConfig, ThemeManager
 from bouquin.toolbar import ToolBar
+from PySide6.QtWidgets import QWidget
 
 
 @pytest.fixture

tests/test_version_check.py

@@ -1,9 +1,10 @@
-import pytest
-from unittest.mock import Mock, patch
 import subprocess
+from unittest.mock import Mock, patch
+
+import pytest
 from bouquin.version_check import VersionChecker
-from PySide6.QtWidgets import QMessageBox, QWidget
 from PySide6.QtGui import QPixmap
+from PySide6.QtWidgets import QMessageBox, QWidget
 
 
 def test_version_checker_init(app):