From 449b78c3ebd41043cada4af4cc3ecc3f07f8cd3c Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Tue, 23 May 2023 17:39:51 +0000
Subject: [PATCH] Remove django-celery-results and update amqp to >=5.0.9

New error:
Traceback (most recent call last):
  File "/app/manage.py", line 10, in <module>
    execute_from_command_line(sys.argv)
  File "/usr/local/lib/python3.10/site-packages/django/core/management/__init__.py", line 353, in execute_from_command_line
    utility.execute()
  File "/usr/local/lib/python3.10/site-packages/django/core/management/__init__.py", line 302, in execute
    settings.INSTALLED_APPS
  File "/usr/local/lib/python3.10/site-packages/django/conf/__init__.py", line 55, in __getattr__
    self._setup(name)
  File "/usr/local/lib/python3.10/site-packages/django/conf/__init__.py", line 43, in _setup
    self._wrapped = Settings(settings_module)
  File "/usr/local/lib/python3.10/site-packages/django/conf/__init__.py", line 99, in __init__
    mod = importlib.import_module(self.SETTINGS_MODULE)
  File "/usr/local/lib/python3.10/importlib/__init__.py", line 126, in import_module
    return _bootstrap._gcd_import(name[level:], package, level)
  File "<frozen importlib._bootstrap>", line 1050, in _gcd_import
  File "<frozen importlib._bootstrap>", line 1027, in _find_and_load
  File "<frozen importlib._bootstrap>", line 992, in _find_and_load_unlocked
  File "<frozen importlib._bootstrap>", line 241, in _call_with_frames_removed
  File "<frozen importlib._bootstrap>", line 1050, in _gcd_import
  File "<frozen importlib._bootstrap>", line 1027, in _find_and_load
  File "<frozen importlib._bootstrap>", line 1006, in _find_and_load_unlocked
  File "<frozen importlib._bootstrap>", line 688, in _load_unlocked
  File "<frozen importlib._bootstrap_external>", line 883, in exec_module
  File "<frozen importlib._bootstrap>", line 241, in _call_with_frames_removed
  File "/app/dynamicweb/__init__.py", line 3, in <module>
    from .celery import app as celery_app
  File "/app/dynamicweb/celery.py", line 7, in <module>
    app = Celery('dynamicweb')
  File "/usr/local/lib/python3.10/site-packages/celery/app/base.py", line 291, in __init__
    self._fixups = [symbol_by_name(fixup)(self) for fixup in self.fixups]
  File "/usr/local/lib/python3.10/site-packages/celery/app/base.py", line 291, in <listcomp>
    self._fixups = [symbol_by_name(fixup)(self) for fixup in self.fixups]
  File "/usr/local/lib/python3.10/site-packages/celery/fixups/django.py", line 44, in fixup
    _verify_django_version(django)
  File "/usr/local/lib/python3.10/site-packages/celery/fixups/django.py", line 32, in _verify_django_version
    raise ImproperlyConfigured('Celery 5.x requires Django 1.11 or later.')
celery.exceptions.ImproperlyConfigured: Celery 5.x requires Django 1.11 or later.
---
 requirements.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 658662c1..83d37dc5 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -88,13 +88,13 @@ flake8==3.3.0
 python-memcached==1.58
 celery==5.2.7
 redis==2.10.5
-django-celery-results>=2.5.1
+#django-celery-results>=2.5.1
 kombu>=5.2.3
 mccabe==0.6.1
 pycodestyle==2.3.1
 pyflakes==1.5.0
 billiard==3.6.4.0
-amqp==2.2.1
+amqp>=5.0.9
 vine>=5.0.0
 cdist==5.0.1
 git+https://github.com/ungleich/djangocms-multisite.git#egg=djangocms_multisite