From 5422b66fe507d17c986cdd041222ca3447729098 Mon Sep 17 00:00:00 2001
From: Vadim Stepanov <vadimkerr@gmail.com>
Date: Wed, 6 Nov 2024 15:27:41 +0000
Subject: [PATCH] Upgrade django-anymail (#5236)

# What this PR does

* bump `django-anymail` to 12.0
* remove `django-amazon-ses` and use `django-anymail[amazon-ses]`
instead (as per [the
docs](https://anymail.dev/en/stable/esps/amazon_ses/#installation))

## Checklist

- [x] Unit, integration, and e2e (if applicable) tests updated
- [x] Documentation added (or `pr:no public docs` PR label added if not
required)
- [x] Added the relevant release notes label (see labels prefixed w/
`release:`). These labels dictate how your PR will
    show up in the autogenerated release notes.
---
 engine/requirements-dev.txt | 10 +++++++---
 engine/requirements.in      |  3 +--
 engine/requirements.txt     | 17 +++++++++--------
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/engine/requirements-dev.txt b/engine/requirements-dev.txt
index 6a7b88bf..16256b89 100644
--- a/engine/requirements-dev.txt
+++ b/engine/requirements-dev.txt
@@ -25,14 +25,14 @@ django==4.2.16
     #   django-stubs-ext
 django-filter-stubs==0.1.3
     # via -r requirements-dev.in
-django-stubs[compatible-mypy]==4.2.2
+django-stubs==4.2.2
     # via
     #   -r requirements-dev.in
     #   django-filter-stubs
     #   djangorestframework-stubs
 django-stubs-ext==4.2.7
     # via django-stubs
-djangorestframework-stubs[compatible-mypy]==3.14.2
+djangorestframework-stubs==3.14.2
     # via
     #   -r requirements-dev.in
     #   django-filter-stubs
@@ -96,7 +96,7 @@ pytest-django==4.8.0
     # via -r requirements-dev.in
 pytest-factoryboy==2.7.0
     # via -r requirements-dev.in
-pytest-xdist[psutil]==3.6.1
+pytest-xdist==3.6.1
     # via -r requirements-dev.in
 python-dateutil==2.8.2
     # via
@@ -110,6 +110,10 @@ requests==2.32.3
     # via
     #   -c requirements.txt
     #   djangorestframework-stubs
+setuptools==75.3.0
+    # via
+    #   -c requirements.txt
+    #   nodeenv
 six==1.16.0
     # via
     #   -c requirements.txt
diff --git a/engine/requirements.in b/engine/requirements.in
index 5df75613..4ce7179e 100644
--- a/engine/requirements.in
+++ b/engine/requirements.in
@@ -4,8 +4,7 @@ celery[redis]==5.3.1
 cryptography==43.0.1
 django==4.2.16
 django-add-default-value==0.10.0
-django-amazon-ses==4.0.1
-django-anymail==11.1
+django-anymail[amazon-ses]==12.0
 django-cors-headers==3.7.0
 # pyroscope-io==0.8.1
 django-dbconn-retry==0.1.7
diff --git a/engine/requirements.txt b/engine/requirements.txt
index c38c3888..fc1376da 100644
--- a/engine/requirements.txt
+++ b/engine/requirements.txt
@@ -1,5 +1,5 @@
 # This file was autogenerated by uv via the following command:
-#    uv pip compile engine/requirements.in -o engine/requirements.txt
+#    uv pip compile requirements.in -o requirements.txt
 amqp==5.2.0
     # via kombu
 appdirs==1.4.4
@@ -23,7 +23,7 @@ billiard==4.2.0
 blinker==1.7.0
     # via flask
 boto3==1.34.41
-    # via django-amazon-ses
+    # via django-anymail
 botocore==1.34.41
     # via
     #   boto3
@@ -34,7 +34,7 @@ cachetools==4.2.2
     # via
     #   google-auth
     #   python-telegram-bot
-celery[redis]==5.3.1
+celery==5.3.1
     # via -r requirements.in
 certifi==2024.7.4
     # via
@@ -79,7 +79,6 @@ django==4.2.16
     # via
     #   -r requirements.in
     #   django-add-default-value
-    #   django-amazon-ses
     #   django-anymail
     #   django-cors-headers
     #   django-debug-toolbar
@@ -99,9 +98,7 @@ django==4.2.16
     #   social-auth-app-django
 django-add-default-value==0.10.0
     # via -r requirements.in
-django-amazon-ses==4.0.1
-    # via -r requirements.in
-django-anymail==11.1
+django-anymail==12.0
     # via -r requirements.in
 django-cors-headers==3.7.0
     # via -r requirements.in
@@ -158,7 +155,7 @@ firebase-admin==5.4.0
     # via fcm-django
 flask==3.0.2
     # via slack-export-viewer
-google-api-core[grpc]==2.17.0
+google-api-core==2.17.0
     # via
     #   firebase-admin
     #   google-api-python-client
@@ -418,6 +415,10 @@ rsa==4.9
     # via google-auth
 s3transfer==0.10.0
     # via boto3
+setuptools==75.3.0
+    # via
+    #   apscheduler
+    #   opentelemetry-instrumentation
 six==1.16.0
     # via
     #   apscheduler