Skip to content

Commit cf6451b

Browse files
committed
Upgrade to Celery 5
1 parent 1ff7bdc commit cf6451b

File tree

5 files changed

+21
-18
lines changed

5 files changed

+21
-18
lines changed

deploy/cr.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ spec:
77
imagePullPolicy: Never
88
appName: example
99
celeryApp: 'app:celery_app'
10-
celeryVersion: "4.X"
10+
celeryVersion: "5.0"
1111
workerReplicas: 3
1212
flowerReplicas: 2
1313
workerSpec:

deploy/detailed_cr.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ spec:
99
- name: dockerhub-creds
1010
appName: example-app
1111
celeryApp: 'app:celery_app'
12-
celeryVersion: "4.X"
12+
celeryVersion: "5.0"
1313
workerReplicas: 3
1414
flowerReplicas: 2
1515
workerSpec:

example/app.py

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,9 @@
22
from flask import Flask
33

44

5-
def make_celery(app):
6-
celery = Celery(
7-
app.import_name,
8-
backend=app.config['CELERY_RESULT_BACKEND'],
9-
broker=app.config['CELERY_BROKER_URL']
10-
)
5+
def make_celery(app, celery_config):
6+
celery = Celery(app.import_name)
7+
celery.config_from_object(celery_config)
118
celery.conf.update(app.config)
129

1310
class ContextTask(celery.Task):
@@ -20,11 +17,7 @@ def __call__(self, *args, **kwargs):
2017

2118

2219
flask_app = Flask(__name__)
23-
flask_app.config.update(
24-
CELERY_BROKER_URL='redis://redis-master/1',
25-
CELERY_RESULT_BACKEND='redis://redis-master/1'
26-
)
27-
celery_app = make_celery(flask_app)
20+
celery_app = make_celery(flask_app, 'celeryconfig')
2821

2922

3023
@celery_app.task()

example/celeryconfig.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
broker_url = 'redis://redis-master/1'
2+
result_backend = 'redis://redis-master/1'
3+
4+
task_serializer = 'json'
5+
result_serializer = 'json'
6+
accept_content = ['json']

requirements.txt

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
aiohttp==3.7.4
22
aiojobs==0.2.2
3-
amqp==2.6.0
3+
amqp==5.0.6
44
appnope==0.1.0
55
async-timeout==3.0.1
66
attrs==19.3.0
77
backcall==0.1.0
88
billiard==3.6.3.0
99
cachetools==4.1.0
10-
celery==4.4.4
10+
celery==5.0.5
1111
certifi==2020.4.5.1
1212
chardet==3.0.4
1313
click==7.1.2
14+
click-didyoumean==0.0.3
15+
click-plugins==1.1.1
16+
click-repl==0.1.6
1417
decorator==4.4.2
1518
Flask==1.1.2
1619
flower==0.9.4
@@ -25,8 +28,8 @@ iso8601==0.1.12
2528
itsdangerous==1.1.0
2629
jedi==0.17.0
2730
Jinja2==2.11.3
28-
kombu==4.6.10
29-
kopf==0.27
31+
kombu==5.0.2
32+
kopf==1.30.0
3033
kubernetes==11.0.0
3134
MarkupSafe==1.1.1
3235
multidict==4.7.6
@@ -41,6 +44,7 @@ pyasn1-modules==0.2.8
4144
Pygments==2.7.4
4245
pykube-ng==20.5.0
4346
python-dateutil==2.8.1
47+
python-json-logger==2.0.1
4448
pytz==2020.1
4549
PyYAML==5.4
4650
redis==3.5.3
@@ -52,7 +56,7 @@ tornado==6.0.4
5256
traitlets==4.3.3
5357
typing-extensions==3.7.4.2
5458
urllib3==1.25.9
55-
vine==1.3.0
59+
vine==5.0.0
5660
wcwidth==0.2.3
5761
websocket-client==0.57.0
5862
Werkzeug==1.0.1

0 commit comments

Comments
 (0)