From 74444c3a1086f7cc38439a83672ced5c1b83952e Mon Sep 17 00:00:00 2001
From: Brian Helba <brian.helba@kitware.com>
Date: Tue, 29 Sep 2020 21:13:46 -0400
Subject: [PATCH] Unpin Celery and upgrade to v5

---
 {{ cookiecutter.project_slug }}/Procfile                    | 2 +-
 {{ cookiecutter.project_slug }}/README.md                   | 2 +-
 {{ cookiecutter.project_slug }}/docker-compose.override.yml | 5 +++--
 {{ cookiecutter.project_slug }}/setup.py                    | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/{{ cookiecutter.project_slug }}/Procfile b/{{ cookiecutter.project_slug }}/Procfile
index 1e486e9..cd918a7 100644
--- a/{{ cookiecutter.project_slug }}/Procfile	
+++ b/{{ cookiecutter.project_slug }}/Procfile	
@@ -1,3 +1,3 @@
 release: ./manage.py migrate
 web: gunicorn --bind 0.0.0.0:$PORT {{ cookiecutter.pkg_name }}.wsgi
-worker: REMAP_SIGTERM=SIGQUIT celery worker --app {{ cookiecutter.pkg_name }}.celery --loglevel info --without-heartbeat
+worker: REMAP_SIGTERM=SIGQUIT celery --app {{ cookiecutter.pkg_name }}.celery worker --loglevel INFO --without-heartbeat
diff --git a/{{ cookiecutter.project_slug }}/README.md b/{{ cookiecutter.project_slug }}/README.md
index 3281f2b..c9db193 100644
--- a/{{ cookiecutter.project_slug }}/README.md	
+++ b/{{ cookiecutter.project_slug }}/README.md	
@@ -42,7 +42,7 @@ but allows developers to run Python code on their native system.
    2. `./manage.py runserver`
 3. Run in a separate terminal:
    1. `source ./dev/source-native-env.sh`
-   2. `celery worker --app {{ cookiecutter.pkg_name }}.celery --loglevel info --without-heartbeat`
+   2. `celery --app {{ cookiecutter.pkg_name }}.celery worker --loglevel INFO --without-heartbeat`
 4. When finished, run `docker-compose stop`
 
 ## Remap Service Ports (optional)
diff --git a/{{ cookiecutter.project_slug }}/docker-compose.override.yml b/{{ cookiecutter.project_slug }}/docker-compose.override.yml
index 91d5646..e07a2ad 100644
--- a/{{ cookiecutter.project_slug }}/docker-compose.override.yml	
+++ b/{{ cookiecutter.project_slug }}/docker-compose.override.yml	
@@ -22,9 +22,10 @@ services:
       context: .
       dockerfile: ./dev/django.Dockerfile
     command: [
-      "celery", "worker",
+      "celery",
       "--app", "{{ cookiecutter.pkg_name }}.celery",
-      "--loglevel", "info",
+      "worker",
+      "--loglevel", "INFO",
       "--without-heartbeat"
     ]
     # Docker Compose does not set the TTY width, which causes Celery errors
diff --git a/{{ cookiecutter.project_slug }}/setup.py b/{{ cookiecutter.project_slug }}/setup.py
index 401bd6e..f2765d7 100644
--- a/{{ cookiecutter.project_slug }}/setup.py	
+++ b/{{ cookiecutter.project_slug }}/setup.py	
@@ -35,7 +35,7 @@
     python_requires='>=3.8',
     packages=find_packages(),
     install_requires=[
-        'celery<5',
+        'celery',
         'django',
         'django-admin-display',
         'django-allauth',