Merge branch 'fix-celery-issues' into 'master'

Fix celery issues

See merge request funkwhale/funkwhale!563

api/funkwhale_api/taskapp/celery.py

@@ -14,7 +14,7 @@ logger = logging.getLogger("celery")
 if not settings.configured:
     # set the default Django settings module for the 'celery' program.
     os.environ.setdefault(
-        "DJANGO_SETTINGS_MODULE", "config.settings.local"
+        "DJANGO_SETTINGS_MODULE", "config.settings.production"
     )  # pragma: no cover
 
 app = celery.Celery("funkwhale_api")

api/requirements/base.txt

@@ -21,7 +21,7 @@ pytz==2018.9
 # Redis support
 django-redis>=4.10,<4.11
 redis>=3.0,<3.1
-
+kombu>=4.2.2,<4.3
 
 celery>=4.2,<4.3
 

changes/changelog.d/celery.bugfix

@@ -0,0 +1 @@
+Fixed celery worker defaulting to development settings instead of production

changes/changelog.d/kombu.bugfix

@@ -0,0 +1 @@
+Upgraded kombu to fix an incompatibility with redis>=3