[#939] Rebase and resolve conflicts

requirements/base.in

@@ -35,7 +35,6 @@ django-view-breadcrumbs
 markdown
 django_better_admin_arrayfield
 humanfriendly
-# mail-editor
 git+https://github.com/maykinmedia/[email protected]#egg=mail-editor
 fontawesomefree
 django-timeline-logger

requirements/base.txt

@@ -354,11 +354,7 @@ lxml==4.9.1
     #   maykin-python3-saml
     #   svglib
     #   xmlsec
-<<<<<<< HEAD
 mail-editor @ git+https://github.com/maykinmedia/[email protected]
-=======
-mail-editor @ git+https://github.com/maykinmedia/mail-editor.git@66293245ca4b4ea9f05e396a144d6f9a7aedf3b1
->>>>>>> 83677aa4 ([#939] Update mail-editor)
     # via -r requirements/base.in
 mail-parser==3.15.0
     # via django-yubin
@@ -493,7 +489,9 @@ sqlparse==0.4.4
 svglib==1.5.1
     # via easy-thumbnails
 tablib[html,ods,xls,xlsx,yaml]==3.1.0
-    # via django-import-export
+    # via
+    #   django-import-export
+    #   tablib
 tinycss2==1.1.1
     # via
     #   -r requirements/base.in

requirements/ci.txt

@@ -426,6 +426,7 @@ django-two-factor-auth[phonenumberslite,webauthn]==1.16.0
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
+    #   django-two-factor-auth
     #   maykin-2fa
 django-view-breadcrumbs==2.5.1
     # via
@@ -487,6 +488,7 @@ easy-thumbnails[svg]==2.8.5
     #   -r requirements/base.txt
     #   django-filer
     #   djangocms-picture
+    #   easy-thumbnails
 ecs-logging==2.1.0
     # via
     #   -c requirements/base.txt
@@ -526,6 +528,7 @@ fonttools[woff]==4.43.0
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
+    #   fonttools
     #   weasyprint
 freezegun==1.1.0
     # via -r requirements/test-tools.in
@@ -616,11 +619,7 @@ lxml==4.9.1
     #   pyquery
     #   svglib
     #   xmlsec
-<<<<<<< HEAD
 mail-editor @ git+https://github.com/maykinmedia/[email protected]
-=======
-mail-editor @ git+https://github.com/maykinmedia/mail-editor.git@66293245ca4b4ea9f05e396a144d6f9a7aedf3b1
->>>>>>> 83677aa4 ([#939] Update mail-editor)
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
@@ -896,6 +895,7 @@ tablib[html,ods,xls,xlsx,yaml]==3.1.0
     #   -c requirements/base.txt
     #   -r requirements/base.txt
     #   django-import-export
+    #   tablib
 tblib==1.7.0
     # via -r requirements/test-tools.in
 text-unidecode==1.3

requirements/dev.txt

@@ -471,6 +471,7 @@ django-two-factor-auth[phonenumberslite,webauthn]==1.16.0
     # via
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
+    #   django-two-factor-auth
     #   maykin-2fa
 django-view-breadcrumbs==2.5.1
     # via
@@ -538,6 +539,7 @@ easy-thumbnails[svg]==2.8.5
     #   -r requirements/ci.txt
     #   django-filer
     #   djangocms-picture
+    #   easy-thumbnails
 ecs-logging==2.1.0
     # via
     #   -c requirements/ci.txt
@@ -593,6 +595,7 @@ fonttools[woff]==4.43.0
     # via
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
+    #   fonttools
     #   weasyprint
 freezegun==1.1.0
     # via
@@ -712,11 +715,7 @@ lxml==4.9.1
     #   pyquery
     #   svglib
     #   xmlsec
-<<<<<<< HEAD
 mail-editor @ git+https://github.com/maykinmedia/[email protected]
-=======
-mail-editor @ git+https://github.com/maykinmedia/mail-editor.git@66293245ca4b4ea9f05e396a144d6f9a7aedf3b1
->>>>>>> 83677aa4 ([#939] Update mail-editor)
     # via
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
@@ -1071,6 +1070,7 @@ tablib[html,ods,xls,xlsx,yaml]==3.1.0
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
     #   django-import-export
+    #   tablib
 tblib==1.7.0
     # via
     #   -c requirements/ci.txt

src/open_inwoner/accounts/tests/test_commands.py

@@ -17,13 +17,13 @@ def test_delete_expired_invitations(frozen_time, self):
             last_name="Eenzaameiland",
         )
 
-        invite1 = InviteFactory.create(inviter=user)
-        invite2 = InviteFactory.create(inviter=user)
-        invite3 = InviteFactory.create()
+        invite1 = InviteFactory.create(inviter=user, invitee_first_name="Harry")
+        invite2 = InviteFactory.create(inviter=user, invitee_first_name="Sally")
+        invite3 = InviteFactory.create(invitee_first_name="Joe")
 
         frozen_time.move_to("2023-10-01")
 
-        invite4 = InviteFactory.create()
+        invite4 = InviteFactory.create(invitee_first_name="Jane")
 
         frozen_time.move_to("2023-10-27")
 

src/open_inwoner/configurations/migrations/0063_merge_20240216_1622.py

@@ -0,0 +1,13 @@
+# Generated by Django 4.2.10 on 2024-02-16 15:22
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("configurations", "0062_merge_20240214_1644"),
+        ("configurations", "0062_merge_20240215_1501"),
+    ]
+
+    operations = []

src/open_inwoner/haalcentraal/tests/test_signal.py

@@ -1,16 +1,10 @@
-import logging
-from unittest.mock import patch
-
 from django.test import TestCase, override_settings
-from django.utils.translation import gettext as _
 
 import requests_mock
 from freezegun import freeze_time
-from timeline_logger.models import TimelineLog
 
 from open_inwoner.accounts.choices import LoginTypeChoices
 from open_inwoner.accounts.tests.factories import UserFactory
-from open_inwoner.utils.logentry import LOG_ACTIONS
 
 from ...utils.test import ClearCachesMixin
 from ..models import HaalCentraalConfig

src/open_inwoner/pdc/models/product.py

@@ -5,7 +5,6 @@
 from django.contrib.postgres.fields import ArrayField
 from django.db import models
 from django.urls import reverse
-from django.utils.html import strip_tags
 from django.utils.translation import gettext_lazy as _
 
 from filer.fields.file import FilerFileField