commonground-api-common 2.6.4__tar.gz → 2.6.6__tar.gz

{commonground_api_common-2.6.4 → commonground_api_common-2.6.6}/CHANGELOG.rst

@@ -2,6 +2,25 @@
 Change history
 ==============
 
+2.6.6 (2025-06-04)
+------------------
+
+* [open-zaak/open-zaak#635] Rename JWT_LEEWAY setting to TIME_LEEWAY and add it to UntilNowValidator
+
+2.6.5 (2025-05-27)
+------------------
+
+**Bugfixes/QOL**
+
+* No longer rely on zgw-consumers for generate_jwt util
+* [#90] Make requests_mock dependency optional (can be installed with ``pip install commonground-api-common[oas]``)
+
+**Maintenance**
+
+* [maykinmedia/open-api-framework#140] Upgrade python to 3.12
+* [maykinmedia/open-api-framework#132] Replace check_sphinx.py with make
+* [maykinmedia/open-api-framework#133] Replace black, isort and flake8 with ruff and update code-quality workflow
+
 2.6.4 (2025-05-16)
 ------------------
 

{commonground_api_common-2.6.4/commonground_api_common.egg-info → commonground_api_common-2.6.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: commonground-api-common
-Version: 2.6.4
+Version: 2.6.6
 Summary: Commonground API tooling
 Home-page: https://github.com/maykinmedia/commonground-api-common
 Author: Maykin Media, VNG-Realisatie
@@ -18,6 +18,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Dist: django>=4.2.0
 Requires-Dist: django-filter<=25.1,>=23.1
@@ -33,7 +34,6 @@ Requires-Dist: zgw-consumers>=0.35.1
 Requires-Dist: oyaml
 Requires-Dist: PyJWT>=2.1.1
 Requires-Dist: requests
-Requires-Dist: requests-mock
 Requires-Dist: coreapi
 Requires-Dist: ape-pie
 Provides-Extra: markdown-docs
@@ -45,24 +45,23 @@ Provides-Extra: drf-extra-fields
 Requires-Dist: drf-extra-fields>=3.7.0; extra == "drf-extra-fields"
 Provides-Extra: tests
 Requires-Dist: psycopg2; extra == "tests"
-Requires-Dist: pytest; extra == "tests"
+Requires-Dist: pytest==8.3.5; extra == "tests"
 Requires-Dist: pytest-django; extra == "tests"
 Requires-Dist: pytest-dotenv; extra == "tests"
 Requires-Dist: pytest-factoryboy; extra == "tests"
 Requires-Dist: tox; extra == "tests"
-Requires-Dist: isort; extra == "tests"
-Requires-Dist: black; extra == "tests"
+Requires-Dist: ruff; extra == "tests"
 Requires-Dist: requests-mock; extra == "tests"
 Requires-Dist: freezegun; extra == "tests"
 Requires-Dist: zgw-consumers-oas; extra == "tests"
 Requires-Dist: djangorestframework-gis; extra == "tests"
 Requires-Dist: drf-extra-fields; extra == "tests"
+Provides-Extra: oas
+Requires-Dist: requests-mock; extra == "oas"
 Provides-Extra: testutils
 Requires-Dist: zgw-consumers-oas; extra == "testutils"
 Provides-Extra: setup-configuration
 Requires-Dist: django-setup-configuration>=0.7.0; extra == "setup-configuration"
-Provides-Extra: pep8
-Requires-Dist: flake8; extra == "pep8"
 Provides-Extra: coverage
 Requires-Dist: pytest-cov; extra == "coverage"
 Provides-Extra: docs
@@ -76,7 +75,12 @@ Requires-Dist: bump2version; extra == "release"
 Commonground-API-common - Tooling voor RESTful APIs
 ===================================================
 
-|build-status| |code-quality| |coverage| |docs| |black|
+
+:Version: 2.6.6
+:Source: https://github.com/maykinmedia/commonground-api-common
+:PythonVersion: 3.12
+
+|build-status| |code-quality| |coverage| |docs| |ruff|
 
 |python-versions| |django-versions| |pypi-version|
 
@@ -105,7 +109,7 @@ Features
     * Niet-negatieve waarde validator
     * Alfanumerieke waarde (zonder diacritics)
     * URL-validator (test dat URL bestaat) met pluggable link-checker
-    * ``UntilNowValidator`` - valideer datetimes tot en met *nu*.
+    * ``UntilNowValidator`` - valideer datetimes tot en met *nu*. (Via de TIME_LEEWAY setting kan speling worden toegevoegd)
     * ``UniekeIdentificatieValidator`` (in combinatie met organisatie)
     * ``InformatieObjectUniqueValidator`` om te valideren dat M2M entries
       slechts eenmalig voorkomen
@@ -158,7 +162,8 @@ Features
 .. |pypi-version| image:: https://img.shields.io/pypi/v/commonground-api-common.svg
     :target: https://pypi.org/project/commonground-api-common/
 
-.. |black| image:: https://img.shields.io/badge/code%20style-black-000000.svg
-    :target: https://github.com/psf/black
+.. |ruff| image:: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json
+    :target: https://github.com/astral-sh/ruff
+    :alt: Ruff
 
 .. _documentatie: https://commonground-api-common.readthedocs.io/en/latest/?badge=latest

{commonground_api_common-2.6.4 → commonground_api_common-2.6.6}/README.rst

@@ -2,7 +2,12 @@
 Commonground-API-common - Tooling voor RESTful APIs
 ===================================================
 
-|build-status| |code-quality| |coverage| |docs| |black|
+
+:Version: 2.6.6
+:Source: https://github.com/maykinmedia/commonground-api-common
+:PythonVersion: 3.12
+
+|build-status| |code-quality| |coverage| |docs| |ruff|
 
 |python-versions| |django-versions| |pypi-version|
 
@@ -31,7 +36,7 @@ Features
     * Niet-negatieve waarde validator
     * Alfanumerieke waarde (zonder diacritics)
     * URL-validator (test dat URL bestaat) met pluggable link-checker
-    * ``UntilNowValidator`` - valideer datetimes tot en met *nu*.
+    * ``UntilNowValidator`` - valideer datetimes tot en met *nu*. (Via de TIME_LEEWAY setting kan speling worden toegevoegd)
     * ``UniekeIdentificatieValidator`` (in combinatie met organisatie)
     * ``InformatieObjectUniqueValidator`` om te valideren dat M2M entries
       slechts eenmalig voorkomen
@@ -84,7 +89,8 @@ Features
 .. |pypi-version| image:: https://img.shields.io/pypi/v/commonground-api-common.svg
     :target: https://pypi.org/project/commonground-api-common/
 
-.. |black| image:: https://img.shields.io/badge/code%20style-black-000000.svg
-    :target: https://github.com/psf/black
+.. |ruff| image:: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json
+    :target: https://github.com/astral-sh/ruff
+    :alt: Ruff
 
 .. _documentatie: https://commonground-api-common.readthedocs.io/en/latest/?badge=latest

{commonground_api_common-2.6.4 → commonground_api_common-2.6.6/commonground_api_common.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: commonground-api-common
-Version: 2.6.4
+Version: 2.6.6
 Summary: Commonground API tooling
 Home-page: https://github.com/maykinmedia/commonground-api-common
 Author: Maykin Media, VNG-Realisatie
@@ -18,6 +18,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Dist: django>=4.2.0
 Requires-Dist: django-filter<=25.1,>=23.1
@@ -33,7 +34,6 @@ Requires-Dist: zgw-consumers>=0.35.1
 Requires-Dist: oyaml
 Requires-Dist: PyJWT>=2.1.1
 Requires-Dist: requests
-Requires-Dist: requests-mock
 Requires-Dist: coreapi
 Requires-Dist: ape-pie
 Provides-Extra: markdown-docs
@@ -45,24 +45,23 @@ Provides-Extra: drf-extra-fields
 Requires-Dist: drf-extra-fields>=3.7.0; extra == "drf-extra-fields"
 Provides-Extra: tests
 Requires-Dist: psycopg2; extra == "tests"
-Requires-Dist: pytest; extra == "tests"
+Requires-Dist: pytest==8.3.5; extra == "tests"
 Requires-Dist: pytest-django; extra == "tests"
 Requires-Dist: pytest-dotenv; extra == "tests"
 Requires-Dist: pytest-factoryboy; extra == "tests"
 Requires-Dist: tox; extra == "tests"
-Requires-Dist: isort; extra == "tests"
-Requires-Dist: black; extra == "tests"
+Requires-Dist: ruff; extra == "tests"
 Requires-Dist: requests-mock; extra == "tests"
 Requires-Dist: freezegun; extra == "tests"
 Requires-Dist: zgw-consumers-oas; extra == "tests"
 Requires-Dist: djangorestframework-gis; extra == "tests"
 Requires-Dist: drf-extra-fields; extra == "tests"
+Provides-Extra: oas
+Requires-Dist: requests-mock; extra == "oas"
 Provides-Extra: testutils
 Requires-Dist: zgw-consumers-oas; extra == "testutils"
 Provides-Extra: setup-configuration
 Requires-Dist: django-setup-configuration>=0.7.0; extra == "setup-configuration"
-Provides-Extra: pep8
-Requires-Dist: flake8; extra == "pep8"
 Provides-Extra: coverage
 Requires-Dist: pytest-cov; extra == "coverage"
 Provides-Extra: docs
@@ -76,7 +75,12 @@ Requires-Dist: bump2version; extra == "release"
 Commonground-API-common - Tooling voor RESTful APIs
 ===================================================
 
-|build-status| |code-quality| |coverage| |docs| |black|
+
+:Version: 2.6.6
+:Source: https://github.com/maykinmedia/commonground-api-common
+:PythonVersion: 3.12
+
+|build-status| |code-quality| |coverage| |docs| |ruff|
 
 |python-versions| |django-versions| |pypi-version|
 
@@ -105,7 +109,7 @@ Features
     * Niet-negatieve waarde validator
     * Alfanumerieke waarde (zonder diacritics)
     * URL-validator (test dat URL bestaat) met pluggable link-checker
-    * ``UntilNowValidator`` - valideer datetimes tot en met *nu*.
+    * ``UntilNowValidator`` - valideer datetimes tot en met *nu*. (Via de TIME_LEEWAY setting kan speling worden toegevoegd)
     * ``UniekeIdentificatieValidator`` (in combinatie met organisatie)
     * ``InformatieObjectUniqueValidator`` om te valideren dat M2M entries
       slechts eenmalig voorkomen
@@ -158,7 +162,8 @@ Features
 .. |pypi-version| image:: https://img.shields.io/pypi/v/commonground-api-common.svg
     :target: https://pypi.org/project/commonground-api-common/
 
-.. |black| image:: https://img.shields.io/badge/code%20style-black-000000.svg
-    :target: https://github.com/psf/black
+.. |ruff| image:: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json
+    :target: https://github.com/astral-sh/ruff
+    :alt: Ruff
 
 .. _documentatie: https://commonground-api-common.readthedocs.io/en/latest/?badge=latest

{commonground_api_common-2.6.4 → commonground_api_common-2.6.6}/commonground_api_common.egg-info/requires.txt

@@ -12,7 +12,6 @@ zgw-consumers>=0.35.1
 oyaml
 PyJWT>=2.1.1
 requests
-requests-mock
 coreapi
 ape-pie
 
@@ -34,8 +33,8 @@ drf-extra-fields>=3.7.0
 django-markup<=1.3
 markdown
 
-[pep8]
-flake8
+[oas]
+requests-mock
 
 [release]
 bump2version
@@ -45,13 +44,12 @@ django-setup-configuration>=0.7.0
 
 [tests]
 psycopg2
-pytest
+pytest==8.3.5
 pytest-django
 pytest-dotenv
 pytest-factoryboy
 tox
-isort
-black
+ruff
 requests-mock
 freezegun
 zgw-consumers-oas

{commonground_api_common-2.6.4 → commonground_api_common-2.6.6}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = commonground-api-common
-version = 2.6.4
+version = 2.6.6
 description = Commonground API tooling
 long_description = file: README.rst
 url = https://github.com/maykinmedia/commonground-api-common
@@ -20,6 +20,7 @@ classifiers =
 	Programming Language :: Python :: 3 :: Only
 	Programming Language :: Python :: 3.10
 	Programming Language :: Python :: 3.11
+	Programming Language :: Python :: 3.12
 	Topic :: Software Development :: Libraries :: Python Modules
 
 [options]
@@ -43,7 +44,6 @@ install_requires =
 	oyaml
 	PyJWT>=2.1.1
 	requests
-	requests-mock
 	coreapi
 	ape-pie
 tests_require = 
@@ -52,8 +52,7 @@ tests_require =
 	pytest-dotenv
 	pytest-factoryboy
 	tox
-	isort
-	black
+	ruff
 	requests-mock
 	freezegun
 	zgw-consumers-oas
@@ -72,23 +71,23 @@ drf_extra_fields =
 	drf-extra-fields>=3.7.0
 tests = 
 	psycopg2
-	pytest
+	pytest==8.3.5 # can be unpinned when pytest-factoryboy is updated
 	pytest-django
 	pytest-dotenv
 	pytest-factoryboy
 	tox
-	isort
-	black
+	ruff
 	requests-mock
 	freezegun
 	zgw-consumers-oas
 	djangorestframework-gis
 	drf-extra-fields
+oas = 
+	requests-mock
 testutils = 
 	zgw-consumers-oas
 setup-configuration = 
 	django-setup-configuration>=0.7.0
-pep8 = flake8
 coverage = pytest-cov
 docs = 
 	psycopg2
@@ -100,18 +99,6 @@ release =
 [aliases]
 test = pytest
 
-[isort]
-profile = black
-combine_as_imports = true
-skip = 
-	env
-	node_modules
-	.tox
-skip_glob = **/migrations/**
-known_django = django
-known_first_party = vng_api_common
-sections = FUTURE,STDLIB,DJANGO,THIRDPARTY,FIRSTPARTY,LOCALFOLDER
-
 [tool:pytest]
 testpaths = tests
 DJANGO_SETTINGS_MODULE = testapp.settings
@@ -120,10 +107,6 @@ DJANGO_SETTINGS_MODULE = testapp.settings
 max-line-length = 88
 exclude = env,.tox,doc
 
-[flake8]
-max-line-length = 88
-exclude = env,.tox,doc
-
 [coverage:run]
 branch = True
 source = vng_api_common

{commonground_api_common-2.6.4 → commonground_api_common-2.6.6}/tests/test_cached_hyperlinkrelatedfields.py

@@ -1,7 +1,5 @@
 from unittest.mock import patch
 
-from django.urls import reverse
-
 import pytest
 from rest_framework.reverse import reverse
 

{commonground_api_common-2.6.4 → commonground_api_common-2.6.6}/tests/test_jwt_decoding.py

@@ -42,7 +42,7 @@ def test_nbf_validated():
 @pytest.mark.django_db
 @freeze_time("2021-08-23T14:20:00")
 def test_nbf_validated_with_leeway(settings):
-    settings.JWT_LEEWAY = 3
+    settings.TIME_LEEWAY = 3
     JWTSecret.objects.create(identifier="client", secret="secret")
     payload = {
         "client_id": "client",

{commonground_api_common-2.6.4 → commonground_api_common-2.6.6}/tests/test_pagination.py

@@ -37,7 +37,6 @@ def test_list_with_page_size_in_query(api_client):
 
 
 def test_page_size_query_description_property():
-
     class DummyPagination(DynamicPageSizeMixin):
         page_size = 42
 

{commonground_api_common-2.6.4 → commonground_api_common-2.6.6}/tests/test_schema.py

@@ -177,7 +177,7 @@ def test_geo_headers():
     }
 
     # parameters
-    for method, path in {
+    for method, url_path in {
         "post": "/api/geo",
         "put": "/api/geo/{id}",
         "patch": "/api/geo/{id}",
@@ -187,14 +187,14 @@ def test_geo_headers():
             "name": "Accept-Crs",
             "schema": {"type": "string", "enum": ["EPSG:4326"]},
             "description": "The desired 'Coordinate Reference System' (CRS) of the response data. According to the GeoJSON spec, WGS84 is the default (EPSG: 4326 is the same as WGS84).",
-        } in schema["paths"][path][method]["parameters"]
+        } in schema["paths"][url_path][method]["parameters"]
         assert {
             "in": "header",
             "name": "Content-Crs",
             "schema": {"type": "string", "enum": ["EPSG:4326"]},
             "description": "The 'Coordinate Reference System' (CRS) of the request data. According to the GeoJSON spec, WGS84 is the default (EPSG: 4326 is the same as WGS84).",
             "required": True,
-        } in schema["paths"][path][method]["parameters"]
+        } in schema["paths"][url_path][method]["parameters"]
 
     assert {
         "in": "header",

{commonground_api_common-2.6.4 → commonground_api_common-2.6.6}/tests/test_utils.py

@@ -70,7 +70,7 @@ def test_no_resolution():
 
     paths = [
         f"/api/groups/{group.pk}",
-        f"/api/groups/-3",
+        "/api/groups/-3",
     ]
 
     with pytest.raises(RuntimeError):

{commonground_api_common-2.6.4 → commonground_api_common-2.6.6}/tests/test_validators.py

@@ -1,10 +1,14 @@
+from datetime import datetime, timezone
+
 from django.core.exceptions import ValidationError
 
 import pytest
+from freezegun import freeze_time
 
 from vng_api_common.validators import (
     AlphanumericExcludingDiacritic,
     BaseIdentifierValidator,
+    UntilNowValidator,
     validate_bsn,
     validate_rsin,
 )
@@ -104,3 +108,18 @@ def test_invalid_rsin():
     with pytest.raises(ValidationError) as error:
         validate_rsin("12345678")  # validate_length
     assert "Waarde moet 9 tekens lang zijn" in str(error.value)
+
+
+@freeze_time("2021-08-23T14:20:00")
+def test_invalid_date():
+    validator = UntilNowValidator()
+    with pytest.raises(ValidationError) as error:
+        validator(datetime(2021, 8, 23, 14, 20, 4, tzinfo=timezone.utc))
+    assert "Ensure this value is not in the future." in str(error.value)
+
+
+@freeze_time("2021-08-23T14:20:00")
+def test_invalid_date_with_leeway(settings):
+    settings.TIME_LEEWAY = 5
+    validator = UntilNowValidator()
+    validator(datetime(2021, 8, 23, 14, 20, 4, tzinfo=timezone.utc))

commonground_api_common-2.6.6/vng_api_common/__init__.py

@@ -0,0 +1 @@
+__version__ = "2.6.6"

{commonground_api_common-2.6.4 → commonground_api_common-2.6.6}/vng_api_common/admin.py

@@ -1,5 +1,4 @@
 from django.contrib import admin
-from django.utils.translation import gettext_lazy as _
 
 from .models import JWTSecret
 

{commonground_api_common-2.6.4 → commonground_api_common-2.6.6}/vng_api_common/audittrails/models.py

@@ -20,8 +20,7 @@ class AuditTrail(models.Model):
         max_length=255,
         blank=True,
         help_text=_(
-            'Een globaal "request" ID om een verzoek door het '
-            "netwerk heen te traceren."
+            'Een globaal "request" ID om een verzoek door het netwerk heen te traceren.'
         ),
     )
     bron = models.CharField(

{commonground_api_common-2.6.4 → commonground_api_common-2.6.6}/vng_api_common/authorizations/middleware.py

@@ -108,7 +108,7 @@ class JWTAuth:
                     self.encoded,
                     algorithms=["HS256"],
                     options={"verify_signature": False},
-                    leeway=settings.JWT_LEEWAY,
+                    leeway=settings.TIME_LEEWAY,
                 )
             except jwt.DecodeError:
                 logger.info("Invalid JWT encountered")
@@ -146,7 +146,7 @@ class JWTAuth:
                     self.encoded,
                     key,
                     algorithms=["HS256"],
-                    leeway=settings.JWT_LEEWAY,
+                    leeway=settings.TIME_LEEWAY,
                 )
             except jwt.InvalidSignatureError:
                 logger.exception("Invalid signature - possible payload tampering?")

{commonground_api_common-2.6.4 → commonground_api_common-2.6.6}/vng_api_common/authorizations/models.py

@@ -11,7 +11,6 @@ from zgw_consumers.constants import APITypes, AuthTypes
 from vng_api_common.client import Client, get_client
 
 from ..constants import ComponentTypes, VertrouwelijkheidsAanduiding
-from ..decorators import field_default
 from ..fields import VertrouwelijkheidsAanduidingField
 from ..models import APIMixin
 

commonground_api_common-2.6.6/vng_api_common/authorizations/utils.py

@@ -0,0 +1,27 @@
+import time
+
+import jwt
+
+
+def generate_jwt(
+    client_id: str,
+    secret: str,
+    user_id: str,
+    user_representation: str,
+    jwt_valid_for: int | None = None,
+) -> str:
+    iat = int(time.time())
+    payload = {
+        # standard claims
+        "iss": client_id,
+        "iat": iat,
+        # custom claims
+        "client_id": client_id,
+        "user_id": user_id,
+        "user_representation": user_representation,
+    }
+    if jwt_valid_for:
+        payload["exp"] = iat + jwt_valid_for
+
+    token = jwt.encode(payload, secret, algorithm="HS256")
+    return f"Bearer {token}"

{commonground_api_common-2.6.4 → commonground_api_common-2.6.6}/vng_api_common/caching/registry.py

@@ -64,9 +64,9 @@ class Dependency:
         instance: models.Model,
         is_delete: bool = False,
     ) -> Iterable[models.Model]:
-        assert isinstance(
-            instance, self.source_model
-        ), "Instance is not of expected model class"
+        assert isinstance(instance, self.source_model), (
+            "Instance is not of expected model class"
+        )
 
         reverse_relation_field = self.field.remote_field
 

{commonground_api_common-2.6.4 → commonground_api_common-2.6.6}/vng_api_common/client.py

@@ -40,7 +40,6 @@ class Client(APIClient):
     def request(
         self, method: str | bytes, url: str | bytes, *args, **kwargs
     ) -> Response:
-
         headers = kwargs.pop("headers", {})
         headers.setdefault("Accept", "application/json")
         headers.setdefault("Content-Type", "application/json")

{commonground_api_common-2.6.4 → commonground_api_common-2.6.6}/vng_api_common/conf/api.py

@@ -8,7 +8,7 @@ __all__ = [
     "GEMMA_URL_INFORMATIEMODEL_VERSIE",
     "GEMMA_URL_INFORMATIEMODEL",
     "GEMMA_URL_TEMPLATE",
-    "JWT_LEEWAY",
+    "TIME_LEEWAY",
     "JWT_SPECTACULAR_SETTINGS",
     "LINK_FETCHER",
     "NOTIFICATIONS_DISABLED",
@@ -95,6 +95,6 @@ vng_repo = "VNG-Realisatie/vng-api-common"
 vng_branch = "ref-responses"
 COMMON_SPEC = f"https://raw.githubusercontent.com/{vng_repo}/feature/{vng_branch}/vng_api_common/schemas/common.yaml"
 
-JWT_LEEWAY = 0  # default in PyJWT
+TIME_LEEWAY = 0  # default in PyJWT
 
 COMMONGROUND_API_COMMON_GET_DOMAIN = "vng_api_common.utils.get_site_domain"

{commonground_api_common-2.6.4 → commonground_api_common-2.6.6}/vng_api_common/constants.py

@@ -88,28 +88,40 @@ class RolTypes(models.TextChoices):
 
 
 class Archiefnominatie(models.TextChoices):
-    blijvend_bewaren = "blijvend_bewaren", _(
-        "Het zaakdossier moet bewaard blijven en op de Archiefactiedatum "
-        "overgedragen worden naar een archiefbewaarplaats."
+    blijvend_bewaren = (
+        "blijvend_bewaren",
+        _(
+            "Het zaakdossier moet bewaard blijven en op de Archiefactiedatum "
+            "overgedragen worden naar een archiefbewaarplaats."
+        ),
     )
-    vernietigen = "vernietigen", _(
-        "Het zaakdossier moet op of na de Archiefactiedatum vernietigd worden."
+    vernietigen = (
+        "vernietigen",
+        _("Het zaakdossier moet op of na de Archiefactiedatum vernietigd worden."),
     )
 
 
 class Archiefstatus(models.TextChoices):
-    nog_te_archiveren = "nog_te_archiveren", _(
-        "De zaak cq. het zaakdossier is nog niet als geheel gearchiveerd."
+    nog_te_archiveren = (
+        "nog_te_archiveren",
+        _("De zaak cq. het zaakdossier is nog niet als geheel gearchiveerd."),
     )
-    gearchiveerd = "gearchiveerd", _(
-        "De zaak cq. het zaakdossier is als geheel niet-wijzigbaar bewaarbaar gemaakt."
+    gearchiveerd = (
+        "gearchiveerd",
+        _(
+            "De zaak cq. het zaakdossier is als geheel niet-wijzigbaar bewaarbaar gemaakt."
+        ),
     )
-    gearchiveerd_procestermijn_onbekend = "gearchiveerd_procestermijn_onbekend", _(
-        "De zaak cq. het zaakdossier is als geheel niet-wijzigbaar bewaarbaar gemaakt "
-        "maar de vernietigingsdatum kan nog niet bepaald worden."
+    gearchiveerd_procestermijn_onbekend = (
+        "gearchiveerd_procestermijn_onbekend",
+        _(
+            "De zaak cq. het zaakdossier is als geheel niet-wijzigbaar bewaarbaar gemaakt "
+            "maar de vernietigingsdatum kan nog niet bepaald worden."
+        ),
     )
-    overgedragen = "overgedragen", _(
-        "De zaak cq. het zaakdossier is overgebracht naar een archiefbewaarplaats."
+    overgedragen = (
+        "overgedragen",
+        _("De zaak cq. het zaakdossier is overgebracht naar een archiefbewaarplaats."),
     )
 
 
@@ -190,17 +202,20 @@ class ZaakobjectTypes(models.TextChoices):
     buurt = "buurt", _("Buurt")
     enkelvoudig_document = "enkelvoudig_document", _("Enkelvoudig document")
     gemeente = "gemeente", _("Gemeente")
-    gemeentelijke_openbare_ruimte = "gemeentelijke_openbare_ruimte", _(
-        "Gemeentelijke openbare ruimte"
+    gemeentelijke_openbare_ruimte = (
+        "gemeentelijke_openbare_ruimte",
+        _("Gemeentelijke openbare ruimte"),
     )
     huishouden = "huishouden", _("Huishouden")
     inrichtingselement = "inrichtingselement", _("Inrichtingselement")
-    kadastrale_onroerende_zaak = "kadastrale_onroerende_zaak", _(
-        "Kadastrale onroerende zaak"
+    kadastrale_onroerende_zaak = (
+        "kadastrale_onroerende_zaak",
+        _("Kadastrale onroerende zaak"),
     )
     kunstwerkdeel = "kunstwerkdeel", _("Kunstwerkdeel")
-    maatschappelijke_activiteit = "maatschappelijke_activiteit", _(
-        "Maatschappelijke activiteit"
+    maatschappelijke_activiteit = (
+        "maatschappelijke_activiteit",
+        _("Maatschappelijke activiteit"),
     )
     medewerker = "medewerker", _("Medewerker")
     natuurlijk_persoon = "natuurlijk_persoon", _("Natuurlijk persoon")