Pre-commit update

foosel · foosel · commit ac42c3773a30 · 2023-02-09T15:11:36.000+01:00
diff --git a/.eslintrc.yaml b/.eslintrc.yaml
@@ -0,0 +1,6 @@
+env:
+  browser: true
+  jquery: true
+  es6: true
+parserOptions:
+  ecmaVersion: 2018
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -2,7 +2,6 @@
 
 version: 2
 updates:
-
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,7 +1,7 @@
-exclude: ^(src/octoprint/vendor/|src/octoprint/static/js/lib|src/octoprint/static/vendor|tests/static/js/lib|tests/util/_files|docs/|scripts/|translations/|.*\.css|.*\.svg)
+exclude: ^(octoprint_firmware_check/translations|extras/|translations/|.*\.css|.*\.svg)
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.3.0
+    rev: v4.4.0
     hooks:
       - id: end-of-file-fixer
       - id: trailing-whitespace
@@ -11,30 +11,42 @@ repos:
       - id: check-toml
       - id: check-merge-conflict
       - id: fix-encoding-pragma
+        args: ["--remove"]
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v3.3.1
+    hooks:
+      - id: pyupgrade
+        args: ["--py37-plus"]
   - repo: https://github.com/OctoPrint/codemods
-    rev: devel
+    rev: "0.6.3"
     hooks:
-      - id: codemod_dict_to_literal
-        stages: ["manual"]
-      - id: codemod_set_to_literal
-        stages: ["manual"]
       - id: codemod_not_in
-        stages: ["manual"]
   - repo: https://github.com/pre-commit/mirrors-isort
-    rev: v5.5.4
+    rev: v5.10.1
     hooks:
       - id: isort
   - repo: https://github.com/psf/black
-    rev: 22.3.0
+    rev: 23.1.0
     hooks:
       - id: black
-  - repo: https://gitlab.com/pycqa/flake8
-    rev: 3.8.1
+        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
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v2.1.2
+    rev: v3.0.0-alpha.4
     hooks:
       - id: prettier
+  - repo: https://github.com/pre-commit/mirrors-eslint
+    rev: v8.33.0
+    hooks:
+      - id: eslint
+        additional_dependencies:
+          - eslint@7.19.0
+          - eslint-plugin-es5@v1.3.0
+        files: \.js$
diff --git a/black.toml b/black.toml
@@ -0,0 +1,3 @@
+[tool.black]
+line-length = 90
+include = '\.pyi?$'
diff --git a/octoprint_firmware_check/__init__.py b/octoprint_firmware_check/__init__.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 __license__ = "GNU Affero General Public License http://www.gnu.org/licenses/agpl.html"
 __copyright__ = "Copyright (C) 2018 The OctoPrint Project - Released under terms of the AGPLv3 License"
 
@@ -54,7 +51,6 @@ class FirmwareCheckPlugin(
     octoprint.plugin.TemplatePlugin,
     octoprint.plugin.SettingsPlugin,
 ):
-
     # noinspection PyMissingConstructor
     def __init__(self):
         self._warnings = dict()
@@ -128,10 +124,10 @@ def on_firmware_info_received(self, comm_instance, firmware_name, firmware_data)
         self._run_checks(
             "m115",
             to_unicode(firmware_name, errors="replace"),
-            dict(
-                (to_unicode(key, errors="replace"), to_unicode(value, errors="replace"))
+            {
+                to_unicode(key, errors="replace"): to_unicode(value, errors="replace")
                 for key, value in firmware_data.items()
-            ),
+            },
         )
 
     ##~~ Firmware capability hook handler
@@ -241,14 +237,12 @@ def _run_checks(self, check_type, *args, **kwargs):
                     break
 
                 check.evaluate_timeout()
-                self._logger.debug("Check {} active? {}".format(check, check.active))
+                self._logger.debug(f"Check {check} active? {check.active}")
 
             still_active = any(check.active for check in checks) or still_active
 
         self._scan_received = still_active
-        self._logger.debug(
-            "Scanning received lines enabled? {}".format(self._scan_received)
-        )
+        self._logger.debug(f"Scanning received lines enabled? {self._scan_received}")
 
         if changes:
             self._ping_clients()
@@ -267,7 +261,7 @@ def _register_warning(self, warning_type, message, severity, url):
         )
         self._warnings[warning_type] = dict(message=message, severity=severity, url=url)
 
-        logline = "{}. More information at {}".format(message, url)
+        logline = f"{message}. More information at {url}"
         if severity == Severity.INFO:
             self._logger.info(logline)
         else:
diff --git a/octoprint_firmware_check/checks/__init__.py b/octoprint_firmware_check/checks/__init__.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 __license__ = "GNU Affero General Public License http://www.gnu.org/licenses/agpl.html"
 __copyright__ = "Copyright (C) 2019 The OctoPrint Project - Released under terms of the AGPLv3 License"
 
@@ -9,7 +6,7 @@
 from octoprint.util import monotonic_time
 
 
-class Check(object):
+class Check:
     name = None
     url = None
 
@@ -149,7 +146,7 @@ def received(self, line):
             self._active = False
 
 
-class Severity(object):
+class Severity:
     INFO = "info"
     WARNING = "warning"
     CRITICAL = "critical"
diff --git a/octoprint_firmware_check/checks/firmware_broken.py b/octoprint_firmware_check/checks/firmware_broken.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 __license__ = "GNU Affero General Public License http://www.gnu.org/licenses/agpl.html"
 __copyright__ = "Copyright (C) 2020 The OctoPrint Project - Released under terms of the AGPLv3 License"
 
@@ -10,7 +7,7 @@
 from . import LineCheck, Severity
 
 
-class FirmwareBrokenChecks(object):
+class FirmwareBrokenChecks:
     @classmethod
     def as_dict(cls):
         return dict(
diff --git a/octoprint_firmware_check/checks/firmware_development.py b/octoprint_firmware_check/checks/firmware_development.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 __license__ = "GNU Affero General Public License http://www.gnu.org/licenses/agpl.html"
 __copyright__ = "Copyright (C) 2019 The OctoPrint Project - Released under terms of the AGPLv3 License"
 
@@ -12,7 +9,7 @@
 from . import Check, Severity
 
 
-class FirmwareDevelopmentChecks(object):
+class FirmwareDevelopmentChecks:
     @classmethod
     def as_dict(cls):
         return dict(
diff --git a/octoprint_firmware_check/checks/firmware_hostcommands.py b/octoprint_firmware_check/checks/firmware_hostcommands.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 __license__ = "GNU Affero General Public License http://www.gnu.org/licenses/agpl.html"
 __copyright__ = "Copyright (C) 2021 The OctoPrint Project - Released under terms of the AGPLv3 License"
 
@@ -9,7 +6,7 @@
 from . import NegativeCapCheck, Severity
 
 
-class FirmwareHostcommandsChecks(object):
+class FirmwareHostcommandsChecks:
     @classmethod
     def as_dict(cls):
         return {
diff --git a/octoprint_firmware_check/checks/firmware_unsafe.py b/octoprint_firmware_check/checks/firmware_unsafe.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 __license__ = "GNU Affero General Public License http://www.gnu.org/licenses/agpl.html"
 __copyright__ = "Copyright (C) 2019 The OctoPrint Project - Released under terms of the AGPLv3 License"
 
@@ -10,7 +7,7 @@
 from . import AuthorCheck, Check, NegativeCapCheck, Severity
 
 
-class FirmwareUnsafeChecks(object):
+class FirmwareUnsafeChecks:
     @classmethod
     def as_dict(cls):
         return dict(
diff --git a/octoprint_firmware_check/static/js/firmware_check.js b/octoprint_firmware_check/static/js/firmware_check.js
@@ -57,24 +57,28 @@ $(function () {
         };
 
         var subbed = false;
-        self.onStartup = self.onUserPermissionsChanged = self.onUserLoggedIn = self.onUserLoggedOut = function () {
-            if (
-                self.settings &&
-                self.settings.settings &&
-                self.settings.settings.plugins &&
-                self.settings.settings.plugins.firmware_check &&
-                !subbed
-            ) {
-                subbed = true;
-                self.settings.settings.plugins.firmware_check.ignore_infos.subscribe(
-                    function () {
-                        self.requestData();
+        self.onStartup =
+            self.onUserPermissionsChanged =
+            self.onUserLoggedIn =
+            self.onUserLoggedOut =
+                function () {
+                    if (
+                        self.settings &&
+                        self.settings.settings &&
+                        self.settings.settings.plugins &&
+                        self.settings.settings.plugins.firmware_check &&
+                        !subbed
+                    ) {
+                        subbed = true;
+                        self.settings.settings.plugins.firmware_check.ignore_infos.subscribe(
+                            function () {
+                                self.requestData();
+                            }
+                        );
                     }
-                );
-            }
 
-            self.requestData();
-        };
+                    self.requestData();
+                };
 
         self.onDataUpdaterPluginMessage = function (plugin, data) {
             if (plugin !== "firmware_check") return;
diff --git a/setup.cfg b/setup.cfg
@@ -6,7 +6,7 @@ universal = 1
 
 [flake8]
 max-line-length = 90
-extend-ignore = E203, E231, E265, E266, E402, E501, E731
+extend-ignore = E203, E231, E265, E266, E402, E501, E731, B950, W503, W504, W605
 select = B,C,E,F,W,T4,B9
 
 [isort]
diff --git a/setup.py b/setup.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 ########################################################################################################################
 ### Do not forget to adjust the following variables to your own plugin.
 
@@ -453,9 +451,7 @@ def run(self):
             shutil.rmtree(target_path)
 
         print(
-            "Copying translations for locale {locale} from {source_path} to {target_path}...".format(
-                **locals()
-            )
+            f"Copying translations for locale {locale} from {source_path} to {target_path}..."
         )
         shutil.copytree(source_path, target_path)
 
@@ -523,7 +519,7 @@ def run(self):
                 date=now.strftime("%Y%m%d%H%M%S"),
             ),
         )
-        print("Packing translation to {zip_path}".format(**locals()))
+        print(f"Packing translation to {zip_path}")
 
         def add_recursively(zip, path, prefix):
             if not os.path.isdir(path):
@@ -535,12 +531,12 @@ def add_recursively(zip, path, prefix):
                 if os.path.isdir(entry_path):
                     add_recursively(zip, entry_path, new_prefix)
                 elif os.path.isfile(entry_path):
-                    print("Adding {entry_path} as {new_prefix}".format(**locals()))
+                    print(f"Adding {entry_path} as {new_prefix}")
                     zip.write(entry_path, new_prefix)
 
-        meta_str = "last_update: {date}\n".format(date=now.isoformat())
+        meta_str = f"last_update: {now.isoformat()}\n"
         if self.author:
-            meta_str += "author: {author}\n".format(author=self.author)
+            meta_str += f"author: {self.author}\n"
 
         zip_locale_root = self.__class__.pack_path_prefix + locale
 
@@ -549,7 +545,7 @@ def add_recursively(zip, path, prefix):
         with zipfile.ZipFile(zip_path, "w") as zip:
             add_recursively(zip, locale_dir, zip_locale_root)
 
-            print("Adding meta.yaml as {zip_locale_root}/meta.yaml".format(**locals()))
+            print(f"Adding meta.yaml as {zip_locale_root}/meta.yaml")
             zip.writestr(zip_locale_root + "/meta.yaml", meta_str)
 
 
@@ -620,7 +616,7 @@ def create_plugin_setup_parameters(
     import pkg_resources
 
     if package is None:
-        package = "octoprint_{identifier}".format(**locals())
+        package = f"octoprint_{identifier}"
 
     if additional_data is None:
         additional_data = list()
@@ -676,8 +672,8 @@ def create_plugin_setup_parameters(
             pot_file=pot_file,
             output_dir=translation_dir,
             bundled_dir=bundled_dir,
-            pack_name_prefix="{name}-i18n-".format(**locals()),
-            pack_path_prefix="_plugins/{identifier}/".format(**locals()),
+            pack_name_prefix=f"{name}-i18n-",
+            pack_path_prefix=f"_plugins/{identifier}/",
         )
     )
 
@@ -687,13 +683,13 @@ def create_plugin_setup_parameters(
         [package]
         + list(
             filter(
-                lambda x: x.startswith("{package}.".format(package=package)),
+                lambda x: x.startswith(f"{package}."),
                 find_packages(where=source_folder, exclude=ignored_packages),
             )
         )
         + additional_packages
     )
-    print("Found packages: {packages!r}".format(**locals()))
+    print(f"Found packages: {packages!r}")
 
     return dict(
         name=name,
@@ -723,9 +719,7 @@ def create_plugin_setup_parameters(
         dependency_links=dependency_links,
         # Hook the plugin into the "octoprint.plugin" entry point, mapping the plugin_identifier to the plugin_package.
         # That way OctoPrint will be able to find the plugin and load it.
-        entry_points={
-            "octoprint.plugin": ["{identifier} = {package}".format(**locals())]
-        },
+        entry_points={"octoprint.plugin": [f"{identifier} = {package}"]},
     )
 
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+[tool.black]`
	`2`	`+line-length = 90`
	`3`	`+include = '\.pyi?$'`