-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1090 from maykinmedia/fix/2199-yubin-problems
[#2199] Replaced django-yubin with django-mailer
- Loading branch information
Showing
12 changed files
with
114 additions
and
91 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -29,9 +29,7 @@ brotli==1.0.9 | |
| cbor2==5.6.2 | ||
| # via webauthn | ||
| celery==5.2.7 | ||
| # via | ||
| # django-yubin | ||
| # notifications-api-common | ||
| # via notifications-api-common | ||
| certifi==2023.11.17 | ||
| # via | ||
| # django-simple-certmanager | ||
|
|
@@ -106,6 +104,7 @@ django==4.2.10 | |
| # django-jsonform | ||
| # django-localflavor | ||
| # django-log-outgoing-requests | ||
| # django-mailer | ||
| # django-open-forms-client | ||
| # django-otp | ||
| # django-phonenumber-field | ||
|
|
@@ -206,6 +205,8 @@ django-localflavor==3.1 | |
| # via -r requirements/base.in | ||
| django-log-outgoing-requests==0.6.1 | ||
| # via -r requirements/base.in | ||
| django-mailer==2.3.1 | ||
| # via -r requirements/base.in | ||
| django-open-forms-client==0.3.0 | ||
| # via -r requirements/base.in | ||
| django-ordered-model==3.7.4 | ||
|
|
@@ -262,8 +263,6 @@ django-two-factor-auth[phonenumberslite,webauthn]==1.16.0 | |
| # via maykin-2fa | ||
| django-view-breadcrumbs==2.5.1 | ||
| # via -r requirements/base.in | ||
| django-yubin==2.0.3 | ||
| # via -r requirements/base.in | ||
| djangocms-admin-style==3.2.3 | ||
| # via django-cms | ||
| djangocms-attributes-field==2.1.0 | ||
|
|
@@ -350,6 +349,8 @@ jsonschema==4.1.0 | |
| # via drf-spectacular | ||
| kombu==5.2.4 | ||
| # via celery | ||
| lockfile==0.12.2 | ||
| # via django-mailer | ||
| lxml==4.9.1 | ||
| # via | ||
| # django-digid-eherkenning | ||
|
|
@@ -359,8 +360,6 @@ lxml==4.9.1 | |
| # xmlsec | ||
| mail-editor @ git+https://github.com/maykinmedia/[email protected] | ||
| # via -r requirements/base.in | ||
| mail-parser==3.15.0 | ||
| # via django-yubin | ||
| markdown==3.3.6 | ||
| # via -r requirements/base.in | ||
| markuppy==1.14 | ||
|
|
@@ -443,7 +442,6 @@ pytz==2021.3 | |
| # via | ||
| # -r requirements/base.in | ||
| # celery | ||
| # django-yubin | ||
| # djangorestframework | ||
| pyyaml==6.0 | ||
| # via | ||
|
|
@@ -471,8 +469,6 @@ requests==2.31.0 | |
| # zgw-consumers | ||
| sentry-sdk==1.38.0 | ||
| # via -r requirements/base.in | ||
| simplejson==3.18.0 | ||
| # via mail-parser | ||
| six==1.16.0 | ||
| # via | ||
| # click-repl | ||
|
|
@@ -481,7 +477,6 @@ six==1.16.0 | |
| # furl | ||
| # html5lib | ||
| # isodate | ||
| # mail-parser | ||
| # orderedmultidict | ||
| # python-dateutil | ||
| # qrcode | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -67,7 +67,6 @@ celery==5.2.7 | |
| # via | ||
| # -c requirements/base.txt | ||
| # -r requirements/base.txt | ||
| # django-yubin | ||
| # notifications-api-common | ||
| certifi==2023.11.17 | ||
| # via | ||
|
|
@@ -182,6 +181,7 @@ django==4.2.10 | |
| # django-jsonform | ||
| # django-localflavor | ||
| # django-log-outgoing-requests | ||
| # django-mailer | ||
| # django-open-forms-client | ||
| # django-otp | ||
| # django-phonenumber-field | ||
|
|
@@ -338,6 +338,10 @@ django-log-outgoing-requests==0.6.1 | |
| # via | ||
| # -c requirements/base.txt | ||
| # -r requirements/base.txt | ||
| django-mailer==2.3.1 | ||
| # via | ||
| # -c requirements/base.txt | ||
| # -r requirements/base.txt | ||
| django-open-forms-client==0.3.0 | ||
| # via | ||
| # -c requirements/base.txt | ||
|
|
@@ -437,10 +441,6 @@ django-view-breadcrumbs==2.5.1 | |
| # -r requirements/base.txt | ||
| django-webtest==1.9.11 | ||
| # via -r requirements/test-tools.in | ||
| django-yubin==2.0.3 | ||
| # via | ||
| # -c requirements/base.txt | ||
| # -r requirements/base.txt | ||
| djangocms-admin-style==3.2.3 | ||
| # via | ||
| # -c requirements/base.txt | ||
|
|
@@ -616,6 +616,11 @@ kombu==5.2.4 | |
| # celery | ||
| lazy-object-proxy==1.6.0 | ||
| # via astroid | ||
| lockfile==0.12.2 | ||
| # via | ||
| # -c requirements/base.txt | ||
| # -r requirements/base.txt | ||
| # django-mailer | ||
| lxml==4.9.1 | ||
| # via | ||
| # -c requirements/base.txt | ||
|
|
@@ -630,11 +635,6 @@ mail-editor @ git+https://github.com/maykinmedia/[email protected] | |
| # via | ||
| # -c requirements/base.txt | ||
| # -r requirements/base.txt | ||
| mail-parser==3.15.0 | ||
| # via | ||
| # -c requirements/base.txt | ||
| # -r requirements/base.txt | ||
| # django-yubin | ||
| markdown==3.3.6 | ||
| # via | ||
| # -c requirements/base.txt | ||
|
|
@@ -816,7 +816,6 @@ pytz==2021.3 | |
| # -c requirements/base.txt | ||
| # -r requirements/base.txt | ||
| # celery | ||
| # django-yubin | ||
| # djangorestframework | ||
| pyyaml==6.0 | ||
| # via | ||
|
|
@@ -861,11 +860,6 @@ sentry-sdk==1.38.0 | |
| # via | ||
| # -c requirements/base.txt | ||
| # -r requirements/base.txt | ||
| simplejson==3.18.0 | ||
| # via | ||
| # -c requirements/base.txt | ||
| # -r requirements/base.txt | ||
| # mail-parser | ||
| six==1.16.0 | ||
| # via | ||
| # -c requirements/base.txt | ||
|
|
@@ -876,7 +870,6 @@ six==1.16.0 | |
| # furl | ||
| # html5lib | ||
| # isodate | ||
| # mail-parser | ||
| # orderedmultidict | ||
| # python-dateutil | ||
| # qrcode | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -90,7 +90,6 @@ celery==5.2.7 | |
| # via | ||
| # -c requirements/ci.txt | ||
| # -r requirements/ci.txt | ||
| # django-yubin | ||
| # notifications-api-common | ||
| certifi==2023.11.17 | ||
| # via | ||
|
|
@@ -220,6 +219,7 @@ django==4.2.10 | |
| # django-jsonform | ||
| # django-localflavor | ||
| # django-log-outgoing-requests | ||
| # django-mailer | ||
| # django-open-forms-client | ||
| # django-otp | ||
| # django-phonenumber-field | ||
|
|
@@ -381,6 +381,10 @@ django-log-outgoing-requests==0.6.1 | |
| # via | ||
| # -c requirements/ci.txt | ||
| # -r requirements/ci.txt | ||
| django-mailer==2.3.1 | ||
| # via | ||
| # -c requirements/ci.txt | ||
| # -r requirements/ci.txt | ||
| django-open-forms-client==0.3.0 | ||
| # via | ||
| # -c requirements/ci.txt | ||
|
|
@@ -484,10 +488,6 @@ django-webtest==1.9.11 | |
| # via | ||
| # -c requirements/ci.txt | ||
| # -r requirements/ci.txt | ||
| django-yubin==2.0.3 | ||
| # via | ||
| # -c requirements/ci.txt | ||
| # -r requirements/ci.txt | ||
| djangocms-admin-style==3.2.3 | ||
| # via | ||
| # -c requirements/ci.txt | ||
|
|
@@ -710,6 +710,11 @@ lazy-object-proxy==1.6.0 | |
| # -c requirements/ci.txt | ||
| # -r requirements/ci.txt | ||
| # astroid | ||
| lockfile==0.12.2 | ||
| # via | ||
| # -c requirements/ci.txt | ||
| # -r requirements/ci.txt | ||
| # django-mailer | ||
| locust==2.20.0 | ||
| # via -r requirements/dev.in | ||
| lxml==4.9.1 | ||
|
|
@@ -726,11 +731,6 @@ mail-editor @ git+https://github.com/maykinmedia/[email protected] | |
| # via | ||
| # -c requirements/ci.txt | ||
| # -r requirements/ci.txt | ||
| mail-parser==3.15.0 | ||
| # via | ||
| # -c requirements/ci.txt | ||
| # -r requirements/ci.txt | ||
| # django-yubin | ||
| markdown==3.3.6 | ||
| # via | ||
| # -c requirements/ci.txt | ||
|
|
@@ -952,7 +952,6 @@ pytz==2021.3 | |
| # -r requirements/ci.txt | ||
| # babel | ||
| # celery | ||
| # django-yubin | ||
| # djangorestframework | ||
| pyyaml==6.0 | ||
| # via | ||
|
|
@@ -1006,11 +1005,6 @@ sentry-sdk==1.38.0 | |
| # via | ||
| # -c requirements/ci.txt | ||
| # -r requirements/ci.txt | ||
| simplejson==3.18.0 | ||
| # via | ||
| # -c requirements/ci.txt | ||
| # -r requirements/ci.txt | ||
| # mail-parser | ||
| six==1.16.0 | ||
| # via | ||
| # -c requirements/ci.txt | ||
|
|
@@ -1022,7 +1016,6 @@ six==1.16.0 | |
| # geventhttpclient | ||
| # html5lib | ||
| # isodate | ||
| # mail-parser | ||
| # orderedmultidict | ||
| # python-dateutil | ||
| # qrcode | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -194,7 +194,7 @@ | |
| "sessionprofile", | ||
| "openformsclient", | ||
| "django_htmx", | ||
| "django_yubin", | ||
| "mailer", | ||
| "log_outgoing_requests", | ||
| "formtools", | ||
| # Project applications. | ||
|
|
@@ -340,7 +340,9 @@ | |
|
|
||
| DEFAULT_FROM_EMAIL = config("DEFAULT_FROM_EMAIL", default="[email protected]") | ||
|
|
||
| EMAIL_BACKEND = "django_yubin.smtp_queue.EmailBackend" | ||
|
|
||
| EMAIL_BACKEND = "mailer.backend.DbBackend" | ||
| MAILER_EMAIL_BACKEND = "django.core.mail.backends.smtp.EmailBackend" | ||
|
|
||
| # | ||
| # LOGGING | ||
|
|
||
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.