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) diff --git a/requirements.in b/requirements.in index fca38bf59b..2a0c50e4b7 100644 --- a/requirements.in +++ b/requirements.in @@ -5,11 +5,11 @@ 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 -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..d4a67afded 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,7 +153,7 @@ 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 # via -r requirements.in @@ -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