pre-commit update

Author: foosel

.eslintrc.yaml

@@ -0,0 +1,10 @@
+parserOptions:
+  ecmaVersion: 2018
+
+overrides:
+  - files:
+      - "octoprint_pi_support/static/js/**.js"
+    env:
+      browser: true
+      jquery: true
+      es6: true

.pre-commit-config.yaml

@@ -1,7 +1,7 @@
 exclude: ^(octoprint_pi_support/translations|extras/|translations/|.*\.css|.*\.svg)
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.3.0
+    rev: v4.1.0
     hooks:
       - id: end-of-file-fixer
       - id: trailing-whitespace
@@ -11,32 +11,42 @@ repos:
       - id: check-toml
       - id: check-merge-conflict
       - id: fix-encoding-pragma
+        args: ["--remove"]
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.10.0
+    rev: v2.31.0
     hooks:
       - id: pyupgrade
+        args: ["--py37-plus"]
   - repo: https://github.com/OctoPrint/codemods
-    rev: devel
+    rev: "0.6.3"
     hooks:
       - id: codemod_not_in
   - 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: 20.8b1
+    rev: 22.1.0
     hooks:
       - id: black
         args: ["--config", "black.toml"]
         additional_dependencies:
           - click==8.0.4
-  - repo: https://gitlab.com/pycqa/flake8
-    rev: 3.8.1
+  - repo: https://github.com/pycqa/flake8
+    rev: 3.9.2
     hooks:
       - id: flake8
         additional_dependencies:
           - flake8-bugbear
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v2.1.2
+    rev: v2.5.1
     hooks:
       - id: prettier
+  - repo: https://github.com/pre-commit/mirrors-eslint
+    rev: v8.8.0
+    hooks:
+      - id: eslint
+        additional_dependencies:
+          - [email protected]
+          - [email protected]
+        files: \.js$

octoprint_pi_support/__init__.py

@@ -1,10 +1,6 @@
-# -*- 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) 2017 The OctoPrint Project - Released under terms of the AGPLv3 License"
 
-import io
 import os
 from getpass import getuser
 
@@ -71,7 +67,7 @@
 _UNRECOMMENDED_MODELS = ("Zero", "Zero W")
 
 
-class ThrottleState(object):
+class ThrottleState:
     @classmethod
     def from_value(cls, value=0):
         if value == 0:
@@ -99,7 +95,7 @@ def __init__(self, **kwargs):
         self._past_throttled = False
 
         for key, value in kwargs.items():
-            local_key = "_{}".format(key)
+            local_key = f"_{key}"
             if hasattr(self, local_key) and isinstance(value, bool):
                 setattr(self, local_key, value)
 
@@ -145,7 +141,7 @@ def raw_value(self):
 
     @property
     def raw_value_hex(self):
-        return "0x{:X}".format(self._raw_value)
+        return f"0x{self._raw_value:X}"
 
     def __eq__(self, other):
         if not isinstance(other, ThrottleState):
@@ -180,7 +176,7 @@ def get_proc_dt_model():
     global _proc_dt_model
 
     if _proc_dt_model is None:
-        with io.open(_PROC_DT_MODEL_PATH, "rt", encoding="utf-8") as f:
+        with open(_PROC_DT_MODEL_PATH, encoding="utf-8") as f:
             _proc_dt_model = f.readline().strip(" \t\r\n\0")
 
     return _proc_dt_model
@@ -200,9 +196,7 @@ def get_vcgencmd_throttled_state(command):
         output, error = sarge.get_both(command, close_fds=CLOSE_FDS)
 
     if "throttled=0x" not in output:
-        raise ValueError(
-            'Cannot parse "{}" output: {}'.format(command, error if error else output)
-        )
+        raise ValueError(f"Cannot parse {command!r} output: {error if error else output}")
 
     value = output[len("throttled=") :].strip(" \t\r\n\0")
     value = int(value, 0)
@@ -220,7 +214,7 @@ def is_octopiuptodate():
 def is_model_any_of(model, *args):
     model = model.lower()
     for arg in map(lambda x: x.lower(), args):
-        if "{} rev".format(arg) in model or model.endswith(arg):
+        if f"{arg} rev" in model or model.endswith(arg):
             return True
     return False
 
@@ -232,7 +226,7 @@ def get_octopi_version():
     global _octopi_version
 
     if _octopi_version is None:
-        with io.open(_OCTOPI_VERSION_PATH, "rt", encoding="utf-8") as f:
+        with open(_OCTOPI_VERSION_PATH, encoding="utf-8") as f:
             _octopi_version = f.readline().strip(" \t\r\n\0")
 
     return _octopi_version
@@ -245,7 +239,7 @@ def get_octopiuptodate_build():
     global _octopiuptodate_build
 
     if _octopiuptodate_build is None:
-        with io.open(_OCTOPIUPTODATE_BUILD_PATH, "rt", encoding="utf-8") as f:
+        with open(_OCTOPIUPTODATE_BUILD_PATH, encoding="utf-8") as f:
             _octopiuptodate_build = f.readline().strip(" \t\r\n\0")
 
     return _octopiuptodate_build
@@ -476,7 +470,7 @@ def _check_throttled_state(self):
 
         command = self._settings.get(["vcgencmd_throttle_check_command"])
 
-        self._logger.debug('Retrieving throttle state via "{}"'.format(command))
+        self._logger.debug(f"Retrieving throttle state via {command!r}")
         try:
             state = get_vcgencmd_throttled_state(command)
         except ValueError as ex:

octoprint_pi_support/static/js/pi_support.js

@@ -252,9 +252,13 @@ $(function () {
             return content;
         });
 
-        self.onStartup = self.onServerReconnect = self.onUserLoggedIn = self.onUserLoggedOut = function () {
-            self.requestData();
-        };
+        self.onStartup =
+            self.onServerReconnect =
+            self.onUserLoggedIn =
+            self.onUserLoggedOut =
+                function () {
+                    self.requestData();
+                };
 
         self.onDataUpdaterPluginMessage = function (plugin, data) {
             if (plugin !== "pi_support") return;

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}"]},
     )
 
 

tests/__init__.py

@@ -1,2 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function, unicode_literals

tests/test_pi_support.py

@@ -1,10 +1,7 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 import unittest
+from unittest import mock
 
 import ddt
-import mock
 from octoprint.util.platform import CLOSE_FDS
 
 OCTOPI_VERSION = "0.14.0"