From 3495780ba91f6a73115fb8ecdf025b04157c63d1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 12 Dec 2024 18:15:42 +0000
Subject: [PATCH 1/3] Bump celery from 5.2.7 to 5.4.0

Bumps [celery](https://github.com/celery/celery) from 5.2.7 to 5.4.0.
- [Release notes](https://github.com/celery/celery/releases)
- [Changelog](https://github.com/celery/celery/blob/main/Changelog.rst)
- [Commits](https://github.com/celery/celery/compare/v5.2.7...v5.4.0)

---
updated-dependencies:
- dependency-name: celery
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 requirements.in  |  2 +-
 requirements.txt | 16 ++++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/requirements.in b/requirements.in
index fca38bf59b..824e25657b 100644
--- a/requirements.in
+++ b/requirements.in
@@ -9,7 +9,7 @@ le-utils==0.2.5
 gunicorn==23.0.0
 django-postmark==0.1.6
 jsonfield==3.1.0
-celery==5.2.7
+celery==5.4.0
 redis
 python-postmark==0.6.0
 Django==3.2.24
diff --git a/requirements.txt b/requirements.txt
index cf3527a5ca..5dfdcd2457 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -14,7 +14,7 @@ attrs==23.1.0
     # via jsonschema
 backoff==2.2.1
     # via -r requirements.in
-billiard==3.6.4.0
+billiard==4.2.1
     # via celery
 boto3==1.17.75
     # via django-s3-storage
@@ -24,7 +24,7 @@ botocore==1.20.75
     #   s3transfer
 cachetools==4.2.2
     # via google-auth
-celery==5.2.7
+celery==5.4.0
     # via
     #   -r requirements.in
     #   django-celery-results
@@ -153,9 +153,9 @@ jsonfield==3.1.0
     # via -r requirements.in
 jsonschema==4.17.3
     # via -r requirements.in
-kombu==5.2.4
+kombu==5.4.2
     # via celery
-le-utils==0.2.7
+le-utils==0.2.5
     # via -r requirements.in
 packaging==24.0
     # via
@@ -198,11 +198,11 @@ python-dateutil==2.8.2
     # via
     #   -r requirements.in
     #   botocore
+    #   celery
 python-postmark==0.6.0
     # via -r requirements.in
 pytz==2022.1
     # via
-    #   celery
     #   django
     #   django-postmark
     #   google-api-core
@@ -232,12 +232,16 @@ six==1.16.0
     #   python-dateutil
 sqlparse==0.4.1
     # via django
+tzdata==2024.2
+    # via
+    #   celery
+    #   kombu
 urllib3==1.26.18
     # via
     #   botocore
     #   requests
     #   sentry-sdk
-vine==5.0.0
+vine==5.1.0
     # via
     #   amqp
     #   celery

From eac2bc401f9acad7e1984cc402a167e8a5c9f517 Mon Sep 17 00:00:00 2001
From: Blaine Jester <blainesworld@gmail.com>
Date: Thu, 12 Dec 2024 10:56:25 -0800
Subject: [PATCH 2/3] Fix le-utils regression not persisted in requirements.in

---
 requirements.in  | 2 +-
 requirements.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.in b/requirements.in
index 824e25657b..2a0c50e4b7 100644
--- a/requirements.in
+++ b/requirements.in
@@ -5,7 +5,7 @@ djangorestframework==3.15.1
 psycopg2-binary==2.9.5
 django-js-reverse==0.9.1
 django-registration==3.4
-le-utils==0.2.5
+le-utils==0.2.7
 gunicorn==23.0.0
 django-postmark==0.1.6
 jsonfield==3.1.0
diff --git a/requirements.txt b/requirements.txt
index 5dfdcd2457..d4a67afded 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -155,7 +155,7 @@ jsonschema==4.17.3
     # via -r requirements.in
 kombu==5.4.2
     # via celery
-le-utils==0.2.5
+le-utils==0.2.7
     # via -r requirements.in
 packaging==24.0
     # via

From d9abe3ccf14b28bdccc0e6c8378568a9a183b30c Mon Sep 17 00:00:00 2001
From: Blaine Jester <blainesworld@gmail.com>
Date: Thu, 12 Dec 2024 10:58:33 -0800
Subject: [PATCH 3/3] Address celery change requiring passing of custom
 task_cls to celery app init

---
 contentcuration/contentcuration/celery.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/contentcuration/contentcuration/celery.py b/contentcuration/contentcuration/celery.py
index d9186c2aed..9f74f2d2fc 100644
--- a/contentcuration/contentcuration/celery.py
+++ b/contentcuration/contentcuration/celery.py
@@ -3,9 +3,12 @@
 from django.conf import settings
 
 from contentcuration.utils.celery.app import CeleryApp
+from contentcuration.utils.celery.tasks import CeleryTask
 
 # set the default Django settings module for the 'celery' program.
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "contentcuration.settings")
 
-app = CeleryApp("contentcuration")
+# Celery update now requires that we must pass the task_cls to the CeleryApp, instead
+# of setting it as an attribute on our custom Celery class
+app = CeleryApp("contentcuration", task_cls=CeleryTask)
 app.config_from_object(settings.CELERY)