Merge pull request #729 from wadeking98/feature-update-celery

added support to celery 5+

.circleci/config.yml

@@ -2,11 +2,11 @@ version: 2
 jobs:
   django-build:
     docker:
-      - image: circleci/python:3.6.4
+      - image: circleci/python:3.9
     steps:
       - checkout
       - run: sudo chown -R circleci:circleci /usr/local/bin
-      - run: sudo chown -R circleci:circleci /usr/local/lib/python3.6/site-packages
+      - run: sudo chown -R circleci:circleci /usr/local/lib/python3.9/site-packages
       - restore_cache:
           keys:
             - app-pip-dependencies-{{ .Branch }}-{{ checksum "server/vcr-server/requirements.txt" }}

docker/manage

@@ -176,7 +176,7 @@ build-api() {
   #
   # vcr-api
   #
-  BASE_IMAGE="bcgovimages/von-image:py36-1.7-ew-0-s2i"
+  BASE_IMAGE="registry.access.redhat.com/ubi9/python-39:latest"
 
   echo -e "\nBuilding vcr-api image from ${BASE_IMAGE}..."
   ${S2I_EXE} build \

server/vcr-server/requirements.txt

@@ -36,16 +36,16 @@ drf-generators>=0.3.0
 debugpy
 
 # aiohttp
-aiohttp~=3.4.0
+aiohttp~=3.7.4
 aiohttp-wsgi~=0.8.1
 
 asgiref~=3.1.2
 
 # rest hooks and related
-django-rest-hooks==1.5.0
+git+https://github.com/wadeking98/django-rest-hooks@v1.7.0
 drf-nested-routers
-celery~=4.3.0
-vine~=1.3.0
+celery~=5.2.2
+vine>=5.0.0,<6.0
 
 # transitive dependency management
 iniconfig<=1.0.1

server/vcr-server/subscriptions/tasks.py

@@ -8,7 +8,7 @@
 from celery.exceptions import Retry
 # from celery.result import AsyncResult
 from celery.signals import celeryd_after_setup
-from celery.task import Task
+from celery import shared_task
 from django.conf import settings
 
 from subscriptions.models.Subscription import Subscription
@@ -30,8 +30,8 @@
 #         #     )
 #         # )
 
-
-class DeliverHook(Task):
+@shared_task
+def deliver_hook(Task):
     max_retries = 5
 
     def run(self, target, payload, instance_id=None, hook_id=None, **kwargs):
@@ -137,7 +137,7 @@ def deliver_hook_wrapper(target, payload, instance, hook):
     )
     # deliver_hook_error = DeliverHookError()
     # result = DeliverHook.apply_async(kwargs=kwargs, link_error=deliver_hook_error.s())
-    result = DeliverHook.apply_async(kwargs=kwargs)
+    result = deliver_hook.apply_async(kwargs=kwargs)
     result.forget()