Update linters (#4640)

Author: ssbarnea

.pre-commit-config.yaml

@@ -145,17 +145,14 @@ repos:
       - id: tox-ini-fmt
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.11.12
+    rev: v0.11.13
     hooks:
-      - id: ruff
-        args:
-          - --fix
-          - --exit-non-zero-on-fix
-        types_or: [python, pyi]
-      # - id: ruff-format # must be after ruff
-      #   types_or: [python, pyi]
+      - id: ruff-format
+        alias: ruff
+      - id: ruff-check
+        alias: ruff
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.16.0
+    rev: v1.16.1
     hooks:
       - id: mypy
         # "." and pass_files are used to make pre-commit mypy behave the same as standalone mypy
@@ -181,7 +178,7 @@ repos:
           - wcmatch
           - yamllint>=1.34.0
   - repo: https://github.com/RobertCraigie/pyright-python
-    rev: v1.1.401
+    rev: v1.1.402
     hooks:
       - id: pyright
         additional_dependencies: *deps

src/ansiblelint/__main__.py

@@ -392,10 +392,14 @@ def main(argv: list[str] | None = None) -> int:
     # load ignore file
     ignore_map = load_ignore_txt(options.ignore_file)
     # prune qualified skips from ignore file
-    result.matches = [m for m in result.matches if not _rule_is_skipped(m.tag, ignore_map[m.filename])]
+    result.matches = [
+        m for m in result.matches if not _rule_is_skipped(m.tag, ignore_map[m.filename])
+    ]
     # others entries are ignored
     for match in result.matches:
-        if match.tag in [i.rule for i in ignore_map[match.filename]]:  # pragma: no cover
+        if match.tag in [
+            i.rule for i in ignore_map[match.filename]
+        ]:  # pragma: no cover
             match.ignored = True
             _logger.debug("Ignored: %s", match)
 

src/ansiblelint/formatters/__init__.py

@@ -96,7 +96,7 @@ def apply(self, match: MatchError) -> str:
         result = (
             f"[repr.path]{self._format_path(match.filename or '')}[/][dim]:{match.position}:[/] "
             f"[{match.level}][bold]{self.escape(match.tag)}[/]"
-            f"{ f': {match.message}' if not options.quiet else '' }[/]"
+            f"{f': {match.message}' if not options.quiet else ''}[/]"
         )
         if match.level != "error":
             result += f" [dim][{match.level}]({match.level})[/][/]"
@@ -307,9 +307,9 @@ def _to_sarif_result(self, match: MatchError) -> dict[str, Any]:
             ],
         }
         if match.column:
-            result["locations"][0]["physicalLocation"]["region"][
-                "startColumn"
-            ] = match.column
+            result["locations"][0]["physicalLocation"]["region"]["startColumn"] = (
+                match.column
+            )
         return result
 
     @staticmethod

src/ansiblelint/loaders.py

@@ -24,17 +24,20 @@
 
 class IgnoreFile(NamedTuple):
     """IgnoreFile n."""
+
     default: str
     alternative: str
 
 
 class IgnoreRuleQualifier(enum.Enum):
     """Extra flags for ignored rules."""
+
     SKIP = "Force skip, not warning"
 
 
 class IgnoreRule(NamedTuple):
     """Ignored rule."""
+
     rule: str
     qualifiers: frozenset[IgnoreRuleQualifier]
 

src/ansiblelint/rules/risky_octal.py

@@ -38,8 +38,7 @@ class OctalPermissionsRule(AnsibleLintRule):
 
     id = "risky-octal"
     description = (
-        "Numeric file permissions without leading zero can behave "
-        "in unexpected ways."
+        "Numeric file permissions without leading zero can behave in unexpected ways."
     )
     link = "https://docs.ansible.com/ansible/latest/collections/ansible/builtin/file_module.html"
     severity = "VERY_HIGH"

src/ansiblelint/runner.py

@@ -222,7 +222,10 @@ def _run(self) -> list[MatchError]:
                 sub_tag = ""
                 lintable.exc.__class__.__name__.lower()
                 message = None
-                if lintable.exc.__cause__ and isinstance(lintable.exc.__cause__, ScannerError | ParserError | RuamelParserError):
+                if lintable.exc.__cause__ and isinstance(
+                    lintable.exc.__cause__,
+                    ScannerError | ParserError | RuamelParserError,
+                ):
                     sub_tag = "yaml"
                     if isinstance(lintable.exc.args, tuple):
                         message = lintable.exc.args[0]

src/ansiblelint/skip_utils.py

@@ -268,7 +268,10 @@ def _continue_skip_next_lines(
         if _noqa_comment_line_re.fullmatch(line_content[line_no - 1]):
             # Find next non-empty line
             next_line_no = line_no
-            while next_line_no < len(line_content) and not line_content[next_line_no].strip():
+            while (
+                next_line_no < len(line_content)
+                and not line_content[next_line_no].strip()
+            ):
                 next_line_no += 1
             if next_line_no >= len(line_content):
                 continue
@@ -293,8 +296,12 @@ def traverse_yaml(obj: Any) -> None:
             traversable.append(obj.ca.comment)
         for entry in traversable:
             # flatten all lists we might have in entries. Some arcane ruamel CommentedMap magic
-            entry = [item for sublist in entry if sublist is not None
-                     for item in (sublist if isinstance(sublist, list) else [sublist])]
+            entry = [
+                item
+                for sublist in entry
+                if sublist is not None
+                for item in (sublist if isinstance(sublist, list) else [sublist])
+            ]
             for v in entry:
                 if isinstance(v, CommentToken):
                     comment_str = v.value

src/ansiblelint/utils.py

@@ -583,7 +583,9 @@ def _rolepath(self, basedir: str, role: str) -> str | None:
             # This ignores deeper structures than 1 level
             possible_paths.append(path_dwim(basedir, os.path.join("roles", *role_name)))
             possible_paths.append(path_dwim(basedir, os.path.join(*role_name)))
-            possible_paths.append(path_dwim(basedir, os.path.join("..", "..", *role_name)))
+            possible_paths.append(
+                path_dwim(basedir, os.path.join("..", "..", *role_name))
+            )
 
         for loc in self.app.runtime.config.default_roles_path:
             loc = os.path.expanduser(loc)

test/test_config.py

@@ -12,6 +12,6 @@ def test_profiles(default_rules_collection: RulesCollection) -> None:
             for rule in default_rules_collection.rules:
                 if profile_rule_id == rule.id:
                     forbidden_tags = profile_banned_tags & set(rule.tags)
-                    assert (
-                        not forbidden_tags
-                    ), f"Rule {profile_rule_id} from {name} profile cannot use {profile_banned_tags & set(rule.tags)} tag."
+                    assert not forbidden_tags, (
+                        f"Rule {profile_rule_id} from {name} profile cannot use {profile_banned_tags & set(rule.tags)} tag."
+                    )

test/test_file_utils.py

@@ -98,13 +98,13 @@ def test_discover_lintables_silent(
     my_options.lintables = [str(lint_path)]
     files = file_utils.discover_lintables(my_options)
     stderr = capsys.readouterr().err
-    assert (
-        not stderr
-    ), f"No stderr output is expected when the verbosity is off, got: {stderr}"
-    assert (
-        len(files) == yaml_count
-    ), "Expected to find {yaml_count} yaml files in {lint_path}".format_map(
-        locals(),
+    assert not stderr, (
+        f"No stderr output is expected when the verbosity is off, got: {stderr}"
+    )
+    assert len(files) == yaml_count, (
+        "Expected to find {yaml_count} yaml files in {lint_path}".format_map(
+            locals(),
+        )
     )