chore: move to pyproject.toml & ruff

Author: foosel

.pre-commit-config.yaml

@@ -17,27 +17,12 @@ repos:
     hooks:
       - id: pyupgrade
         args: ["--py37-plus"]
-  - repo: https://github.com/OctoPrint/codemods
-    rev: "0.6.3"
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.4.2
     hooks:
-      - id: codemod_not_in
-  - repo: https://github.com/pre-commit/mirrors-isort
-    rev: v5.10.1
-    hooks:
-      - id: isort
-  - repo: https://github.com/psf/black
-    rev: 23.1.0
-    hooks:
-      - id: black
-        args: ["--config", "black.toml"]
-        additional_dependencies:
-          - click==8.0.4
-  - repo: https://github.com/pycqa/flake8
-    rev: 6.0.0
-    hooks:
-      - id: flake8
-        additional_dependencies:
-          - flake8-bugbear
+      - id: ruff
+        args: ["--fix"]
+      - id: ruff-format
   - repo: https://github.com/pre-commit/mirrors-prettier
     rev: v3.0.0-alpha.4
     hooks:
@@ -50,10 +35,3 @@ repos:
           - eslint@7.19.0
           - eslint-plugin-es5@v1.3.0
         files: \.js$
-  - repo: https://github.com/OctoPrint/pre-commit-lessc
-    rev: 4.2.0
-    hooks:
-      - id: lessc
-        args: ["--wrapper-quiet", "--clean-css=--s1 --advanced --compatibility=ie8"]
-        additional_dependencies: ["less-plugin-clean-css"]
-        files: \.less$

black.toml

@@ -53,43 +53,47 @@ class FirmwareCheckPlugin(
 ):
     # noinspection PyMissingConstructor
     def __init__(self):
-        self._warnings = dict()
+        self._warnings = {}
         self._scan_received = True
 
     ##~~ TemplatePlugin API
 
     def get_template_configs(self):
         return [
-            dict(
-                type="sidebar",
-                name=gettext("Attention!"),
-                data_bind="visible: printerState.isOperational() && loginState.isAdmin() && warnings().length > 0",
-                icon="exclamation-triangle",
-                styles_wrapper=["display: none"],
-                template="firmware_check_sidebar_warning.jinja2",
-                suffix="_warning",
-            ),
-            dict(
-                type="sidebar",
-                name=gettext("Info"),
-                data_bind="visible: printerState.isOperational() && loginState.isAdmin() && infos().length > 0",
-                icon="info-circle",
-                styles_wrapper=["display: none"],
-                template="firmware_check_sidebar_info.jinja2",
-                suffix="_info",
-            ),
-            dict(type="settings", name=gettext("Firmware Check"), custom_bindings=False),
+            {
+                "type": "sidebar",
+                "name": gettext("Attention!"),
+                "data_bind": "visible: printerState.isOperational() && loginState.isAdmin() && warnings().length > 0",
+                "icon": "exclamation-triangle",
+                "styles_wrapper": ["display: none"],
+                "template": "firmware_check_sidebar_warning.jinja2",
+                "suffix": "_warning",
+            },
+            {
+                "type": "sidebar",
+                "name": gettext("Info"),
+                "data_bind": "visible: printerState.isOperational() && loginState.isAdmin() && infos().length > 0",
+                "icon": "info-circle",
+                "styles_wrapper": ["display: none"],
+                "template": "firmware_check_sidebar_info.jinja2",
+                "suffix": "_info",
+            },
+            {
+                "type": "settings",
+                "name": gettext("Firmware Check"),
+                "custom_bindings": False,
+            },
         ]
 
     ##~~ AssetPlugin API
 
     def get_assets(self):
-        return dict(
-            js=("js/firmware_check.js",),
-            clientjs=("clientjs/firmware_check.js",),
-            css=("css/firmware_check.css",),
-            less=("less/firmware_check.less",),
-        )
+        return {
+            "js": ("js/firmware_check.js",),
+            "clientjs": ("clientjs/firmware_check.js",),
+            "css": ("css/firmware_check.css",),
+            "less": ("less/firmware_check.less",),
+        }
 
     ##~~ EventHandlerPlugin API
 
@@ -139,43 +143,43 @@ def on_firmware_cap_received(self, comm_instance, cap, enabled, all_caps):
 
     def get_additional_permissions(self):
         return [
-            dict(
-                key="DISPLAY",
-                name="Display firmware check warnings",
-                description=gettext("Allows to see firmware check warnings"),
-                roles=["display"],
-                default_groups=[USER_GROUP],
-            )
+            {
+                "key": "DISPLAY",
+                "name": "Display firmware check warnings",
+                "description": gettext("Allows to see firmware check warnings"),
+                "roles": ["display"],
+                "default_groups": [USER_GROUP],
+            }
         ]
 
     ##~~ Softwareupdate hook
 
     def get_update_information(self):
-        return dict(
-            firmware_check=dict(
-                displayName="Firmware Check Plugin",
-                displayVersion=self._plugin_version,
+        return {
+            "firmware_check": {
+                "displayName": "Firmware Check Plugin",
+                "displayVersion": self._plugin_version,
                 # version check: github repository
-                type="github_release",
-                user="OctoPrint",
-                repo="OctoPrint-FirmwareCheck",
-                current=self._plugin_version,
-                stable_branch={
+                "type": "github_release",
+                "user": "OctoPrint",
+                "repo": "OctoPrint-FirmwareCheck",
+                "current": self._plugin_version,
+                "stable_branch": {
                     "name": "Stable",
                     "branch": "master",
                     "commitish": ["devel", "master"],
                 },
-                prerelease_branches=[
+                "prerelease_branches": [
                     {
                         "name": "Prerelease",
                         "branch": "devel",
                         "commitish": ["devel", "master"],
                     }
                 ],
                 # update method: pip
-                pip="https://github.com/OctoPrint/OctoPrint-FirmwareCheck/archive/{target_version}.zip",
-            )
-        )
+                "pip": "https://github.com/OctoPrint/OctoPrint-FirmwareCheck/archive/{target_version}.zip",
+            }
+        }
 
     ##~~ Helpers
 
@@ -220,18 +224,21 @@ def _run_checks(self, check_type, *args, **kwargs):
                         url = check.url
 
                     self._register_warning(
-                        warning_type, message.format(**check.placeholders), severity, url
+                        warning_type,
+                        message.format(**check.placeholders),
+                        severity,
+                        url,
                     )
 
                     # noinspection PyUnresolvedReferences
                     self._event_bus.fire(
                         Events.PLUGIN_FIRMWARE_CHECK_WARNING,
-                        dict(
-                            check_name=check.name,
-                            warning_type=warning_type,
-                            severity=severity,
-                            url=url,
-                        ),
+                        {
+                            "check_name": check.name,
+                            "warning_type": warning_type,
+                            "severity": severity,
+                            "url": url,
+                        },
                     )
                     changes = True
                     break
@@ -259,7 +266,11 @@ def _register_warning(self, warning_type, message, severity, url):
                 url=url,
             )
         )
-        self._warnings[warning_type] = dict(message=message, severity=severity, url=url)
+        self._warnings[warning_type] = {
+            "message": message,
+            "severity": severity,
+            "url": url,
+        }
 
         logline = f"{message}. More information at {url}"
         if severity == Severity.INFO:
@@ -289,7 +300,7 @@ def _log_to_terminal(self, message):
             self._printer.log_lines(*lines)
 
     def _ping_clients(self):
-        self._plugin_manager.send_plugin_message(self._identifier, dict(type="update"))
+        self._plugin_manager.send_plugin_message(self._identifier, {"type": "update"})
 
 
 def register_custom_events(*args, **kwargs):

octoprint_firmware_check/__init__.py

@@ -142,7 +142,7 @@ def received(self, line):
 
         lower_line = line.lower()
         if self.AUTHOR in lower_line:
-            self._triggered = any(map(lambda x: x in lower_line, self.authors))
+            self._triggered = any(x in lower_line for x in self.authors)
             self._active = False
 
 

octoprint_firmware_check/checks/__init__.py

@@ -10,20 +10,20 @@
 class FirmwareBrokenChecks:
     @classmethod
     def as_dict(cls):
-        return dict(
-            checks=(
+        return {
+            "checks": (
                 CbdCheck(),
                 ZwlfCheck(),
                 CrealityDoubleTempCheck(),
                 CrealityTFCardCheck(),
             ),
-            message=gettext(
+            "message": gettext(
                 "Your printer's firmware is known to have a broken implementation of the "
                 "communication protocol. This may cause print failures or other annoyances. "
                 "You'll need to take additional steps for OctoPrint to fully work with it."
             ),
-            severity=Severity.WARNING,
-        )
+            "severity": Severity.WARNING,
+        }
 
 
 class CbdCheck(LineCheck):
@@ -87,8 +87,6 @@ def _is_ruled_out(self, line):
         # first thing that looks like a proper report stops scanning
         lower_line = line.lower()
         return not settings().getBoolean(["feature", "sdSupport"]) or any(
-            map(
-                lambda x: x in lower_line,
-                ("sd card ok", "sd init fail", "sd printing byte", "not sd printing"),
-            )
+            x in lower_line
+            for x in ("sd card ok", "sd init fail", "sd printing byte", "not sd printing")
         )

octoprint_firmware_check/checks/firmware_broken.py

@@ -12,18 +12,18 @@
 class FirmwareDevelopmentChecks:
     @classmethod
     def as_dict(cls):
-        return dict(
-            checks=(
+        return {
+            "checks": (
                 MarlinBugfixCheck(),
                 MarlinMfsBugfixCheck(),
             ),
-            message=gettext(
+            "message": gettext(
                 "Your printer's firmware is a {buildtype} build of {firmware} "
                 "(build date {builddate}). It might be more unstable "
                 "than a release version and should be kept up-to-date."
             ),
-            severity=Severity.INFO,
-        )
+            "severity": Severity.INFO,
+        }
 
 
 class MarlinBugfixCheck(Check):

octoprint_firmware_check/checks/firmware_development.py

@@ -10,8 +10,8 @@
 class FirmwareUnsafeChecks:
     @classmethod
     def as_dict(cls):
-        return dict(
-            checks=(
+        return {
+            "checks": (
                 AnetA8Check(),
                 AnycubicCheck(),
                 CrealityCR10sCheck(),
@@ -23,12 +23,12 @@ def as_dict(cls):
                 RepetierBefore092Check(),
                 ThermalProtectionCapCheck(),
             ),
-            message=gettext(
+            "message": gettext(
                 "Your printer's firmware is known to lack mandatory safety features (e.g. "
                 "thermal runaway protection). This is a fire risk."
             ),
-            severity=Severity.CRITICAL,
-        )
+            "severity": Severity.CRITICAL,
+        }
 
 
 class AnetA8Check(Check):