Bump pre-commit hooks and some dependency versions.

Minimal python version is now 3.6.1 and core has been rewritten to use f-strings

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>

Author: s0undt3ch

.pre-commit-config.yaml

@@ -2,7 +2,7 @@
 minimum_pre_commit_version: 1.15.2
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.1.0
+    rev: v4.3.0
     hooks:
       - id: check-merge-conflict  # Check for files that contain merge conflict strings.
       - id: trailing-whitespace   # Trims trailing whitespace.
@@ -12,17 +12,24 @@ repos:
       - id: end-of-file-fixer     # Makes sure files end in a newline and only a newline.
       - id: check-merge-conflict  # Check for files that contain merge conflict strings.
       - id: check-ast             # Simply check whether files parse as valid python.
+
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v2.34.0
+    hooks:
+      - id: pyupgrade
+        args:
+          - --py36-plus
+          - --keep-mock
   - repo: https://github.com/asottile/reorder_python_imports
-    rev: v1.9.0
+    rev: v3.1.0
     hooks:
       - id: reorder-python-imports
         args: [--py3-plus]
   - repo: https://github.com/psf/black
-    rev: 20.8b1
+    rev: 22.3.0
     hooks:
       - id: black
         args: [-l 100]
-        language_version: python3.6
   - repo: local
     hooks:
       - id: pylint

.pylintrc

@@ -63,7 +63,8 @@ confidence=
 disable=R,
   bad-continuation,
   unused-argument,
-  fixme
+  fixme,
+  unspecified-encoding
 
 # Enable the message, report, category or checker with the given id(s). You can
 # either give multiple identifier separated by comma (,) or put this option

poetry.lock

@@ -12,15 +12,15 @@ packages = [
 "salt-rewrite" = "saltrewrite.__main__:rewrite"
 
 [tool.poetry.dependencies]
-python = "^3.6"
+python = ">=3.6.1"
 bowler = ">= 0.9.0"
 fissix = {version = "^19.2b1", allow-prereleases = true}
 importlib_metadata = {version = "*", python="<3.8"}
 
 [tool.poetry.dev-dependencies]
 pytest = ">= 5.3.4"
 pylint = "^2.4.4"
-pre-commit = "^1.21.0"
+pre-commit = "^2.17.0"
 coverage = "^5.0.3"
 
 [build-system]

pyproject.toml

@@ -1,2 +1 @@
-# -*- coding: utf-8 -*-
 # pylint: disable=missing-module-docstring

src/saltrewrite/__init__.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
     saltrewrite.cli
     ~~~~~~~~~~~~~~~
@@ -46,9 +45,7 @@ def rewrite(paths, interactive, silent, list_fixes, fix, exclude_fix):
     Main CLI entry-point
     """
     if list_fixes:
-        click.echo(
-            "Fixes:\n{}".format("\n".join(" - {}".format(fix) for fix in Registry.fix_names()))
-        )
+        click.echo("Fixes:\n{}".format("\n".join(f" - {fix}" for fix in Registry.fix_names())))
         return
 
     if fix and exclude_fix:
@@ -67,4 +64,4 @@ def format_progress_bar(item):
     Format a progress bar item
     """
     if item is not None:
-        return "Processing {}".format(item[0])
+        return f"Processing {item[0]}"

src/saltrewrite/__main__.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
     saltrewrite.fixes
     ~~~~~~~~~~~~~~~~~
@@ -13,7 +12,7 @@
 import saltrewrite.testsuite
 
 
-class RegistryClass(object):
+class RegistryClass:
     """
     Registry class to hold all available fixes
     """

src/saltrewrite/fixes.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # pylint: disable=missing-module-docstring
 from saltrewrite.imports import fix_tornado_imports
 

src/saltrewrite/imports/__init__.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
     saltrewrite.imports.fix_tornado_imports
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -93,7 +92,7 @@ def replace_decorators(node, capture, filename):
                 SYMBOL.decorator,
                 [
                     Leaf(TOKEN.AT, "@"),
-                    Name("salt.ext.{}".format(get_decorator_name(decorator))),
+                    Name(f"salt.ext.{get_decorator_name(decorator)}"),
                     Leaf(TOKEN.NEWLINE, "\n"),
                 ],
             )

src/saltrewrite/imports/fix_tornado_imports.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # pylint: disable=missing-module-docstring
 from saltrewrite.salt import fix_docstrings