Merge pull request #384 from Nitrokey/ruff

replace isort, flake8, black with ruff

Author: daringer

.flake8

@@ -13,7 +13,7 @@ update-venv:
 ifeq (, $(shell which poetry))
 $(error "No poetry in $(PATH)")
 endif
-	poetry install --sync --without=deploy
+	poetry sync --without=deploy
 
 # clean environment
 semi-clean:
@@ -37,19 +37,19 @@ build-pyinstaller-onedir:
 
 # code checks
 check-format:
-	poetry run black --check $(PACKAGE_NAME)/
+	poetry run ruff format --check $(PACKAGE_NAME)/
 
 check-import-sorting:
-	poetry run isort --check-only $(PACKAGE_NAME)/
+	poetry run ruff check --select I --diff $(PACKAGE_NAME)/
 
 check-style:
-	poetry run flake8 $(PACKAGE_NAME)/
+	poetry run ruff check $(PACKAGE_NAME)/
 
 check-typing:
 	poetry run mypy $(PACKAGE_NAME)/
 
 check: check-format check-import-sorting check-style check-typing
 
 fix:
-	poetry run black $(PACKAGE_NAME)/
-	poetry run isort $(PACKAGE_NAME)/
+	poetry run ruff format $(PACKAGE_NAME)/
+	poetry run ruff check --fix $(PACKAGE_NAME)/

Makefile

@@ -53,11 +53,7 @@ def add(self) -> List[DeviceData]:
         new_devices = []
         for candidate in all_devs:
             # ignore bootloader device during update
-            if (
-                len(self._devices) == 1
-                and self._devices[0].updating
-                and candidate.is_bootloader
-            ):
+            if len(self._devices) == 1 and self._devices[0].updating and candidate.is_bootloader:
                 continue
 
             # handle from bootloader-device updating

nitrokeyapp/device_manager.py

@@ -9,23 +9,17 @@
 
 class DeviceView(Protocol):
     @property
-    def common_ui(self) -> CommonUi:
-        ...
+    def common_ui(self) -> CommonUi: ...
 
     @property
-    def title(self) -> str:
-        ...
+    def title(self) -> str: ...
 
     @property
-    def widget(self) -> QWidget:
-        ...
+    def widget(self) -> QWidget: ...
 
     @property
-    def worker(self) -> Optional[Worker]:
-        ...
+    def worker(self) -> Optional[Worker]: ...
 
-    def reset(self) -> None:
-        ...
+    def reset(self) -> None: ...
 
-    def refresh(self, data: DeviceData) -> None:
-        ...
+    def refresh(self, data: DeviceData) -> None: ...

nitrokeyapp/device_view.py

@@ -22,9 +22,7 @@ def __init__(self, log_file: str, parent: Optional[QWidget] = None) -> None:
         self.button_save_log = QPushButton("Save Log File", self)
         self.button_save_log.pressed.connect(self.save_log)
 
-        self.ui.buttonBox.addButton(
-            self.button_save_log, QDialogButtonBox.ButtonRole.ActionRole
-        )
+        self.ui.buttonBox.addButton(self.button_save_log, QDialogButtonBox.ButtonRole.ActionRole)
 
     def set_exception(
         self,

nitrokeyapp/error_dialog.py

@@ -90,7 +90,6 @@ def __init__(self, qt_app: QtWidgets.QApplication, log_file: str):
         ]
         for view in self.views:
             if view.worker:
-
                 view.worker.busy_state_changed.connect(self.set_busy)
 
                 view.common_ui.touch.start.connect(self.touch_dialog.start)
@@ -149,7 +148,7 @@ def detect_added_devices(
         device_info: Optional[Dict[str, str]] = None,
     ) -> None:
         # retry for up to 2secs
-        for tries in range(8):
+        for _tries in range(8):
             devs = self.device_manager.add()
             if devs:
                 break

nitrokeyapp/gui.py

@@ -59,9 +59,7 @@ def __init__(
         self.hide_timer.timeout.connect(self.hide_status)
 
     @Slot(str, int, str)
-    def set_status(
-        self, text: str, timeout: int = 7000, icon: Optional[str] = None
-    ) -> None:
+    def set_status(self, text: str, timeout: int = 7000, icon: Optional[str] = None) -> None:
         self.status.setText(text)
         self.status.show()
         self.information_frame.show()
@@ -88,9 +86,7 @@ def hide_status(self) -> None:
 
     @Slot()
     def set_touch_status(self) -> None:
-        self.set_status(
-            "Press your Nitrokey to confirm...", timeout=15000, icon="touch.svg"
-        )
+        self.set_status("Press your Nitrokey to confirm...", timeout=15000, icon="touch.svg")
 
     @Slot()
     def hide_touch(self) -> None:

nitrokeyapp/information_box.py

@@ -22,9 +22,7 @@ def init_logging() -> Generator[str, None, None]:
     log_format = "%(relativeCreated)-8d %(levelname)6s %(name)10s %(message)s"
 
     try:
-        handler = logging.FileHandler(
-            filename=log_file.name, delay=True, encoding="utf-8"
-        )
+        handler = logging.FileHandler(filename=log_file.name, delay=True, encoding="utf-8")
         console_handler = logging.StreamHandler(sys.stdout)
 
         handlers = [handler]

nitrokeyapp/logger.py

@@ -7,9 +7,7 @@
 
 
 class Nk3Button(QtWidgets.QToolButton):
-    def __init__(
-        self, data: DeviceData, on_click: Callable[[DeviceData], None]
-    ) -> None:
+    def __init__(self, data: DeviceData, on_click: Callable[[DeviceData], None]) -> None:
         super().__init__()
 
         self.setIcon(QtUtilsMixIn.get_qicon("nitrokey.svg"))

nitrokeyapp/nk3_button.py

@@ -224,9 +224,7 @@ def device_updated(self, result: UpdateResult) -> None:
         elif result.status == UpdateStatus.ABORTED:
             self.common_ui.info.error.emit(f"Nitrokey 3 update aborted{msg}")
         else:
-            self.common_ui.info.error.emit(
-                f"Unexpected update result: {result.status}{msg}"
-            )
+            self.common_ui.info.error.emit(f"Unexpected update result: {result.status}{msg}")
 
         self.common_ui.gui.refresh_devices.emit()