fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! [WIP] pre-commit and ruff

Author: swrichards

.pre-commit-config.yaml

@@ -15,6 +15,7 @@ repos:
       # Run the linter.
       - id: ruff
         args: [--fix]
+        types: [file, python]
       # Run the formatter.
       # - id: ruff-format
   - repo: https://github.com/pycqa/flake8
@@ -26,3 +27,4 @@ repos:
     hooks:
       - id: black
         language_version: python3.11
+        types: [file, python]

ruff.toml

@@ -26,6 +26,7 @@ exclude = [
     "node_modules",
     "site-packages",
     "venv",
+    "env",
 ]
 
 # Same as Black.
@@ -37,12 +38,12 @@ target-version = "py311"
 
 [lint]
 select = [
-    # https://docs.astral.sh/ruff/rules/#pyflakes-f
+    # https://docs.astral.sh/ruff/rules/#error-e
     "E",
     # https://docs.astral.sh/ruff/rules/#pyflakes-f
     "F",
-    # https://docs.astral.sh/ruff/rules/#isort-i
-    "I",
+    # Bugbear
+    "B",
 ]
 ignore = [
     # Whitespace before ':' (conflicts with Black)
@@ -72,30 +73,3 @@ unfixable = []
 
 # Allow unused variables when underscore-prefixed.
 dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"
-
-[format]
-# Like Black, use double quotes for strings.
-quote-style = "double"
-
-# Like Black, indent with spaces, rather than tabs.
-indent-style = "space"
-
-# Like Black, respect magic trailing commas.
-skip-magic-trailing-comma = false
-
-# Like Black, automatically detect the appropriate line ending.
-line-ending = "auto"
-
-# Enable auto-formatting of code examples in docstrings. Markdown,
-# reStructuredText code/literal blocks and doctests are all supported.
-#
-# This is currently disabled by default, but it is planned for this
-# to be opt-out in the future.
-docstring-code-format = false
-
-# Set the line length limit used when formatting code snippets in
-# docstrings.
-#
-# This only has an effect when the `docstring-code-format` setting is
-# enabled.
-docstring-code-line-length = "dynamic"

src/open_inwoner/accounts/tests/test_notify_expiring_actions.py

@@ -30,7 +30,7 @@ def test_send_emails_about_expiring_actions(self):
 
         email1, email2 = mail.outbox
 
-        for email, recipient in zip([email1, email2], [joe, schmoe]):
+        for email, recipient in zip([email1, email2], [joe, schmoe], strict=False):
             self.assertEqual(
                 email.subject, "Acties verlopen vandaag op Open Inwoner Platform"
             )

src/open_inwoner/cms/cases/views/services.py

@@ -265,7 +265,7 @@ def resolve_case(self, case: Zaak, group: ZGWApiGroupConfig) -> Zaak:
             ):
                 try:
                     update_case = task.result()
-                    if hasattr(update_case, "__call__"):
+                    if callable(update_case):
                         update_case(case)
                 except BaseException:
                     logger.exception("Error in resolving case", stack_info=True)

src/open_inwoner/cms/cases/views/status.py

@@ -663,7 +663,9 @@ def get_case_document_files(
 
         config = OpenZaakConfig.get_solo()
         documents = []
-        for case_info_obj, info_obj in zip(case_info_objects, info_objects):
+        for case_info_obj, info_obj in zip(
+            case_info_objects, info_objects, strict=False
+        ):
             if not info_obj:
                 continue
             if not is_info_object_visible(

src/open_inwoner/openzaak/import_export.py

@@ -183,7 +183,7 @@ def __iter__(self) -> Generator[QuerySet, Any, None]:
         )
 
     def __eq__(self, other: QuerySet) -> bool:
-        for a, b in zip(self, other):
+        for a, b in zip(self, other, strict=False):
             if a.difference(b).exists():
                 return False
         return True

src/open_inwoner/openzaak/tests/test_case_detail.py

@@ -1030,7 +1030,7 @@ def test_status_is_retrieved_when_user_logged_in_via_digid(
         links = doc.find(".contactmomenten__link")
 
         self.assertEqual(len(links), 3)
-        for link, question in zip(links, case["questions"]):
+        for link, question in zip(links, case["questions"], strict=False):
             self.assertEqual(
                 link.attrib["href"],
                 reverse(
@@ -1152,7 +1152,7 @@ def test_pass_endstatus_type_data_if_endstatus_not_reached(
 
         self.assertEqual(len(links), 4)
 
-        for link, question in zip(links, case["questions"]):
+        for link, question in zip(links, case["questions"], strict=False):
             self.assertEqual(
                 link.attrib["href"],
                 reverse(

src/open_inwoner/openzaak/tests/test_import_export.py

@@ -137,6 +137,7 @@ def test_only_models_related_to_exported_catalogus_config_are_included(self):
                 "ztc_resultaat",
                 "ztiotc",
             ),
+            strict=False,
         ):
             with self.subTest(
                 f"{mock_field} should not be in the export's {export_field} field"

src/open_inwoner/openzaak/tests/test_zgw_imports.py

@@ -218,7 +218,7 @@ def test_import_zaaktype_configs_with_catalogs(self, m):
         )
 
         # check we linked correctly
-        for i, root in zip((0, 2), self.roots):
+        for i, root in zip((0, 2), self.roots, strict=False):
             self.assertEqual(res[i + 0].catalogus, cat_configs[root]["AAA"])
             self.assertEqual(res[i + 1].catalogus, cat_configs[root]["BBB"])
 

src/open_inwoner/openzaak/tests/test_zgw_imports_iotypes.py

@@ -318,6 +318,7 @@ def test_import_zaaktype_informatieobjecttype_configs_with_catalog(self, m):
         for root, root_offset in zip(
             self.roots,
             (0, 2),
+            strict=False,
         ):
             # first ZaakTypeConfig has two ZaakTypes and two InfoObjectTypes
             ztc, ztiotcs = res[root_offset]
@@ -419,6 +420,7 @@ def test_import_zaaktype_informatieobjecttype_configs_with_catalog(self, m):
         for root, root_offset in zip(
             self.roots,
             (0, 1),
+            strict=False,
         ):
             self.assertEqual(
                 catalog_and_zaak_type[root][

src/open_inwoner/utils/decorators.py

@@ -80,14 +80,16 @@ def decorator(func: Callable[..., RT]) -> Callable[..., RT]:
 
         if argspec.defaults:
             positional_count = len(argspec.args) - len(argspec.defaults)
-            defaults = dict(zip(argspec.args[positional_count:], argspec.defaults))
+            defaults = dict(
+                zip(argspec.args[positional_count:], argspec.defaults, strict=False)
+            )
         else:
             defaults = {}
 
         @wraps(func)
         def wrapped(*args, **kwargs) -> RT:
             key_kwargs = defaults.copy()
-            named_args = dict(zip(argspec.args, args), **kwargs)
+            named_args = dict(zip(argspec.args, args, strict=False), **kwargs)
             key_kwargs.update(**named_args)
 
             if argspec.varkw:

src/openklant2/factories/helpers.py

@@ -11,7 +11,7 @@ def decorator(cls: type[factory.Factory]):
         def validate(obj, *args, **kwargs):
             validator.validate_python(obj)
 
-        setattr(cls, "post_generation_validator", validate)
+        cls.post_generation_validator = validate
 
         return cls