Skip to content

Commit 12f2032

Browse files
committed
Scaleway: cleanup and enable integration tests
- Fix accidental ESP duplication in pyproject.toml keywords - Alphabetize ESP names in pyproject.toml, tox.ini - Enable scaleway in integration-test.yml
1 parent 8be0aaa commit 12f2032

File tree

3 files changed

+15
-14
lines changed

3 files changed

+15
-14
lines changed

.github/workflows/integration-test.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ jobs:
4848
- { tox: django52-py313-postal, python: "3.13" }
4949
- { tox: django52-py313-postmark, python: "3.13" }
5050
- { tox: django52-py313-resend, python: "3.13" }
51+
- { tox: django52-py313-scaleway, python: "3.13" }
5152
# - { tox: django52-py313-sendgrid, python: "3.13" }
5253
- { tox: django52-py313-sparkpost, python: "3.13" }
5354
- { tox: django52-py313-unisender_go, python: "3.13" }
@@ -95,6 +96,9 @@ jobs:
9596
ANYMAIL_TEST_POSTMARK_TEMPLATE_ID: ${{ secrets.ANYMAIL_TEST_POSTMARK_TEMPLATE_ID }}
9697
ANYMAIL_TEST_RESEND_API_KEY: ${{ secrets.ANYMAIL_TEST_RESEND_API_KEY }}
9798
ANYMAIL_TEST_RESEND_DOMAIN: ${{ secrets.ANYMAIL_TEST_RESEND_DOMAIN }}
99+
ANYMAIL_TEST_SCALEWAY_DOMAIN: ${{ vars.ANYMAIL_TEST_SCALEWAY_DOMAIN }}
100+
ANYMAIL_TEST_SCALEWAY_PROJECT_ID: ${{ secrets.ANYMAIL_TEST_SCALEWAY_PROJECT_ID }}
101+
ANYMAIL_TEST_SCALEWAY_SECRET_KEY: ${{ secrets.ANYMAIL_TEST_SCALEWAY_SECRET_KEY }}
98102
ANYMAIL_TEST_SENDGRID_API_KEY: ${{ secrets.ANYMAIL_TEST_SENDGRID_API_KEY }}
99103
ANYMAIL_TEST_SENDGRID_DOMAIN: ${{ vars.ANYMAIL_TEST_SENDGRID_DOMAIN }}
100104
ANYMAIL_TEST_SENDGRID_TEMPLATE_ID: ${{ secrets.ANYMAIL_TEST_SENDGRID_TEMPLATE_ID }}

pyproject.toml

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ authors = [
1414
description = """\
1515
Django email backends and webhooks for Amazon SES, Brevo,
1616
MailerSend, Mailgun, Mailjet, Mandrill, Postal, Postmark, Resend,
17-
SendGrid, SparkPost, Unisender Go and Scaleway
17+
Scaleway TEM, SendGrid, SparkPost, and Unisender Go
1818
(EmailBackend, transactional email tracking and inbound email signals)\
1919
"""
2020
# readme: see tool.hatch.metadata.hooks.custom below
@@ -30,10 +30,7 @@ keywords = [
3030
"Postal",
3131
"Postmark", "ActiveCampaign",
3232
"Resend",
33-
"SendGrid", "Twilio",
34-
"SparkPost", "Bird",
35-
"Resend",
36-
"Scaleway",
33+
"Scaleway", "Scaleway TEM",
3734
"SendGrid", "Twilio",
3835
"SparkPost", "Bird",
3936
"Unisender Go",
@@ -81,6 +78,13 @@ mailersend = []
8178
mailgun = []
8279
mailjet = []
8380
mandrill = []
81+
postal = [
82+
# Postal requires cryptography for verifying webhooks.
83+
# Cryptography's wheels are broken on darwin-arm64 before Python 3.9,
84+
# and unbuildable on PyPy 3.8 due to PyO3 limitations. Since cpython 3.8
85+
# has also passed EOL, just require Python 3.9+ with Postal.
86+
"cryptography; python_version >= '3.9'"
87+
]
8488
postmark = []
8589
resend = ["svix"]
8690
scaleway = []
@@ -94,13 +98,6 @@ sendgrid = [
9498
sendinblue = []
9599
sparkpost = []
96100
unisender-go = []
97-
postal = [
98-
# Postal requires cryptography for verifying webhooks.
99-
# Cryptography's wheels are broken on darwin-arm64 before Python 3.9,
100-
# and unbuildable on PyPy 3.8 due to PyO3 limitations. Since cpython 3.8
101-
# has also passed EOL, just require Python 3.9+ with Postal.
102-
"cryptography; python_version >= '3.9'"
103-
]
104101

105102
[project.urls]
106103
Homepage = "https://github.com/anymail/django-anymail"

tox.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,10 @@ setenv =
6464
postal: ANYMAIL_ONLY_TEST=postal
6565
postmark: ANYMAIL_ONLY_TEST=postmark
6666
resend: ANYMAIL_ONLY_TEST=resend
67+
scaleway: ANYMAIL_ONLY_TEST=scaleway
6768
sendgrid: ANYMAIL_ONLY_TEST=sendgrid
68-
unisender_go: ANYMAIL_ONLY_TEST=unisender_go
6969
sparkpost: ANYMAIL_ONLY_TEST=sparkpost
70-
scaleway: ANYMAIL_ONLY_TEST=scaleway
70+
unisender_go: ANYMAIL_ONLY_TEST=unisender_go
7171
ignore_outcome =
7272
# CI that wants to handle errors itself can set TOX_OVERRIDE_IGNORE_OUTCOME=false
7373
djangoDev: {env:TOX_OVERRIDE_IGNORE_OUTCOME:true}

0 commit comments

Comments
 (0)