From db09f07eb9ecfefebefe205deea6e1d4ef57ae12 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Tue, 27 Jul 2021 14:05:01 +0200 Subject: [PATCH 1/3] Update Celery to v5 --- {{cookiecutter.project_slug}}/requirements/base.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 94ab4485e..8d5531f45 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -17,10 +17,10 @@ redis==3.5.3 # https://github.com/andymccurdy/redis-py hiredis==2.0.0 # https://github.com/redis/hiredis-py {%- endif %} {%- if cookiecutter.use_celery == "y" %} -celery==4.4.6 # pyup: < 5.0,!=4.4.7 # https://github.com/celery/celery -django-celery-beat==2.2.0 # https://github.com/celery/django-celery-beat +celery==5.1.2 # pyup: < 6.0 # https://github.com/celery/celery +django-celery-beat==2.2.1 # https://github.com/celery/django-celery-beat {%- if cookiecutter.use_docker == 'y' %} -flower==0.9.7 # https://github.com/mher/flower +flower==1.0.0 # https://github.com/mher/flower {%- endif %} {%- endif %} {%- if cookiecutter.use_async == 'y' %} From 9cfb7646cb0bb1f5e89929ad3fbe922dd0825a38 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Fri, 3 Sep 2021 19:16:08 +0100 Subject: [PATCH 2/3] Update command line for Flower --- .../compose/local/django/celery/flower/start | 7 ++++--- .../compose/production/django/celery/flower/start | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/{{cookiecutter.project_slug}}/compose/local/django/celery/flower/start b/{{cookiecutter.project_slug}}/compose/local/django/celery/flower/start index 5bcaa8164..bd3c9f2fd 100644 --- a/{{cookiecutter.project_slug}}/compose/local/django/celery/flower/start +++ b/{{cookiecutter.project_slug}}/compose/local/django/celery/flower/start @@ -4,7 +4,8 @@ set -o errexit set -o nounset -celery flower \ - --app=config.celery_app \ - --broker="${CELERY_BROKER_URL}" \ +celery \ + -A config.celery_app \ + -b "${CELERY_BROKER_URL}" \ + flower \ --basic_auth="${CELERY_FLOWER_USER}:${CELERY_FLOWER_PASSWORD}" diff --git a/{{cookiecutter.project_slug}}/compose/production/django/celery/flower/start b/{{cookiecutter.project_slug}}/compose/production/django/celery/flower/start index 5bcaa8164..bd3c9f2fd 100644 --- a/{{cookiecutter.project_slug}}/compose/production/django/celery/flower/start +++ b/{{cookiecutter.project_slug}}/compose/production/django/celery/flower/start @@ -4,7 +4,8 @@ set -o errexit set -o nounset -celery flower \ - --app=config.celery_app \ - --broker="${CELERY_BROKER_URL}" \ +celery \ + -A config.celery_app \ + -b "${CELERY_BROKER_URL}" \ + flower \ --basic_auth="${CELERY_FLOWER_USER}:${CELERY_FLOWER_PASSWORD}" From d74bd51a64d5383a345f19191dc30520753f8187 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Fri, 3 Sep 2021 19:17:23 +0100 Subject: [PATCH 3/3] Update Celery command line on Heroku --- {{cookiecutter.project_slug}}/Procfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/Procfile b/{{cookiecutter.project_slug}}/Procfile index ddb5cd8a9..274108d14 100644 --- a/{{cookiecutter.project_slug}}/Procfile +++ b/{{cookiecutter.project_slug}}/Procfile @@ -5,6 +5,6 @@ web: gunicorn config.asgi:application -k uvicorn.workers.UvicornWorker web: gunicorn config.wsgi:application {%- endif %} {% if cookiecutter.use_celery == "y" -%} -worker: REMAP_SIGTERM=SIGQUIT celery worker --app=config.celery_app --loglevel=info -beat: REMAP_SIGTERM=SIGQUIT celery beat --app=config.celery_app --loglevel=info +worker: REMAP_SIGTERM=SIGQUIT celery -A config.celery_app worker --loglevel=info +beat: REMAP_SIGTERM=SIGQUIT celery -A config.celery_app beat --loglevel=info {%- endif %}