ruff format and zizmor in pre-commit

Author: Julian

.pre-commit-config.yaml

@@ -16,7 +16,13 @@ repos:
         args: [--fix, lf]
       - id: trailing-whitespace
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.16.9
+    rev: "v0.16.9"
     hooks:
-      - id: ruff
+      - id: ruff-check
         args: [--fix, --exit-non-zero-on-fix]
+      - id: ruff-format
+  - repo: https://github.com/zizmorcore/zizmor-pre-commit
+    rev: v1.30.1
+    hooks:
+      - id: zizmor
+        args: [--pedantic]

docs/conf.py

@@ -53,8 +53,12 @@ def _resolve_broken_refs(app, env, node, contnode):
     if node["reftarget"].startswith("referencing."):  # :( :( :( :( :(
         node["reftype"] = "data"
         from sphinx.ext import intersphinx
+
         return intersphinx.resolve_reference_in_inventory(
-            env, "referencing", node, contnode,
+            env,
+            "referencing",
+            node,
+            contnode,
         )
 
     kind, target = _TYPE_ALIASES.get(node["reftarget"], (None, None))

jsonschema/__init__.py

@@ -8,6 +8,7 @@
 validate a given instance under a schema, and will create a validator
 for you.
 """
+
 import warnings
 
 from jsonschema._format import FormatChecker
@@ -35,9 +36,11 @@ def __getattr__(name):
         )
 
         from importlib import metadata
+
         return metadata.version("jsonschema")
     elif name == "RefResolver":
         from jsonschema.validators import _RefResolver
+
         warnings.warn(
             _RefResolver._DEPRECATION_MESSAGE,
             DeprecationWarning,
@@ -53,6 +56,7 @@ def __getattr__(name):
             stacklevel=2,
         )
         from jsonschema.exceptions import ErrorTree
+
         return ErrorTree
     elif name == "FormatError":
         warnings.warn(
@@ -63,6 +67,7 @@ def __getattr__(name):
             stacklevel=2,
         )
         from jsonschema.exceptions import FormatError
+
         return FormatError
     elif name == "Validator":
         warnings.warn(
@@ -73,9 +78,11 @@ def __getattr__(name):
             stacklevel=2,
         )
         from jsonschema.protocols import Validator
+
         return Validator
     elif name == "RefResolutionError":
         from jsonschema.exceptions import _RefResolutionError
+
         warnings.warn(
             _RefResolutionError._DEPRECATION_MESSAGE,
             DeprecationWarning,

jsonschema/__main__.py

@@ -1,6 +1,7 @@
 """
 The jsonschema CLI is now deprecated in favor of check-jsonschema.
 """
+
 from jsonschema.cli import main
 
 main()

jsonschema/_format.py

@@ -55,7 +55,9 @@ def __repr__(self):
         return f"<FormatChecker checkers={sorted(self.checkers)}>"
 
     def checks[F: _FormatCheckCallable](
-        self, format: str, raises: _RaisesType = (),
+        self,
+        format: str,
+        raises: _RaisesType = (),
     ) -> Callable[[F], F]:
         """
         Register a decorated function as validating a new format.
@@ -85,7 +87,9 @@ def _checks(func: F) -> F:
 
     @classmethod
     def cls_checks[F: _FormatCheckCallable](
-        cls, format: str, raises: _RaisesType = (),
+        cls,
+        format: str,
+        raises: _RaisesType = (),
     ) -> Callable[[F], F]:
         warnings.warn(
             (
@@ -100,7 +104,9 @@ def cls_checks[F: _FormatCheckCallable](
 
     @classmethod
     def _cls_checks[F: _FormatCheckCallable](
-        cls, format: str, raises: _RaisesType = (),
+        cls,
+        format: str,
+        raises: _RaisesType = (),
     ) -> Callable[[F], F]:
         def _checks(func: F) -> F:
             cls.checkers[format] = (func, raises)
@@ -488,7 +494,7 @@ def is_relative_json_pointer(instance: object) -> bool:
         # A non-negative-integer prefix of ASCII digits (%x30-39), which is
         # either "0" or has no leading "0".
         rest = instance.lstrip(string.digits)
-        prefix = instance[:len(instance) - len(rest)]
+        prefix = instance[: len(instance) - len(rest)]
         if not prefix:
             return False
         if len(prefix) > 1 and prefix[0] == "0":

jsonschema/_keywords.py

@@ -21,7 +21,10 @@ def patternProperties(validator, patternProperties, instance, schema):
         for k, v in instance.items():
             if re.search(pattern, k):
                 yield from validator.descend(
-                    v, subschema, path=k, schema_path=pattern,
+                    v,
+                    subschema,
+                    path=k,
+                    schema_path=pattern,
                 )
 
 
@@ -204,18 +207,14 @@ def maxItems(validator, mI, instance, schema):
 
 
 def uniqueItems(validator, uI, instance, schema):
-    if (
-        uI
-        and validator.is_type(instance, "array")
-        and not uniq(instance)
-    ):
+    if uI and validator.is_type(instance, "array") and not uniq(instance):
         yield ValidationError(f"{instance!r} has non-unique elements")
 
 
 def pattern(validator, patrn, instance, schema):
-    if (
-        validator.is_type(instance, "string")
-        and not re.search(patrn, instance)
+    if validator.is_type(instance, "string") and not re.search(
+        patrn,
+        instance,
     ):
         yield ValidationError(f"{instance!r} does not match {patrn!r}")
 
@@ -262,7 +261,9 @@ def dependentSchemas(validator, dependentSchemas, instance, schema):
         if property not in instance:
             continue
         yield from validator.descend(
-            instance, dependency, schema_path=property,
+            instance,
+            dependency,
+            schema_path=property,
         )
 
 
@@ -312,7 +313,8 @@ def required(validator, required, instance, schema):
 def minProperties(validator, mP, instance, schema):
     if validator.is_type(instance, "object") and len(instance) < mP:
         message = (
-            "should be non-empty" if mP == 1
+            "should be non-empty"
+            if mP == 1
             else "does not have enough properties"
         )
         yield ValidationError(f"{instance!r} {message}")
@@ -323,8 +325,7 @@ def maxProperties(validator, mP, instance, schema):
         return
     if validator.is_type(instance, "object") and len(instance) > mP:
         message = (
-            "is expected to be empty" if mP == 0
-            else "has too many properties"
+            "is expected to be empty" if mP == 0 else "has too many properties"
         )
         yield ValidationError(f"{instance!r} {message}")
 
@@ -364,7 +365,8 @@ def oneOf(validator, oneOf, instance, schema):
         )
 
     more_valid = [
-        each for _, each in subschemas
+        each
+        for _, each in subschemas
         if validator.evolve(schema=each).is_valid(instance)
     ]
     if more_valid:
@@ -393,10 +395,13 @@ def unevaluatedItems(validator, unevaluatedItems, instance, schema):
     if not validator.is_type(instance, "array"):
         return
     evaluated_item_indexes = find_evaluated_item_indexes_by_schema(
-        validator, instance, schema,
+        validator,
+        instance,
+        schema,
     )
     unevaluated_items = [
-        item for index, item in enumerate(instance)
+        item
+        for index, item in enumerate(instance)
         if index not in evaluated_item_indexes
     ]
     if unevaluated_items:
@@ -408,7 +413,9 @@ def unevaluatedProperties(validator, unevaluatedProperties, instance, schema):
     if not validator.is_type(instance, "object"):
         return
     evaluated_keys = find_evaluated_property_keys_by_schema(
-        validator, instance, schema,
+        validator,
+        instance,
+        schema,
     )
     unevaluated_keys = []
     for property in instance: