From 77b45772bb736b0dab30bc30216c00d0420cac3d Mon Sep 17 00:00:00 2001
From: Marnanel Thurman <marnanel@thurman.org.uk>
Date: Mon, 31 May 2021 19:13:07 +0100
Subject: [PATCH] Update to new version of celery (so djcelery is removed).

This seems to involve unsetting TEST_RUNNER. I'm not certain
this is correct; I'm asking on IRC.
---
 kepi/kepi/__init__.py |  3 +++
 kepi/kepi/celery.py   | 13 +++++++++++++
 kepi/kepi/settings.py |  5 -----
 requirements.txt      |  1 -
 4 files changed, 16 insertions(+), 6 deletions(-)
 create mode 100644 kepi/kepi/celery.py

diff --git a/kepi/kepi/__init__.py b/kepi/kepi/__init__.py
index e69de29..b92e033 100644
--- a/kepi/kepi/__init__.py
+++ b/kepi/kepi/__init__.py
@@ -0,0 +1,3 @@
+from .celery import app as celery_app
+
+__all__ = ('celery_app', )
diff --git a/kepi/kepi/celery.py b/kepi/kepi/celery.py
new file mode 100644
index 0000000..fb33a60
--- /dev/null
+++ b/kepi/kepi/celery.py
@@ -0,0 +1,13 @@
+import os
+
+from celery import Celery
+
+app = Celery('kepi')
+
+app.config_from_object('django.conf:settings', namespace='CELERY')
+
+app.autodiscover_tasks()
+
+@app.task(bind=True)
+def debug_task(self):
+    print(f'Request: {self.request!r}')
diff --git a/kepi/kepi/settings.py b/kepi/kepi/settings.py
index 5933c7e..30b0b84 100644
--- a/kepi/kepi/settings.py
+++ b/kepi/kepi/settings.py
@@ -1,7 +1,5 @@
 import os
-import djcelery
 import logging
-djcelery.setup_loader()
 
 logger = logging.Logger(name='kepi')
 
@@ -84,7 +82,6 @@ INSTALLED_APPS = (
         'django.contrib.messages',
         'django.contrib.staticfiles',
 
-        'djcelery',
         'django_celery_results',
 
         'rest_framework',
@@ -142,8 +139,6 @@ LOGGING = {
             },
         }
 
-TEST_RUNNER = 'djcelery.contrib.test_runner.CeleryTestSuiteRunner'
-
 TIME_ZONE = 'UTC'
 
 USE_I18N = True
diff --git a/requirements.txt b/requirements.txt
index 95d0cd0..cce2d64 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,7 +6,6 @@ requests-http-signature
 cryptography
 pillow
 celery>4.0.0
-django-celery
 httpretty
 httpsig
 django-celery-results