From 23cd61ad5413769bd4ae51459059ad7b39a67c17 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@nico-notebook.schottelius.org>
Date: Tue, 23 May 2023 19:20:44 +0200
Subject: [PATCH] requirements: upgrade celery (5.2.7) and friends

Failing with:

The conflict is caused by:
    The user requested Django==1.9.4
    aldryn-boilerplates 0.7.4 depends on Django<1.9.999 and >=1.5
    aldryn-categories 1.0.3 depends on django<1.10 and >=1.6
    aldryn-newsblog 1.2.1 depends on Django<1.10 and >=1.6
    aldryn-people 1.2.0 depends on Django<1.10 and >=1.6
    aldryn-reversion 1.0.8 depends on Django<1.10 and >=1.6
    aldryn-search 0.2.11 depends on Django>=1.4
    cmsplugin-filer 1.0.1 depends on Django>=1.5
    django-appdata 0.1.5 depends on Django>=1.4.10
    django-classy-tags 0.7.2 depends on Django>1.3
    django-cms 3.2.5 depends on Django<1.10 and >=1.6.9
    django-debug-toolbar 1.4 depends on Django>=1.7
    django-filer 1.2.0 depends on Django<1.9.999 and >=1.5
    django-formtools 1.0 depends on Django>=1.7
    django-guardian 1.4.4 depends on Django>=1.7
    django-haystack 2.4.1 depends on Django
    django-model-utils 2.5 depends on Django>=1.4.2
    django-mptt 0.8.4 depends on Django>=1.8
    django-reversion 1.10.2 depends on django>=1.8
    django-standard-form 1.1.1 depends on Django>=1.3
    django-stored-messages 1.4.0 depends on Django>=1.8
    django-taggit-templatetags 0.2.5 depends on django>=1.1
    django-treebeard 4.0.1 depends on Django>=1.7
    djangocms-picture 1.0.0 depends on django>=1.6
    easy-thumbnails 2.3 depends on django>=1.4.2
    model-mommy 1.2.6 depends on Django
    django-celery-results 2.5.1 depends on Django>=3.2.18
---
 requirements.txt | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 27308d8a..658662c1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -72,7 +72,7 @@ pycryptodome==3.6.6
 pylibmc==1.6.3
 python-dateutil==2.5.3
 python-slugify==1.2.0
-pytz==2016.4
+pytz>=2023.3
 rcssmin==1.0.6
 requests>=2.20
 rjsmin==1.0.12
@@ -86,16 +86,16 @@ git+https://github.com/ungleich/python-oca.git#egg=oca
 djangorestframework==3.6.3
 flake8==3.3.0
 python-memcached==1.58
-celery==4.0.2
+celery==5.2.7
 redis==2.10.5
-django-celery-results==1.0.1
-kombu==4.1.0
+django-celery-results>=2.5.1
+kombu>=5.2.3
 mccabe==0.6.1
 pycodestyle==2.3.1
 pyflakes==1.5.0
-billiard==3.5.0.3
+billiard==3.6.4.0
 amqp==2.2.1
-vine==1.1.4
+vine>=5.0.0
 cdist==5.0.1
 git+https://github.com/ungleich/djangocms-multisite.git#egg=djangocms_multisite
 pyotp