From 6c7193f11a06ee47dcf1dfcbf8c7dc681c780e34 Mon Sep 17 00:00:00 2001
From: Ildar Iskhakov <ildar.iskhakov@grafana.com>
Date: Thu, 1 Sep 2022 12:56:06 +0300
Subject: [PATCH 1/3] Bump celery version, telegram version

---
 engine/requirements.txt | 5 ++---
 engine/settings/base.py | 1 -
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/engine/requirements.txt b/engine/requirements.txt
index a3612d8e..8406faf5 100644
--- a/engine/requirements.txt
+++ b/engine/requirements.txt
@@ -5,16 +5,15 @@ whitenoise==5.3.0
 twilio~=6.37.0
 phonenumbers==8.10.0
 django-ordered-model==3.1.1
-celery==4.3.0
+celery==5.2.7
 redis==3.2.0
-django-celery-results==1.0.4
 humanize==0.5.1
 uwsgi==2.0.20
 django-cors-headers==3.7.0
 django-debug-toolbar==3.2.1
 django-sns-view==0.1.2
 kombu==4.5.0
-python-telegram-bot==11.1.0
+python-telegram-bot==13.13
 django-silk==4.1.0
 django-redis-cache==3.0.0
 hiredis==1.0.0
diff --git a/engine/settings/base.py b/engine/settings/base.py
index 53c35c66..d02a9652 100644
--- a/engine/settings/base.py
+++ b/engine/settings/base.py
@@ -130,7 +130,6 @@ INSTALLED_APPS = [
     "apps.grafana_plugin",
     "apps.grafana_plugin_management",
     "apps.migration_tool",
-    "django_celery_results",
     "corsheaders",
     "debug_toolbar",
     "social_django",

From 7fa26b1664b4a2b04d01e3146e7a57ad06dd3d5d Mon Sep 17 00:00:00 2001
From: Ildar Iskhakov <ildar.iskhakov@grafana.com>
Date: Thu, 1 Sep 2022 13:03:05 +0300
Subject: [PATCH 2/3] Bump kombu version

---
 engine/requirements.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/engine/requirements.txt b/engine/requirements.txt
index 8406faf5..1bf66e51 100644
--- a/engine/requirements.txt
+++ b/engine/requirements.txt
@@ -12,7 +12,6 @@ uwsgi==2.0.20
 django-cors-headers==3.7.0
 django-debug-toolbar==3.2.1
 django-sns-view==0.1.2
-kombu==4.5.0
 python-telegram-bot==13.13
 django-silk==4.1.0
 django-redis-cache==3.0.0

From 27afa18e6d2f863a369516ac27d1596cc243a8cf Mon Sep 17 00:00:00 2001
From: Ildar Iskhakov <ildar.iskhakov@grafana.com>
Date: Thu, 1 Sep 2022 13:54:19 +0300
Subject: [PATCH 3/3] Change flags position for celery 5

---
 engine/celery_with_exporter.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engine/celery_with_exporter.sh b/engine/celery_with_exporter.sh
index 360cc864..d1e020e9 100755
--- a/engine/celery_with_exporter.sh
+++ b/engine/celery_with_exporter.sh
@@ -25,10 +25,10 @@ if [ -z "$CELERY_WORKER_MAX_TASKS_PER_CHILD" ]; then
 fi
 
 CELERY_ARGS=(
+  "--quiet"  # --quite parameter removes pointless banner when celery starts
   "-A" "engine"
   "worker"
   "-l" "info"
-  "--quiet"  # --quite parameter removes pointless banner when celery starts
   "--concurrency=$CELERY_WORKER_CONCURRENCY"
   "--max-tasks-per-child=$CELERY_WORKER_MAX_TASKS_PER_CHILD"
   "-Q" "$CELERY_WORKER_QUEUE"