Update codebase to Python 3.11

- Modernize type hints: `X | None`, `list[X]`, `collections.abc` imports across 28 files
- Remove unused code: dead assignments, duplicate methods, legacy files (`exceptions.py`, `windows_notification.py`)
- Apply reviewer suggestions: Qt6 enums, `_set_password_visibility` helper, `Version.from_v_str`
- Bump `pyproject.toml` to `requires-python = ">=3.11"`, regenerate `poetry.lock`
- Update CI/CD workflows to Python 3.11 (Linux containers + macOS brew with `--overwrite`)
- Fix code style: `ruff format` + `ruff check --fix`

Author: ABuljko

.github/workflows/cd-linux-arm64.yaml

@@ -15,7 +15,7 @@ jobs:
   version-check:
     name: Check versioning
     runs-on: ubuntu-24.04-arm
-    container: python:3.10-slim-trixie
+    container: python:3.11-slim-trixie
     if: github.event_name == 'release'
     steps:
       - name: Checkout repository
@@ -41,7 +41,7 @@ jobs:
   build-onefile:
     name: Build onefile
     runs-on: ubuntu-24.04-arm
-    container: python:3.10-slim-trixie
+    container: python:3.11-slim-trixie
     steps:
       - name: Checkout repository
         uses: actions/checkout@v6
@@ -80,7 +80,7 @@ jobs:
   publish-binary:
     name: Publish binary
     runs-on: ubuntu-24.04-arm
-    container: python:3.10-slim-trixie
+    container: python:3.11-slim-trixie
     needs: [build-onefile, version-check]
     if: github.event_name == 'release'
     permissions:

.github/workflows/cd-linux-x64.yaml

@@ -15,7 +15,7 @@ jobs:
   version-check:
     name: Check versioning
     runs-on: ubuntu-latest
-    container: python:3.10-slim-bookworm
+    container: python:3.11-slim-bookworm
     if: github.event_name == 'release'
     steps:
       - name: Checkout repository
@@ -41,7 +41,7 @@ jobs:
   build-onefile:
     name: Build onefile
     runs-on: ubuntu-latest
-    container: python:3.10-slim-bookworm
+    container: python:3.11-slim-bookworm
     steps:
       - name: Checkout repository
         uses: actions/checkout@v6
@@ -80,7 +80,7 @@ jobs:
   publish-binary:
     name: Publish binary
     runs-on: ubuntu-latest
-    container: python:3.10-slim-bookworm
+    container: python:3.11-slim-bookworm
     needs: [build-onefile, version-check]
     if: github.event_name == 'release'
     permissions:

.github/workflows/cd-macos-arm64.yaml

@@ -9,7 +9,7 @@ on:
   workflow_dispatch:
 
 env:
-  PYTHON_VERSION: "3.10"
+  PYTHON_VERSION: "3.11"
 
 jobs:
   version-check:
@@ -20,7 +20,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v6
       - name: Install required packages
-        run: brew install python@${{ env.PYTHON_VERSION }} poetry swig
+        run: brew install --overwrite python@${{ env.PYTHON_VERSION }} poetry swig
       - name: Create virtual environment
         run: |
           poetry env use python${{ env.PYTHON_VERSION }}
@@ -41,7 +41,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v6
       - name: Install required packages
-        run: brew install python@${{ env.PYTHON_VERSION }} poetry swig
+        run: brew install --overwrite python@${{ env.PYTHON_VERSION }} poetry swig
       - name: Create virtual environment
         run: |
           poetry env use python${{ env.PYTHON_VERSION }}

.github/workflows/cd-macos-intel64.yaml

@@ -9,7 +9,7 @@ on:
   workflow_dispatch:
 
 env:
-  PYTHON_VERSION: "3.10"
+  PYTHON_VERSION: "3.11"
 
 jobs:
   version-check:
@@ -20,7 +20,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v6
       - name: Install required packages
-        run: brew install python@${{ env.PYTHON_VERSION }} poetry swig
+        run: brew install --overwrite python@${{ env.PYTHON_VERSION }} poetry swig
       - name: Create virtual environment
         run: |
           poetry env use python${{ env.PYTHON_VERSION }}
@@ -41,7 +41,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v6
       - name: Install required packages
-        run: brew install python@${{ env.PYTHON_VERSION }} poetry swig
+        run: brew install --overwrite python@${{ env.PYTHON_VERSION }} poetry swig
       - name: Create virtual environment
         run: |
           poetry env use python${{ env.PYTHON_VERSION }}

.github/workflows/cd-pypi.yaml

@@ -15,7 +15,7 @@ jobs:
   check-package-version:
     name: Check package version
     runs-on: ubuntu-latest
-    container: python:3.10-slim
+    container: python:3.11-slim
     steps:
       - name: Checkout repository
         uses: actions/checkout@v6
@@ -30,7 +30,7 @@ jobs:
   check-tag-version:
     name: Check tag version
     runs-on: ubuntu-latest
-    container: python:3.10-slim
+    container: python:3.11-slim
     if: github.event_name == 'release'
     steps:
       - name: Checkout repository
@@ -48,7 +48,7 @@ jobs:
   build:
     name: Build
     runs-on: ubuntu-latest
-    container: python:3.10-slim
+    container: python:3.11-slim
     needs: check-package-version
     steps:
       - name: Checkout repository

.github/workflows/ci.yaml

@@ -14,7 +14,7 @@ jobs:
   pyproject-lock-file-check:
     name: Check pyproject syntax
     runs-on: ubuntu-latest
-    container: python:3.10-slim
+    container: python:3.11-slim
     steps:
       - name: Checkout repository
         uses: actions/checkout@v6
@@ -25,7 +25,7 @@ jobs:
   format-code:
     name: Check code format
     runs-on: ubuntu-latest
-    container: python:3.10-slim
+    container: python:3.11-slim
     steps:
       - name: Checkout repository
         uses: actions/checkout@v6
@@ -41,7 +41,7 @@ jobs:
   lint-style:
     name: Check code style
     runs-on: ubuntu-latest
-    container: python:3.10-slim
+    container: python:3.11-slim
     steps:
       - name: Checkout repository
         uses: actions/checkout@v6
@@ -57,7 +57,7 @@ jobs:
   lint-typing:
     name: Check static typing
     runs-on: ubuntu-latest
-    container: python:3.10-slim
+    container: python:3.11-slim
     steps:
       - name: Checkout repository
         uses: actions/checkout@v6
@@ -84,7 +84,7 @@ jobs:
   check-version-accordance-flatpak-metadata:
     name: Check for version accordance with Flatpak metadata file
     runs-on: ubuntu-latest
-    container: python:3.10-slim
+    container: python:3.11-slim
     steps:
       - name: Checkout repository
         uses: actions/checkout@v6

nitrokeyapp/__main__.py

@@ -1,7 +1,8 @@
 import sys
+from collections.abc import Callable, Generator
 from contextlib import contextmanager
 from types import TracebackType
-from typing import Any, Callable, Generator, Optional, Type
+from typing import Any
 
 from PySide6 import QtWidgets
 
@@ -11,7 +12,7 @@
 
 @contextmanager
 def exception_handler(
-    hook: Callable[[Type[BaseException], BaseException, Optional[TracebackType]], Any],
+    hook: Callable[[type[BaseException], BaseException, TracebackType | None], Any],
 ) -> Generator[None, None, None]:
     old_hook = sys.excepthook
     sys.excepthook = hook

nitrokeyapp/common_ui.py

@@ -1,5 +1,3 @@
-from dataclasses import dataclass
-
 from PySide6.QtCore import QObject, Signal
 
 from nitrokeyapp.information_box import InfoUi
@@ -15,7 +13,6 @@ def __init__(self) -> None:
         super().__init__()
 
 
-@dataclass
 class CommonUi:
     touch: TouchUi
     info: InfoUi

nitrokeyapp/device_data.py

@@ -1,7 +1,7 @@
 import logging
 from contextlib import AbstractContextManager
 from types import TracebackType
-from typing import Generic, List, Optional, TypeVar
+from typing import Generic, TypeVar
 
 from nitrokey import nk3, nkpk
 from nitrokey.nk3 import NK3
@@ -26,9 +26,9 @@ def __enter__(self) -> T:
 
     def __exit__(
         self,
-        exc_type: Optional[type[BaseException]],
-        exc_val: Optional[BaseException],
-        exc_tb: Optional[TracebackType],
+        exc_type: type[BaseException] | None,
+        exc_val: BaseException | None,
+        exc_tb: TracebackType | None,
     ) -> None:
         pass
 
@@ -39,9 +39,9 @@ def __init__(self, device: TrussedBase, using_ccid: bool) -> None:
         self.model = device.model
         self.updating = False
 
-        self._status: Optional[Status] = None
-        self._uuid: Optional[Uuid] = None
-        self._version: Optional[Version] = None
+        self._status: Status | None = None
+        self._uuid: Uuid | None = None
+        self._version: Version | None = None
         self._device = device
         self._using_ccid = using_ccid
 
@@ -58,7 +58,7 @@ def __repr__(self) -> str:
         return f"DeviceData({fields_str})"
 
     @classmethod
-    def list(cls) -> List["DeviceData"]:
+    def list(cls) -> list["DeviceData"]:
         use_ccid = should_use_ccid()
 
         nk3_devices = [cls(dev, use_ccid) for dev in nk3.list(use_ccid, exclusive=True)]
@@ -108,7 +108,7 @@ def version(self) -> Version:
         return self._version
 
     @property
-    def uuid(self) -> Optional[Uuid]:
+    def uuid(self) -> Uuid | None:
         assert isinstance(self._device, TrussedDevice)
         if not self._uuid:
             self._uuid = self._device.uuid()
@@ -124,7 +124,7 @@ def uuid_prefix(self) -> str:
         return str(self.uuid)[:5]
 
     def open(self) -> AbstractContextManager[TrussedDevice]:
-        device: Optional[TrussedDevice] = None
+        device: TrussedDevice | None = None
         if self.is_bootloader:
             raise RuntimeError("Trying to open a device that is a bootloader")
 
@@ -148,7 +148,7 @@ def open(self) -> AbstractContextManager[TrussedDevice]:
             else:
                 raise RuntimeError(f"Unknown device model {self._device}")
 
-    def update(self, ui: UpdateGUI, image: Optional[str] = None) -> UpdateResult:
+    def update(self, ui: UpdateGUI, image: str | None = None) -> UpdateResult:
         if self.path is None:
             return UpdateResult(
                 self.model, UpdateStatus.ERROR, "Administrator rights are required for updating"

nitrokeyapp/device_manager.py

@@ -1,5 +1,5 @@
 import logging
-from typing import Iterator, List
+from collections.abc import Iterator
 
 from nitrokeyapp.device_data import DeviceData
 
@@ -19,18 +19,9 @@ def match(lhs: DeviceData, rhs: DeviceData) -> bool:
     return False
 
 
-def test(devices: List[DeviceData]) -> bool:
-    for dev in devices:
-        if dev.is_bootloader:
-            continue
-        if dev.uuid is not None:
-            continue
-    return True
-
-
 class DeviceManager:
     def __init__(self) -> None:
-        self._devices: List[DeviceData] = []
+        self._devices: list[DeviceData] = []
 
     def __iter__(self) -> Iterator[DeviceData]:
         for item in self._devices:
@@ -42,10 +33,9 @@ def __len__(self) -> int:
     def clear(self) -> None:
         self._devices = []
 
-    def add(self) -> List[DeviceData]:
+    def add(self) -> list[DeviceData]:
         try:
             all_devs = DeviceData.list()
-            test(all_devs)
         except Exception as e:
             logger.error(f"failed listing nk3 devices: {e}")
             return []
@@ -88,10 +78,9 @@ def add(self) -> List[DeviceData]:
 
         return new_devices
 
-    def remove(self) -> List[DeviceData]:
+    def remove(self) -> list[DeviceData]:
         try:
             all_devs = DeviceData.list()
-            test(all_devs)
         except Exception as e:
             logger.error(f"failed listing nk3 devices: {e}")
             return []
@@ -102,7 +91,7 @@ def remove(self) -> List[DeviceData]:
             if dev.updating:
                 continue
 
-            res = list(filter(lambda x: match(x, dev), all_devs))
+            res = [x for x in all_devs if match(x, dev)]
             if len(res) == 0:
                 self._devices.remove(dev)
                 out.append(dev)