Merge pull request #3821 from open-formulieren/chore/update-black

Update black to `24.1.1`

Author: sergei-maertens

.git-blame-ignore-revs

@@ -6,3 +6,5 @@ a39b15a21d28ee995e861cad489f0648fc971f7e
 f185fedaa603a1ef0285dd30e47f74218677c2c6
 232688b1cb23d3590a8dccc640e1fffe6d4328c5
 
+# Black
+dbe92ee0499968064d47ae33d178c1d40738bd66

requirements/ci.txt

@@ -49,7 +49,7 @@ billiard==3.6.4.0
     #   -c requirements/base.txt
     #   -r requirements/base.txt
     #   celery
-black==22.12.0
+black==24.1.1
     # via -r requirements/test-tools.in
 bleach[css]==5.0.1
     # via
@@ -622,6 +622,7 @@ packaging==23.1
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
+    #   black
     #   prance
     #   pytest
     #   sphinx
@@ -952,6 +953,7 @@ typing-extensions==4.9.0
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
+    #   black
     #   pyee
 tzdata==2023.3
     # via

requirements/dev.txt

@@ -57,7 +57,7 @@ billiard==3.6.4.0
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
     #   celery
-black==22.12.0
+black==24.1.1
     # via
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
@@ -713,6 +713,7 @@ packaging==23.1
     # via
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
+    #   black
     #   build
     #   prance
     #   pytest
@@ -1136,6 +1137,7 @@ typing-extensions==4.9.0
     # via
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
+    #   black
     #   pyee
 tzdata==2023.3
     # via

setup.cfg

@@ -1,5 +1,5 @@
 [flake8]
-ignore=E203,E261,E501,E731,F405,W293,W291,W503
+ignore=E203,E261,E501,E704,E731,F405,W293,W291,W503
 max-line-length=88
 exclude=
     migrations

src/csp_post_processor/drf/fields.py

@@ -1,6 +1,7 @@
 """
 Django Rest Framework integration to apply post processing for serializer fields.
 """
+
 import logging
 
 from rest_framework import fields

src/csp_post_processor/drf/spectacular.py

@@ -1,6 +1,7 @@
 """
 API schema generation extension using drf-spectacular.
 """
+
 import logging
 
 from django.utils.translation import gettext_lazy as _

src/csp_post_processor/fields.py

@@ -1,6 +1,7 @@
 """
 Django model field integration to wrap WYSIWYG library fields.
 """
+
 from django.db.models import TextField
 
 

src/openforms/accounts/tests/test_hijacking.py

@@ -1,6 +1,7 @@
 """
 Assert that the hijack funtionality works even with 2FA.
 """
+
 from django.contrib.auth import SESSION_KEY
 from django.test import override_settings
 from django.urls import reverse

src/openforms/accounts/tests/test_user_preferences.py

@@ -1,6 +1,7 @@
 """
 Tests for managing the (admin) user preferences.
 """
+
 from django.urls import reverse, reverse_lazy
 
 from django_webtest import WebTest

src/openforms/api/drf_jsonschema.py

@@ -1,6 +1,7 @@
 """
 drf_jsonschema integration - register custom converters
 """
+
 from typing import Any
 
 from django.utils.translation import gettext_lazy as _

src/openforms/api/exception_handling.py

@@ -76,9 +76,11 @@ def get_validation_errors(validation_errors: dict | list, camelize=True):
                                 # ('type', 'about:blank'),
                                 (
                                     "name",
-                                    underscore_to_camel(field_name)
-                                    if camelize
-                                    else field_name,
+                                    (
+                                        underscore_to_camel(field_name)
+                                        if camelize
+                                        else field_name
+                                    ),
                                 ),
                                 ("code", err.code),
                                 ("reason", str(err)),
@@ -91,9 +93,11 @@ def get_validation_errors(validation_errors: dict | list, camelize=True):
                             # ('type', 'about:blank'),
                             (
                                 "name",
-                                underscore_to_camel(field_name)
-                                if camelize
-                                else field_name,
+                                (
+                                    underscore_to_camel(field_name)
+                                    if camelize
+                                    else field_name
+                                ),
                             ),
                             ("code", error.code),
                             ("reason", str(error)),

src/openforms/api/views/views.py

@@ -1,6 +1,7 @@
 """
 Concrete view classes/utilities not tied to any particular app.
 """
+
 import logging
 import os
 from collections import OrderedDict

src/openforms/appointments/contrib/demo/tests/test_endpoints.py

@@ -1,6 +1,7 @@
 """
 Test that the demo plugin can be used to simulate endpoint responses.
 """
+
 from datetime import date
 from unittest.mock import patch
 

src/openforms/appointments/contrib/qmatic/tests/test_appointment_create.py

@@ -1,6 +1,7 @@
 """
 VCR tests for creating an appointment with Qmatic.
 """
+
 import json
 from datetime import date
 

src/openforms/appointments/contrib/qmatic/tests/test_dates_list.py

@@ -1,6 +1,7 @@
 """
 Tests for retrieving available appointment dates from Qmatic through our own API.
 """
+
 from datetime import date
 
 from django.test import TestCase

src/openforms/appointments/contrib/qmatic/tests/test_products_list.py

@@ -1,6 +1,7 @@
 """
 Tests for retrieving available products from Qmatic through our own API.
 """
+
 from django.test import TestCase
 
 from openforms.utils.tests.vcr import OFVCRMixin

src/openforms/appointments/contrib/qmatic/tests/test_times_list.py

@@ -1,6 +1,7 @@
 """
 Tests for retrieving available appointment times from Qmatic through our own API.
 """
+
 from datetime import date
 
 from django.test import TestCase

src/openforms/appointments/core.py

@@ -4,6 +4,7 @@
 This module is the follow-up to the bulk of functionality in utils.py, which is doing
 way too much but can't be easily refactored without breaking existing functionality.
 """
+
 import logging
 
 from django.utils.translation import gettext_lazy as _

src/openforms/appointments/service.py

@@ -4,6 +4,7 @@
 The exported names here may be used in other django apps and/or Open Forms modules.
 Anything else is considered private API.
 """
+
 from openforms.submissions.models import Submission
 
 from .renderer import AppointmentRenderer

src/openforms/appointments/tests/test_confirmation_emails.py

@@ -1,6 +1,7 @@
 """
 Test the generic confirmation e-mail sending for appointment forms.
 """
+
 from datetime import date, datetime, time
 from unittest.mock import patch
 

src/openforms/authentication/contrib/digid/views.py

@@ -101,8 +101,8 @@ def get(self, request):
         request.session[DIGID_AUTH_SESSION_KEY] = bsn
         # store the authn contexts so the plugin can check persmission when
         # accessing/creating an object
-        request.session[
-            DIGID_AUTH_SESSION_AUTHN_CONTEXTS
-        ] = response.get_authn_contexts()
+        request.session[DIGID_AUTH_SESSION_AUTHN_CONTEXTS] = (
+            response.get_authn_contexts()
+        )
 
         return HttpResponseRedirect(self.get_success_url())

src/openforms/authentication/contrib/eherkenning/views.py

@@ -147,8 +147,8 @@ def get(self, request):
 
         # store the authn contexts so the plugin can check persmission when
         # accessing/creating an object
-        request.session[
-            EHERKENNING_AUTH_SESSION_AUTHN_CONTEXTS
-        ] = response.get_authn_contexts()
+        request.session[EHERKENNING_AUTH_SESSION_AUTHN_CONTEXTS] = (
+            response.get_authn_contexts()
+        )
 
         return HttpResponseRedirect(self.get_success_url())

src/openforms/conf/base.py

@@ -465,9 +465,11 @@
             "level": "DEBUG",
         },
         "log_outgoing_requests": {
-            "handlers": ["log_outgoing_requests", "save_outgoing_requests"]
-            if LOG_REQUESTS
-            else [],
+            "handlers": (
+                ["log_outgoing_requests", "save_outgoing_requests"]
+                if LOG_REQUESTS
+                else []
+            ),
             "level": "DEBUG",
             "propagate": True,
         },

src/openforms/conf/production.py

@@ -3,6 +3,7 @@
 Tweaks the base settings so that caching mechanisms are used where possible,
 and HTTPS is leveraged where possible to further secure things.
 """
+
 import os
 
 os.environ.setdefault("ENVIRONMENT", "production")

src/openforms/conf/staging.py

@@ -2,6 +2,7 @@
 Staging environment settings module.
 This *should* be nearly identical to production.
 """
+
 import os
 
 os.environ.setdefault("ENVIRONMENT", "staging")

src/openforms/config/views.py

@@ -31,11 +31,9 @@ def _subset_match(requested: str | None, checking: str) -> bool:
 class ConfigCheckable(Protocol):
     verbose_name: str
 
-    def check_config(self) -> None:
-        ...
+    def check_config(self) -> None: ...
 
-    def get_config_actions(self) -> list[Action]:
-        ...
+    def get_config_actions(self) -> list[Action]: ...
 
 
 def is_plugin(plugin: Any) -> TypeGuard[AbstractBasePlugin]:

src/openforms/contrib/brk/validators.py

@@ -104,7 +104,7 @@ def __call__(self, value: AddressValue, submission: Submission) -> bool:
         if "house_number_addition" in value:
             address_query["huisnummertoevoeging"] = value["house_number_addition"]
 
-        with (client, suppress_api_errors(self.error_messages["retrieving_error"])):
+        with client, suppress_api_errors(self.error_messages["retrieving_error"]):
             real_estate_objects_resp = client.get_real_estate_by_address(address_query)
             real_estate_objects = glom(
                 real_estate_objects_resp,

src/openforms/contrib/haal_centraal/clients/brp.py

@@ -5,6 +5,7 @@
 
 Documentation for v2: https://brp-api.github.io/Haal-Centraal-BRP-bevragen/v2/getting-started
 """
+
 import logging
 from abc import ABC, abstractmethod
 from collections.abc import Sequence
@@ -57,8 +58,7 @@ def __init__(
         self.headers["x-gebruiker"] = gebruiker
 
     @abstractmethod
-    def find_person(self, bsn: str, **kwargs) -> JSONObject | None:
-        ...
+    def find_person(self, bsn: str, **kwargs) -> JSONObject | None: ...
 
     @abstractmethod
     def get_family_members(
@@ -70,8 +70,7 @@ def get_family_members(
         ...
 
     @abstractmethod
-    def make_config_test_request(self) -> None:
-        ...
+    def make_config_test_request(self) -> None: ...
 
 
 class V1Client(HALMixin, BRPClient):

src/openforms/contrib/haal_centraal/models.py

@@ -1,6 +1,7 @@
 """
 Configuration for Haal Centraal APIs
 """
+
 from django.db import models
 from django.utils.translation import gettext_lazy as _
 

src/openforms/contrib/microsoft/client.py

@@ -7,6 +7,7 @@
 requirements such as mTLS are not relevant. The service model definition also does not
 allow configuring any of those aspects.
 """
+
 import json
 import os
 from io import BytesIO

src/openforms/dmn/contrib/camunda/tests/test_plugin.py

@@ -13,6 +13,7 @@
 You can also point to a different host/URL and/or credentials through environment
 variables, see :mod:`openforms.contrib.camunda.tests.utils`.
 """
+
 import logging
 from functools import partial
 from unittest.mock import patch

src/openforms/dmn/service.py

@@ -1,6 +1,7 @@
 """
 Public Python API for the DMN module.
 """
+
 from typing import Any
 
 from .base import BasePlugin

src/openforms/emails/api/serializers.py

@@ -27,9 +27,9 @@ def to_internal_value(self, data):
                 if not (translated_content := translations.get("content")):
                     continue
 
-                data["translations"][language_code][
-                    "content"
-                ] = self._add_cosign_templatetag(translated_content)
+                data["translations"][language_code]["content"] = (
+                    self._add_cosign_templatetag(translated_content)
+                )
 
         return super().to_internal_value(data)
 

src/openforms/emails/templatetags/appointments.py

@@ -37,8 +37,8 @@ def appointment_information(context):
             as_html=not as_text,
         ),
         "appointment_cancel_link": plugin.get_cancel_link(context["_submission"]),
-        "appointment_change_link": plugin.get_change_link(context["_submission"])
-        if not appointment
-        else "",
+        "appointment_change_link": (
+            plugin.get_change_link(context["_submission"]) if not appointment else ""
+        ),
     }
     return render_to_string(template_name, tag_context)

src/openforms/formio/api/schema.py

@@ -1,6 +1,7 @@
 """
 Define some (basic) OpenAPI schema for Form.io components.
 """
+
 from django.utils.translation import gettext_lazy as _
 
 from drf_spectacular.plumbing import build_basic_type, build_object_type

src/openforms/formio/components/custom.py

@@ -111,8 +111,7 @@ def __call__(
         include_children: bool,
         include_partner: bool,
         submission: Submission | None = ...,
-    ) -> list[tuple[str, str]]:
-        ...
+    ) -> list[tuple[str, str]]: ...
 
 
 @register("npFamilyMembers")