Skip to content

Commit 8c390ce

Browse files
alextremealextreme
authored
Merge pull request #1090 from maykinmedia/fix/2199-yubin-problems
[#2199] Replaced django-yubin with django-mailer
2 parents cd7160b + abb079c commit 8c390ce

File tree

12 files changed

+114
-91
lines changed

12 files changed

+114
-91
lines changed

‎requirements/base.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ mozilla-django-oidc-db
4444
django-open-forms-client
4545
django-htmx
4646
playwright
47-
django-yubin
47+
django-mailer
4848
django-image-cropping
4949
django-log-outgoing-requests
5050
xsdata

‎requirements/base.txt

+6-11
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,7 @@ brotli==1.0.9
2929
cbor2==5.6.2
3030
# via webauthn
3131
celery==5.2.7
32-
# via
33-
# django-yubin
34-
# notifications-api-common
32+
# via notifications-api-common
3533
certifi==2023.11.17
3634
# via
3735
# django-simple-certmanager
@@ -106,6 +104,7 @@ django==4.2.10
106104
# django-jsonform
107105
# django-localflavor
108106
# django-log-outgoing-requests
107+
# django-mailer
109108
# django-open-forms-client
110109
# django-otp
111110
# django-phonenumber-field
@@ -206,6 +205,8 @@ django-localflavor==3.1
206205
# via -r requirements/base.in
207206
django-log-outgoing-requests==0.6.1
208207
# via -r requirements/base.in
208+
django-mailer==2.3.1
209+
# via -r requirements/base.in
209210
django-open-forms-client==0.3.0
210211
# via -r requirements/base.in
211212
django-ordered-model==3.7.4
@@ -262,8 +263,6 @@ django-two-factor-auth[phonenumberslite,webauthn]==1.16.0
262263
# via maykin-2fa
263264
django-view-breadcrumbs==2.5.1
264265
# via -r requirements/base.in
265-
django-yubin==2.0.3
266-
# via -r requirements/base.in
267266
djangocms-admin-style==3.2.3
268267
# via django-cms
269268
djangocms-attributes-field==2.1.0
@@ -350,6 +349,8 @@ jsonschema==4.1.0
350349
# via drf-spectacular
351350
kombu==5.2.4
352351
# via celery
352+
lockfile==0.12.2
353+
# via django-mailer
353354
lxml==4.9.1
354355
# via
355356
# django-digid-eherkenning
@@ -359,8 +360,6 @@ lxml==4.9.1
359360
# xmlsec
360361
mail-editor @ git+https://github.com/maykinmedia/[email protected]
361362
# via -r requirements/base.in
362-
mail-parser==3.15.0
363-
# via django-yubin
364363
markdown==3.3.6
365364
# via -r requirements/base.in
366365
markuppy==1.14
@@ -443,7 +442,6 @@ pytz==2021.3
443442
# via
444443
# -r requirements/base.in
445444
# celery
446-
# django-yubin
447445
# djangorestframework
448446
pyyaml==6.0
449447
# via
@@ -471,8 +469,6 @@ requests==2.31.0
471469
# zgw-consumers
472470
sentry-sdk==1.38.0
473471
# via -r requirements/base.in
474-
simplejson==3.18.0
475-
# via mail-parser
476472
six==1.16.0
477473
# via
478474
# click-repl
@@ -481,7 +477,6 @@ six==1.16.0
481477
# furl
482478
# html5lib
483479
# isodate
484-
# mail-parser
485480
# orderedmultidict
486481
# python-dateutil
487482
# qrcode

‎requirements/ci.txt

+10-17
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ celery==5.2.7
6767
# via
6868
# -c requirements/base.txt
6969
# -r requirements/base.txt
70-
# django-yubin
7170
# notifications-api-common
7271
certifi==2023.11.17
7372
# via
@@ -182,6 +181,7 @@ django==4.2.10
182181
# django-jsonform
183182
# django-localflavor
184183
# django-log-outgoing-requests
184+
# django-mailer
185185
# django-open-forms-client
186186
# django-otp
187187
# django-phonenumber-field
@@ -338,6 +338,10 @@ django-log-outgoing-requests==0.6.1
338338
# via
339339
# -c requirements/base.txt
340340
# -r requirements/base.txt
341+
django-mailer==2.3.1
342+
# via
343+
# -c requirements/base.txt
344+
# -r requirements/base.txt
341345
django-open-forms-client==0.3.0
342346
# via
343347
# -c requirements/base.txt
@@ -437,10 +441,6 @@ django-view-breadcrumbs==2.5.1
437441
# -r requirements/base.txt
438442
django-webtest==1.9.11
439443
# via -r requirements/test-tools.in
440-
django-yubin==2.0.3
441-
# via
442-
# -c requirements/base.txt
443-
# -r requirements/base.txt
444444
djangocms-admin-style==3.2.3
445445
# via
446446
# -c requirements/base.txt
@@ -616,6 +616,11 @@ kombu==5.2.4
616616
# celery
617617
lazy-object-proxy==1.6.0
618618
# via astroid
619+
lockfile==0.12.2
620+
# via
621+
# -c requirements/base.txt
622+
# -r requirements/base.txt
623+
# django-mailer
619624
lxml==4.9.1
620625
# via
621626
# -c requirements/base.txt
@@ -630,11 +635,6 @@ mail-editor @ git+https://github.com/maykinmedia/[email protected]
630635
# via
631636
# -c requirements/base.txt
632637
# -r requirements/base.txt
633-
mail-parser==3.15.0
634-
# via
635-
# -c requirements/base.txt
636-
# -r requirements/base.txt
637-
# django-yubin
638638
markdown==3.3.6
639639
# via
640640
# -c requirements/base.txt
@@ -816,7 +816,6 @@ pytz==2021.3
816816
# -c requirements/base.txt
817817
# -r requirements/base.txt
818818
# celery
819-
# django-yubin
820819
# djangorestframework
821820
pyyaml==6.0
822821
# via
@@ -861,11 +860,6 @@ sentry-sdk==1.38.0
861860
# via
862861
# -c requirements/base.txt
863862
# -r requirements/base.txt
864-
simplejson==3.18.0
865-
# via
866-
# -c requirements/base.txt
867-
# -r requirements/base.txt
868-
# mail-parser
869863
six==1.16.0
870864
# via
871865
# -c requirements/base.txt
@@ -876,7 +870,6 @@ six==1.16.0
876870
# furl
877871
# html5lib
878872
# isodate
879-
# mail-parser
880873
# orderedmultidict
881874
# python-dateutil
882875
# qrcode

‎requirements/dev.txt

+10-17
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ celery==5.2.7
9090
# via
9191
# -c requirements/ci.txt
9292
# -r requirements/ci.txt
93-
# django-yubin
9493
# notifications-api-common
9594
certifi==2023.11.17
9695
# via
@@ -220,6 +219,7 @@ django==4.2.10
220219
# django-jsonform
221220
# django-localflavor
222221
# django-log-outgoing-requests
222+
# django-mailer
223223
# django-open-forms-client
224224
# django-otp
225225
# django-phonenumber-field
@@ -381,6 +381,10 @@ django-log-outgoing-requests==0.6.1
381381
# via
382382
# -c requirements/ci.txt
383383
# -r requirements/ci.txt
384+
django-mailer==2.3.1
385+
# via
386+
# -c requirements/ci.txt
387+
# -r requirements/ci.txt
384388
django-open-forms-client==0.3.0
385389
# via
386390
# -c requirements/ci.txt
@@ -484,10 +488,6 @@ django-webtest==1.9.11
484488
# via
485489
# -c requirements/ci.txt
486490
# -r requirements/ci.txt
487-
django-yubin==2.0.3
488-
# via
489-
# -c requirements/ci.txt
490-
# -r requirements/ci.txt
491491
djangocms-admin-style==3.2.3
492492
# via
493493
# -c requirements/ci.txt
@@ -710,6 +710,11 @@ lazy-object-proxy==1.6.0
710710
# -c requirements/ci.txt
711711
# -r requirements/ci.txt
712712
# astroid
713+
lockfile==0.12.2
714+
# via
715+
# -c requirements/ci.txt
716+
# -r requirements/ci.txt
717+
# django-mailer
713718
locust==2.20.0
714719
# via -r requirements/dev.in
715720
lxml==4.9.1
@@ -726,11 +731,6 @@ mail-editor @ git+https://github.com/maykinmedia/[email protected]
726731
# via
727732
# -c requirements/ci.txt
728733
# -r requirements/ci.txt
729-
mail-parser==3.15.0
730-
# via
731-
# -c requirements/ci.txt
732-
# -r requirements/ci.txt
733-
# django-yubin
734734
markdown==3.3.6
735735
# via
736736
# -c requirements/ci.txt
@@ -952,7 +952,6 @@ pytz==2021.3
952952
# -r requirements/ci.txt
953953
# babel
954954
# celery
955-
# django-yubin
956955
# djangorestframework
957956
pyyaml==6.0
958957
# via
@@ -1006,11 +1005,6 @@ sentry-sdk==1.38.0
10061005
# via
10071006
# -c requirements/ci.txt
10081007
# -r requirements/ci.txt
1009-
simplejson==3.18.0
1010-
# via
1011-
# -c requirements/ci.txt
1012-
# -r requirements/ci.txt
1013-
# mail-parser
10141008
six==1.16.0
10151009
# via
10161010
# -c requirements/ci.txt
@@ -1022,7 +1016,6 @@ six==1.16.0
10221016
# geventhttpclient
10231017
# html5lib
10241018
# isodate
1025-
# mail-parser
10261019
# orderedmultidict
10271020
# python-dateutil
10281021
# qrcode

‎src/open_inwoner/conf/base.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@
194194
"sessionprofile",
195195
"openformsclient",
196196
"django_htmx",
197-
"django_yubin",
197+
"mailer",
198198
"log_outgoing_requests",
199199
"formtools",
200200
# Project applications.
@@ -340,7 +340,9 @@
340340

341341
DEFAULT_FROM_EMAIL = config("DEFAULT_FROM_EMAIL", default="[email protected]")
342342

343-
EMAIL_BACKEND = "django_yubin.smtp_queue.EmailBackend"
343+
344+
EMAIL_BACKEND = "mailer.backend.DbBackend"
345+
MAILER_EMAIL_BACKEND = "django.core.mail.backends.smtp.EmailBackend"
344346

345347
#
346348
# LOGGING

‎src/open_inwoner/conf/fixtures/auth-groups.json

-1
This file was deleted.

0 commit comments

Comments
 (0)