Merge c2d1368417 into 285e86bf71

cookiecutter.json

@@ -29,6 +29,7 @@
     "Sendgrid",
     "Brevo",
     "SparkPost",
+    "ZeptoMail",
     "Other SMTP"
   ],
   "use_async": "n",

docs/1-getting-started/project-generation-options.rst

@@ -92,7 +92,8 @@ mail_service:
     6. SendGrid_
     7. `Brevo (formerly SendinBlue)`_
     8. SparkPost_
-    9. `Other SMTP`_
+    9. ZeptoMail_
+    10. `Other SMTP`_
 
 use_async:
     Indicates whether the project should use web sockets with Uvicorn + Gunicorn.
@@ -175,6 +176,7 @@ debug:
 .. _SendGrid: https://sendgrid.com
 .. _Brevo (formerly SendinBlue): https://www.brevo.com
 .. _SparkPost: https://www.sparkpost.com
+.. _ZeptoMail: https://www.zoho.com/zeptomail/
 .. _Other SMTP: https://anymail.readthedocs.io/en/stable/
 
 .. _Django Rest Framework: https://github.com/encode/django-rest-framework/

tests/test_cookiecutter_generation.py

@@ -76,6 +76,7 @@ SUPPORTED_COMBINATIONS = [
     {"cloud_provider": "None", "use_whitenoise": "y", "mail_service": "Sendgrid"},
     {"cloud_provider": "None", "use_whitenoise": "y", "mail_service": "Brevo"},
     {"cloud_provider": "None", "use_whitenoise": "y", "mail_service": "SparkPost"},
+    {"cloud_provider": "None", "use_whitenoise": "y", "mail_service": "ZeptoMail"},
     {"cloud_provider": "None", "use_whitenoise": "y", "mail_service": "Other SMTP"},
     # Note: cloud_provider=None AND use_whitenoise=n is not supported
     {"cloud_provider": "AWS", "mail_service": "Mailgun"},
@@ -94,6 +95,7 @@ SUPPORTED_COMBINATIONS = [
     {"cloud_provider": "GCP", "mail_service": "Sendgrid"},
     {"cloud_provider": "GCP", "mail_service": "Brevo"},
     {"cloud_provider": "GCP", "mail_service": "SparkPost"},
+    {"cloud_provider": "GCP", "mail_service": "ZeptoMail"},
     {"cloud_provider": "GCP", "mail_service": "Other SMTP"},
     {"cloud_provider": "Azure", "mail_service": "Mailgun"},
     {"cloud_provider": "Azure", "mail_service": "Mailjet"},
@@ -102,6 +104,7 @@ SUPPORTED_COMBINATIONS = [
     {"cloud_provider": "Azure", "mail_service": "Sendgrid"},
     {"cloud_provider": "Azure", "mail_service": "Brevo"},
     {"cloud_provider": "Azure", "mail_service": "SparkPost"},
+    {"cloud_provider": "Azure", "mail_service": "ZeptoMail"},
     {"cloud_provider": "Azure", "mail_service": "Other SMTP"},
     # Note: cloud_providers GCP, Azure, and None
     # with mail_service Amazon SES is not supported

{{cookiecutter.project_slug}}/.envs/.production/.django

@@ -32,6 +32,9 @@ SENDGRID_MERGE_FIELD_FORMAT=None
 BREVO_API_KEY=
 {% elif cookiecutter.mail_service == 'SparkPost' %}
 SPARKPOST_API_KEY=
+{% elif cookiecutter.mail_service == 'ZeptoMail' %}
+ZOHO_ZEPTOMAIL_API_KEY_TOKEN=
+ZOHO_ZEPTOMAIL_HOSTED_REGION=zeptomail.zoho.com
 {% endif %}
 {% if cookiecutter.cloud_provider == 'AWS' %}
 # AWS

{{cookiecutter.project_slug}}/config/settings/production.py

@@ -290,6 +290,12 @@ ANYMAIL = {
     "SPARKPOST_API_KEY": env("SPARKPOST_API_KEY"),
     "SPARKPOST_API_URL": env("SPARKPOST_API_URL", default="https://api.sparkpost.com/api/v1"),
 }
+{%- elif cookiecutter.mail_service == 'ZeptoMail' %}
+# https://www.zoho.com/zeptomail/django-integration.html
+EMAIL_BACKEND = "zoho_zeptomail.backend.zeptomail_backend.ZohoZeptoMailEmailBackend"
+ZOHO_ZEPTOMAIL_API_KEY_TOKEN = env("ZOHO_ZEPTOMAIL_API_KEY_TOKEN")
+ZOHO_ZEPTOMAIL_HOSTED_REGION = env("ZOHO_ZEPTOMAIL_HOSTED_REGION")
+ANYMAIL = {}
 {%- elif cookiecutter.mail_service == 'Other SMTP' %}
 # https://anymail.readthedocs.io/en/stable/esps
 EMAIL_BACKEND = "django.core.mail.backends.smtp.EmailBackend"

{{cookiecutter.project_slug}}/requirements/production.txt

@@ -39,6 +39,8 @@ django-anymail[sendgrid]==12.0  # https://github.com/anymail/django-anymail
 django-anymail[brevo]==12.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SparkPost' %}
 django-anymail[sparkpost]==12.0  # https://github.com/anymail/django-anymail
+{%- elif cookiecutter.mail_service == 'ZeptoMail' %}
+django-zoho-zeptomail==0.0.3   # https://www.zoho.com/zeptomail/django-integration.html
 {%- elif cookiecutter.mail_service == 'Other SMTP' %}
 django-anymail==12.0  # https://github.com/anymail/django-anymail
 {%- endif %}