Skip to content

Commit a316d3e

Browse files
authored
Merge branch '0.24-dev' into remove-future-print
2 parents a0d8055 + 0b091fb commit a316d3e

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

.circleci/config.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -327,12 +327,14 @@ jobs:
327327
- run: tox -e 'celery_contrib-{py27,py34,py35,py36}-celery{31}-redis{210}' --result-json /tmp/celery31.results
328328
- run: tox -e 'celery_contrib-{py27,py34,py35,py36}-celery{40,41}-{redis210-kombu43,redis320-kombu44}' --result-json /tmp/celery40-41.results
329329
- run: tox -e 'celery_contrib-{py27,py34,py35,py36}-celery42-redis210-kombu43' --result-json /tmp/celery42.results
330+
- run: tox -e 'celery_contrib-{py27,py34,py35,py36}-celery43-redis320-kombu44' --result-json /tmp/celery43.results
330331
- persist_to_workspace:
331332
root: /tmp
332333
paths:
333334
- celery31.results
334335
- celery40-41.results
335336
- celery42.results
337+
- celery43.results
336338
- *save_cache_step
337339

338340
elasticsearch:

tox.ini

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ envlist =
5454
# Celery 4.2 is now limited to Kombu 4.3
5555
# https://github.com/celery/celery/commit/1571d414461f01ae55be63a03e2adaa94dbcb15d
5656
celery_contrib-{py27,py34,py35,py36}-celery42-redis210-kombu43
57+
# Celery 4.3 wants Kombu >= 4.4 and Redis >= 3.2
58+
celery_contrib-{py27,py34,py35,py36}-celery43-redis320-kombu44
5759
dbapi_contrib-{py27,py34,py35,py36}
5860
django_contrib{,_autopatch}-{py27,py34,py35,py36}-django{18,111}-djangopylibmc06-djangoredis45-pylibmc-redis{210}-memcached
5961
django_contrib{,_autopatch}-{py34,py35,py36}-django{200}-djangopylibmc06-djangoredis45-pylibmc-redis{210}-memcached
@@ -173,6 +175,7 @@ deps =
173175
celery40: celery>=4.0,<4.1
174176
celery41: celery>=4.1,<4.2
175177
celery42: celery>=4.2,<4.3
178+
celery43: celery>=4.3,<4.4
176179
ddtracerun: redis
177180
django18: django>=1.8,<1.9
178181
django111: django>=1.11,<1.12

0 commit comments

Comments
 (0)