Pre-commit update

Author: foosel

.eslintrc.yaml

@@ -0,0 +1,6 @@
+env:
+  browser: true
+  jquery: true
+  es6: true
+parserOptions:
+  ecmaVersion: 2018

.github/workflows/build.yml

@@ -29,79 +29,28 @@ jobs:
           name: dist
           path: dist
 
-  lint-black:
-    name: 🧹 black
+  pre-commit:
+    name: 🧹 Pre-commit
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - name: 🏗 Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-      - name: 🏗 Set up dev dependencies
-        run: |
-          pip install -e .[develop]
-      - name: 🚀 Run black
-        run: |
-          pre-commit run --hook-stage manual black --all-files --show-diff-on-failure
-
-  lint-prettier:
-    name: 🧹 prettier
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: 🏗 Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-      - name: 🏗 Set up dev dependencies
-        run: |
-          pip install -e .[develop]
-      - name: 🚀 Run prettier
-        run: |
-          pre-commit run --hook-stage manual prettier --all-files --show-diff-on-failure
-
-  lint-isort:
-    name: 🧹 isort
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: 🏗 Set up Python 3.7
-        uses: actions/setup-python@v1
+      - uses: actions/checkout@v3
+      - name: 🏗 Set up Python 3.10
+        uses: actions/setup-python@v4
         with:
-          python-version: 3.7
-      - name: 🏗 Set up dev dependencies
-        run: |
-          pip install -e .[develop]
-      - name: 🚀 Run isort
-        run: |
-          pre-commit run --hook-stage manual isort --all-files --show-diff-on-failure
-
-  lint-flake8:
-    name: 🧹 Flake8
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: 🏗 Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-      - name: 🏗 Set up dev dependencies
+          python-version: "3.10"
+      - name: 🏗 Set up pre-commit
         run: |
-          pip install -e .[develop]
-      - name: 🚀 Run flake8
+          pip install pre-commit
+      - name: 🚀 Run pre-commit
         run: |
-          pre-commit run --hook-stage manual flake8 --all-files
+          pre-commit run --all-files --show-diff-on-failure
 
   publish-on-testpypi:
     name: 📦 Publish on TestPyPI
     if: github.event_name == 'release'
     needs:
       - build
-      - lint-black
-      - lint-prettier
-      - lint-isort
-      - lint-flake8
+      - pre-commit
     runs-on: ubuntu-latest
     steps:
       - name: ⬇ Download build result

.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_file_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,39 @@ 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
+  - 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$

octoprint_file_check/__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) 2020 The OctoPrint Project - Released under terms of the AGPLv3 License"
 
-import io
 import re
 
 # noinspection PyCompatibility
@@ -111,7 +107,7 @@ def _search_through_file(self, path, term, incl_comments=False):
         return False
 
     def _search_through_file_python(self, path, term, compiled, incl_comments=False):
-        with io.open(path, mode="r", encoding="utf8", errors="replace") as f:
+        with open(path, encoding="utf8", errors="replace") as f:
             for line in f:
                 if term in line and (incl_comments or compiled.match(line)):
                     return True

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]

setup.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 ########################################################################################################################
 ### Do not forget to adjust the following variables to your own plugin.
 
@@ -463,9 +461,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)
 
@@ -533,7 +529,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):
@@ -545,12 +541,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
 
@@ -559,7 +555,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)
 
 
@@ -630,7 +626,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()
@@ -686,8 +682,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}/",
         )
     )
 
@@ -697,13 +693,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,
@@ -733,9 +729,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}"]},
     )