diff --git a/awx/main/management/commands/run_dispatcher.py b/awx/main/management/commands/run_dispatcher.py index 5891d7d0b6..53cfe05a29 100644 --- a/awx/main/management/commands/run_dispatcher.py +++ b/awx/main/management/commands/run_dispatcher.py @@ -35,7 +35,7 @@ class Command(BaseCommand): 'running jobs will run to completion first')) def beat(self): - from celery import app + from celery import Celery from celery.beat import PersistentScheduler from celery.apps import beat @@ -56,7 +56,7 @@ class Command(BaseCommand): raise SystemExit() return super(AWXScheduler, self).tick(*args, **kwargs) - def apply_async(self, entry, publisher, **kwargs): + def apply_async(self, entry, producer=None, advance=True, **kwargs): task = TaskWorker.resolve_callable(entry.task) result, queue = task.apply_async() @@ -65,7 +65,7 @@ class Command(BaseCommand): return TaskResult() - app = app.App() + app = Celery() app.conf.BROKER_URL = settings.BROKER_URL app.conf.CELERY_TASK_RESULT_EXPIRES = False beat.Beat( diff --git a/requirements/requirements.in b/requirements/requirements.in index 63f2834e73..79f764e6cf 100644 --- a/requirements/requirements.in +++ b/requirements/requirements.in @@ -4,7 +4,7 @@ asgiref==1.1.2 backports.ssl-match-hostname==3.5.0.1 boto==2.47.0 channels==1.1.8 -celery==3.1.25 +celery==4.2.1 daphne==1.3.0 # Last before backwards-incompatible channels 2 upgrade decorator==4.2.1 Django==1.11.11 diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 1ff73ae81c..24d00e4e2c 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -4,8 +4,7 @@ # # pip-compile --output-file requirements/requirements.txt requirements/requirements.in # -amqp==1.4.9 # via kombu -anyjson==0.3.3 # via kombu +amqp==2.3.2 # via kombu appdirs==1.4.2 argparse==1.4.0 # via uwsgitop asgi-amqp==1.1.2 @@ -17,9 +16,9 @@ automat==0.6.0 # via twisted backports.functools-lru-cache==1.5 # via jaraco.functools backports.ssl-match-hostname==3.5.0.1 baron==0.6.6 # via redbaron -billiard==3.3.0.23 # via celery +billiard==3.5.0.4 # via celery boto==2.47.0 -celery==3.1.25 +celery==4.2.1 cffi==1.11.5 # via cryptography channels==1.1.8 constantly==15.1.0 # via twisted @@ -60,7 +59,7 @@ jaraco.stream==1.1.2 # via irc jaraco.text==1.10 # via irc, jaraco.collections jsonpickle==0.9.6 # via asgi-amqp jsonschema==2.6.0 -kombu==3.0.37 # via asgi-amqp, celery +kombu==4.2.1 # via asgi-amqp, celery lxml==4.2.3 m2crypto==0.29.0 markdown==2.6.11 @@ -89,7 +88,7 @@ python-memcached==1.59 python-openid==2.2.5 # via social-auth-core python-radius==1.0 python-saml==2.4.0 -pytz==2018.3 # via celery, django, irc, tempora, twilio +pytz==2018.5 # via celery, django, irc, tempora, twilio pyyaml==3.12 # via djangorestframework-yaml redbaron==0.6.3 requests-futures==0.9.7