Merge pull request #1 from testdrivenio/feature/upgrade-celery-5

upgrade celery 5

Author: mjhea0

compose/local/django/celery/beat/start

@@ -4,4 +4,4 @@ set -o errexit
 set -o nounset
 
 rm -f './celerybeat.pid'
-celery beat -A django_celery_example -l info --scheduler django_celery_beat.schedulers:DatabaseScheduler
+celery -A django_celery_example beat -l info --scheduler django_celery_beat.schedulers:DatabaseScheduler

compose/local/django/celery/flower/start

@@ -13,6 +13,6 @@ until worker_ready; do
 done
 >&2 echo 'Celery workers is available'
 
-flower \
-    --app=django_celery_example \
-    --broker="${CELERY_BROKER}"
+celery -A django_celery_example  \
+    --broker="${CELERY_BROKER}" \
+    flower

compose/production/django/celery/flower/start

@@ -13,7 +13,8 @@ until worker_ready; do
 done
 >&2 echo 'Celery workers is available'
 
-exec flower --persistent=1 --db=/app/flower_db/flower.db \
-    --app=django_celery_example \
+celery -A django_celery_example \
     --broker="${CELERY_BROKER}" \
-    --basic_auth="${CELERY_FLOWER_USER}:${CELERY_FLOWER_PASSWORD}"
+    flower \
+    --basic_auth="${CELERY_FLOWER_USER}:${CELERY_FLOWER_PASSWORD}" \
+    --persistent=1 --db=/app/flower_db/flower.db  --state_save_interval=5000

docker-compose.prod.yml

@@ -112,6 +112,7 @@ services:
       - /var/run:/var/run:rw
       - /sys:/sys:ro
       - /var/lib/docker/:/var/lib/docker:ro
+      - /var/run/docker.sock:/var/run/docker.sock:ro
 
 volumes:
   postgres_data:

polls/management/commands/celery_worker.py

@@ -13,7 +13,7 @@ def restart_celery():
 
     subprocess.call(shlex.split(cmd))
     subprocess.call(shlex.split(
-        'celery worker -A django_celery_example --loglevel=info -Q high_priority,default')
+        'celery -A django_celery_example worker --loglevel=info -Q high_priority,default')
     )
 
 

polls/tests.py

@@ -36,10 +36,7 @@ class SubscribeViewTestCase2(TestCase):
     """
     @patch('polls.views.task_add_subscribe.delay')
     def test_subscribe_post_succeed(self, mock_task_add_subscribe_delay):
-        # https://github.com/adamchainz/django-capture-on-commit-callbacks
-        from django_capture_on_commit_callbacks import capture_on_commit_callbacks
-
-        with capture_on_commit_callbacks(execute=True) as callbacks:
+        with self.captureOnCommitCallbacks(execute=True) as callbacks:
             response = self.client.post(
                 reverse('subscribe'),
                 {

requirements.txt

@@ -1,18 +1,17 @@
-celery==4.4.7
-channels==3.0.2
-channels-redis==3.2.0
+celery==5.1.2
+channels==3.0.4
+channels-redis==3.3.0
 coverage==5.3.1
-Django==3.1.4
-django-capture-on-commit-callbacks==1.3.0
-django-celery-beat==2.1.0
+Django==3.2.5
+django-celery-beat==2.2.1
 factory-boy==3.1.0
-flower==0.9.7
+flower==1.0.0
 gunicorn==20.0.4
 Pillow==8.0.1
 psycopg2-binary==2.8.6
 pytest==6.2.1
 pytest-cov==2.10.1
-pytest-django==4.1.0
+pytest-django==4.4.0
 pytest-factoryboy==2.0.3
 redis==3.5.3
 requests==2.25.1

tests/polls/test_view.py

@@ -6,12 +6,11 @@
 from polls import tasks
 
 
-def test_subscribe_post_succeed(db, monkeypatch, client, user):
+def test_subscribe_post_succeed(db, monkeypatch, client, user, django_capture_on_commit_callbacks):
     mock_task_add_subscribe_delay = mock.MagicMock(name="task_add_subscribe_delay")
     monkeypatch.setattr(tasks.task_add_subscribe, 'delay', mock_task_add_subscribe_delay)
 
-    from django_capture_on_commit_callbacks import capture_on_commit_callbacks
-    with capture_on_commit_callbacks(execute=True) as callbacks:
+    with django_capture_on_commit_callbacks(execute=True) as callbacks:
         response = client.post(
             reverse('subscribe'),
             {

tests/tdd/test_views.py

@@ -53,7 +53,7 @@ def test_post_fail(client, db):
     assert not Member.objects.count()
 
 
-def test_celery_task(client, db, monkeypatch):
+def test_celery_task(client, db, monkeypatch, django_capture_on_commit_callbacks):
     fake_member = MemberFactory.build()
     password = fake.password()
     form_data = {
@@ -70,8 +70,7 @@ def test_celery_task(client, db, monkeypatch):
     mock_generate_avatar_thumbnail_delay = mock.MagicMock(name="generate_avatar_thumbnail")
     monkeypatch.setattr(tasks.generate_avatar_thumbnail, 'delay', mock_generate_avatar_thumbnail_delay)
 
-    from django_capture_on_commit_callbacks import capture_on_commit_callbacks
-    with capture_on_commit_callbacks(execute=True) as callbacks:
+    with django_capture_on_commit_callbacks(execute=True) as callbacks:
         response = client.post(reverse('member_signup'), form_data)
         assert response.status_code == 200