Merge pull request #4482 from open-formulieren/bump-deps-02-07

Bump some dependencies

Author: sergei-maertens

requirements/base.txt

@@ -180,7 +180,7 @@ django-jsonform==2.21.2
     #   mozilla-django-oidc-db
 django-log-outgoing-requests==0.6.1
     # via -r requirements/base.in
-django-modeltranslation==0.18.12
+django-modeltranslation==0.19.4
     # via -r requirements/base.in
 django-ordered-model==3.6
     # via
@@ -207,7 +207,7 @@ django-simple-certmanager==2.0.0
     #   -r requirements/base.in
     #   django-digid-eherkenning
     #   zgw-consumers
-django-solo==2.1.0
+django-solo==2.3.0
     # via
     #   -r requirements/base.in
     #   django-camunda
@@ -473,7 +473,7 @@ sentry-sdk[django]==1.27.1
     # via -r requirements/base.in
 simplejson==3.17.6
     # via mail-parser
-six==1.15.0
+six==1.16.0
     # via
     #   bleach
     #   click-repl
@@ -510,6 +510,8 @@ typing-extensions==4.11.0
     # via
     #   -r requirements/base.in
     #   asgiref
+    #   django-modeltranslation
+    #   django-solo
     #   mozilla-django-oidc-db
     #   qrcode
     #   schwifty

requirements/ci.txt

@@ -305,7 +305,7 @@ django-log-outgoing-requests==0.6.1
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
-django-modeltranslation==0.18.12
+django-modeltranslation==0.19.4
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
@@ -355,7 +355,7 @@ django-simple-certmanager[testutils]==2.0.0
     #   -r requirements/test-tools.in
     #   django-digid-eherkenning
     #   zgw-consumers
-django-solo==2.1.0
+django-solo==2.3.0
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
@@ -926,7 +926,7 @@ simplejson==3.17.6
     #   -c requirements/base.txt
     #   -r requirements/base.txt
     #   mail-parser
-six==1.15.0
+six==1.16.0
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
@@ -1026,6 +1026,8 @@ typing-extensions==4.11.0
     #   -r requirements/base.txt
     #   asgiref
     #   black
+    #   django-modeltranslation
+    #   django-solo
     #   mozilla-django-oidc-db
     #   pyee
     #   qrcode

requirements/dev.txt

@@ -335,7 +335,7 @@ django-log-outgoing-requests==0.6.1
     # via
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
-django-modeltranslation==0.18.12
+django-modeltranslation==0.19.4
     # via
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
@@ -389,7 +389,7 @@ django-simple-certmanager[testutils]==2.0.0
     #   django-digid-eherkenning
     #   django-simple-certmanager
     #   zgw-consumers
-django-solo==2.1.0
+django-solo==2.3.0
     # via
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
@@ -1042,7 +1042,7 @@ simplejson==3.17.6
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
     #   mail-parser
-six==1.15.0
+six==1.16.0
     # via
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
@@ -1194,6 +1194,8 @@ typing-extensions==4.11.0
     #   -r requirements/ci.txt
     #   asgiref
     #   black
+    #   django-modeltranslation
+    #   django-solo
     #   mozilla-django-oidc-db
     #   pyee
     #   qrcode

requirements/extensions.txt

@@ -291,7 +291,7 @@ django-log-outgoing-requests==0.6.1
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
-django-modeltranslation==0.18.12
+django-modeltranslation==0.19.4
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
@@ -340,7 +340,7 @@ django-simple-certmanager==2.0.0
     #   -r requirements/base.txt
     #   django-digid-eherkenning
     #   zgw-consumers
-django-solo==2.1.0
+django-solo==2.3.0
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
@@ -833,7 +833,7 @@ simplejson==3.17.6
     #   -c requirements/base.txt
     #   -r requirements/base.txt
     #   mail-parser
-six==1.15.0
+six==1.16.0
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
@@ -890,6 +890,8 @@ typing-extensions==4.11.0
     #   -c requirements/base.txt
     #   -r requirements/base.txt
     #   asgiref
+    #   django-modeltranslation
+    #   django-solo
     #   mozilla-django-oidc-db
     #   qrcode
     #   schwifty

src/openforms/analytics_tools/tests/test_analytics_rendering.py

@@ -25,7 +25,6 @@ def setUpTestData(cls):
         form = FormFactory.create()
         cls.url = reverse("forms:form-detail", kwargs={"slug": form.slug})
         config = AnalyticsToolsConfiguration.get_solo()
-        assert isinstance(config, AnalyticsToolsConfiguration)
         config.analytics_cookie_consent_group, _ = CookieGroup.objects.get_or_create(
             varname="analytical"
         )

src/openforms/appointments/api/serializers.py

@@ -209,7 +209,6 @@ def validate(self, attrs: dict) -> dict:
             )
 
         config = AppointmentsConfig.get_solo()
-        assert isinstance(config, AppointmentsConfig)
         plugin = get_plugin()
         # normalize to data class instances to call plugin methods
         products = [

src/openforms/appointments/api/views.py

@@ -110,7 +110,6 @@ def get_objects(self):
 
         plugin = get_plugin()
         config = AppointmentsConfig().get_solo()
-        assert isinstance(config, AppointmentsConfig)
         kwargs = {}
         if location_id := config.limit_to_location:
             kwargs["location_id"] = location_id

src/openforms/appointments/contrib/jcc/client.py

@@ -7,6 +7,5 @@
 
 def get_client() -> Client:
     config = JccConfig.get_solo()
-    assert isinstance(config, JccConfig)
     assert config.service is not None
     return build_client(config.service)

src/openforms/appointments/contrib/qmatic/client.py

@@ -74,7 +74,6 @@ def QmaticClient() -> "Client":
     Create a Qmatic client instance from the database configuration.
     """
     config = QmaticConfig.get_solo()
-    assert isinstance(config, QmaticConfig)
     if (service := config.service) is None:
         raise NoServiceConfigured("No Qmatic service defined, aborting!")
     assert isinstance(service, Service)

src/openforms/appointments/contrib/qmatic/plugin.py

@@ -303,7 +303,6 @@ def get_required_customer_fields(
         products: list[Product],
     ) -> list[Component]:
         config = QmaticConfig.get_solo()
-        assert isinstance(config, QmaticConfig)
         components = [
             FIELD_TO_FORMIO_COMPONENT[field]
             for field in config.required_customer_fields

src/openforms/appointments/tests/test_admin.py

@@ -202,7 +202,6 @@ def test_configure_default_location(self):
                 )
 
             config = AppointmentsConfig.get_solo()
-            assert isinstance(config, AppointmentsConfig)
             config.plugin = "test"
             config.save()
 

src/openforms/appointments/utils.py

@@ -31,7 +31,6 @@ def get_plugin(plugin: str = "") -> BasePlugin:
     """returns plugin selected in AppointmentsConfig"""
     if not plugin:
         config = AppointmentsConfig.get_solo()
-        assert isinstance(config, AppointmentsConfig)
         if not (plugin := config.plugin):
             raise ValueError("No plugin is specified in AppointmentsConfig")
     return register[plugin]

src/openforms/authentication/contrib/digid/tests/test_auth_procedure.py

@@ -53,7 +53,6 @@ def setUpTestData(cls):
         METADATA = TEST_FILES / "metadata.xml"
 
         config = DigidConfiguration.get_solo()
-        assert isinstance(config, DigidConfiguration)
         config.certificate = cert
         config.base_url = "https://test-sp.nl"
         config.entity_id = "https://test-sp.nl"

src/openforms/authentication/contrib/digid/tests/test_signicat_integration.py

@@ -81,7 +81,6 @@ def setUpTestData(cls):
         )
 
         config = DigidConfiguration.get_solo()
-        assert isinstance(config, DigidConfiguration)
         config.certificate = cert
         # broker insists using https
         config.base_url = config.entity_id = "https://localhost:8000"

src/openforms/authentication/contrib/digid_eherkenning_oidc/plugin.py

@@ -129,7 +129,6 @@ def handle_return(self, request: HttpRequest, form: Form):
     def logout(self, request: HttpRequest):
         if id_token := request.session.get(OIDC_ID_TOKEN_SESSION_KEY):
             config = self.config_class.get_solo()
-            assert isinstance(config, BaseConfig)
             do_op_logout(config, id_token)
 
         keys_to_delete = (

src/openforms/authentication/contrib/eherkenning/tests/test_eherkenning_auth.py

@@ -45,7 +45,6 @@ def setUpTestData(cls):
         METADATA = TEST_FILES / "eherkenning-metadata.xml"
 
         config = EherkenningConfiguration.get_solo()
-        assert isinstance(config, EherkenningConfiguration)
         config.certificate = cert
         config.base_url = "https://test-sp.nl"
         config.entity_id = "urn:etoegang:DV:00000001111111111000:entities:9000"

src/openforms/authentication/contrib/eherkenning/tests/test_eidas_auth.py

@@ -45,7 +45,6 @@ def setUpTestData(cls):
         METADATA = TEST_FILES / "eherkenning-metadata.xml"
 
         config = EherkenningConfiguration.get_solo()
-        assert isinstance(config, EherkenningConfiguration)
         config.certificate = cert
         config.base_url = "https://test-sp.nl"
         config.entity_id = "urn:etoegang:DV:00000001111111111000:entities:9000"

src/openforms/authentication/contrib/eherkenning/tests/test_signicat_integration.py

@@ -82,7 +82,6 @@ def setUpTestData(cls):
         )
 
         config = EherkenningConfiguration.get_solo()
-        assert isinstance(config, EherkenningConfiguration)
         config.certificate = cert
         config.idp_service_entity_id = SIGNICAT_BROKER_BASE / "sp/saml"
         # broker insists using https

src/openforms/config/api/views.py

@@ -21,7 +21,6 @@ class PrivacyPolicyInfoView(APIView):
 
     def get(self, request: Request) -> Response:
         conf = GlobalConfiguration.get_solo()
-        assert isinstance(conf, GlobalConfiguration)
         if not conf.ask_privacy_consent:
             info = PrivacyPolicyInfo(requires_privacy_consent=False)
         else:

src/openforms/config/templatetags/theme.py

@@ -19,7 +19,6 @@ def get_theme(context: Context) -> Theme:
     theme = context.get(THEME_OVERRIDE_CONTEXT_VAR)
     if not theme:
         config = GlobalConfiguration.get_solo()
-        assert isinstance(config, GlobalConfiguration)
         theme = config.get_default_theme()
         # cache it in the context to avoid repeated lookups
         context[THEME_OVERRIDE_CONTEXT_VAR] = theme

src/openforms/config/tests/test_global_configuration.py

@@ -23,7 +23,6 @@
 def _ensure_arrayfields(form: WebTestForm, config: GlobalConfiguration | None = None):
     if config is None:
         config = GlobalConfiguration.get_solo()  # type: ignore
-    assert isinstance(config, GlobalConfiguration)
     # set the values manually, normally this is done through JS (django-jsonform takes
     # care of it)
     form["email_template_netloc_allowlist"] = json.dumps(
@@ -61,7 +60,6 @@ def _cleanup():
     def test_plugin_configuration(self):
         # mocking the admin/solo machinery is not straightforward here...
         config = GlobalConfiguration.get_solo()
-        assert isinstance(config, GlobalConfiguration)
         config.plugin_configuration = {
             "authentication": {
                 "digid": {
@@ -93,7 +91,6 @@ def test_plugin_configuration(self):
 
     def test_configuration_save_form_email_can_be_added(self):
         config = GlobalConfiguration.get_solo()
-        assert isinstance(config, GlobalConfiguration)
         url = reverse("admin:config_globalconfiguration_change", args=(1,))
 
         change_page = self.app.get(url)

src/openforms/config/views.py

@@ -38,7 +38,6 @@ def get_context_data(self, **kwargs: Any) -> dict[str, Any]:
 
     def get_clamav_entry(self):
         config = GlobalConfiguration.get_solo()
-        assert isinstance(config, GlobalConfiguration)
         config_url = reverse(
             "admin:config_globalconfiguration_change", args=(config.pk,)
         )

src/openforms/contrib/brk/client.py

@@ -20,7 +20,6 @@ class NoServiceConfigured(RuntimeError):
 
 def get_client(submission: Submission | None = None) -> "BRKClient":
     config = BRKConfig.get_solo()
-    assert isinstance(config, BRKConfig)
     if not (service := config.service):
         raise NoServiceConfigured("No BRK service configured!")
     context = (

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

@@ -25,8 +25,6 @@ def get_brp_client(submission: Submission | None = None, **kwargs: Any) -> BRPCl
 
     config = HaalCentraalConfig.get_solo()
     global_config = GlobalConfiguration.get_solo()
-    assert isinstance(config, HaalCentraalConfig)
-    assert isinstance(global_config, GlobalConfiguration)
     if not (service := config.brp_personen_service):
         raise NoServiceConfigured("No BRP service configured!")
 

src/openforms/contrib/kadaster/clients/__init__.py

@@ -11,15 +11,13 @@ class NoServiceConfigured(RuntimeError):
 
 def get_locatieserver_client() -> LocatieServerClient:
     config = KadasterApiConfig.get_solo()
-    assert isinstance(config, KadasterApiConfig)
     # model field is not nullable because a default is configured
     assert (service := config.search_service)
     return build_client(service, client_factory=LocatieServerClient)
 
 
 def get_bag_client() -> BAGClient:
     config = KadasterApiConfig.get_solo()
-    assert isinstance(config, KadasterApiConfig)
     if not (service := config.bag_service):
         raise NoServiceConfigured("No BAG service configured!")
     return build_client(service, client_factory=BAGClient)

src/openforms/contrib/kvk/client.py

@@ -15,15 +15,13 @@
 
 def get_kvk_profile_client() -> "KVKProfileClient":
     config = KVKConfig.get_solo()
-    assert isinstance(config, KVKConfig)
     if not (service := config.profile_service):
         raise NoServiceConfigured("No KVK basisprofielen service configured!")
     return build_client(service, client_factory=KVKProfileClient)
 
 
 def get_kvk_search_client() -> "KVKSearchClient":
     config = KVKConfig.get_solo()
-    assert isinstance(config, KVKConfig)
     if not (service := config.search_service):
         raise NoServiceConfigured("No KVK zoeken service configured!")
     return build_client(service, client_factory=KVKSearchClient)

src/openforms/emails/confirmation_emails.py

@@ -20,7 +20,6 @@
 def get_confirmation_email_templates(submission: "Submission") -> tuple[str, str]:
     with translation.override(submission.language_code):
         config = GlobalConfiguration.get_solo()
-        assert isinstance(config, GlobalConfiguration)
         if not hasattr(submission.form, "confirmation_email_template"):
             return config.confirmation_email_subject, config.confirmation_email_content
 

src/openforms/emails/context.py

@@ -8,7 +8,6 @@
 
 def get_wrapper_context(html_content="", theme: Theme | None = None):
     config = GlobalConfiguration.get_solo()
-    assert isinstance(config, GlobalConfiguration)
     theme = theme or config.get_default_theme()
 
     design_tokens = theme.design_token_values or {}

src/openforms/emails/validators.py

@@ -39,7 +39,6 @@ def __call__(self, value):
         from openforms.emails.utils import get_system_netloc_allowlist
 
         config = GlobalConfiguration.get_solo()
-        assert isinstance(config, GlobalConfiguration)
 
         allowlist = (
             get_system_netloc_allowlist() + config.email_template_netloc_allowlist

src/openforms/formio/components/custom.py

@@ -191,7 +191,6 @@ class Map(BasePlugin[Component]):
     def rewrite_for_request(component, request: Request):
         if component.get("useConfigDefaultMapSettings", False):
             config = GlobalConfiguration.get_solo()
-            assert isinstance(config, GlobalConfiguration)
             component["defaultZoom"] = config.form_map_default_zoom_level
             component.setdefault("initialCenter", {})
             component["initialCenter"]["lat"] = config.form_map_default_latitude

src/openforms/formio/components/vanilla.py

@@ -381,7 +381,6 @@ def rewrite_for_request(component: FileComponent, request: Request):
         # check if we need to apply "filePattern" modifications
         if component.get("useConfigFiletypes", False):
             config = GlobalConfiguration.get_solo()
-            assert isinstance(config, GlobalConfiguration)
             mimetypes: list[str] = config.form_upload_default_file_types  # type: ignore
             component["filePattern"] = ",".join(mimetypes)
             component["file"].update(

src/openforms/forms/admin/mixins.py

@@ -21,7 +21,6 @@ def render_change_form(
         self, request, context, add=False, change=False, form_url="", obj=None
     ):
         config = GlobalConfiguration.get_solo()
-        assert isinstance(config, GlobalConfiguration)
         context.update(
             {
                 "required_default": config.form_fields_required_default,