Fix for broken celery tests (#839)

* downgrades kombu for old redis-py tests

Underlying Kombu (transport) library has bumped required version of
redis-py to 3.2.0.

This commit locks celery4X_redis210 to the older version of Kombu
(4.3.0) that doesn't require the latest redis-py.

See https://github.com/celery/kombu/blob/3e60e6503a77b9b1a987cf7954659929abac9bac/Changelog#L35

* Take two

* Add new test case to circle

* fix kombu44 explicit dep on redis

* remove old comment

Author: JackWink

.circleci/config.yml

@@ -326,11 +326,13 @@ jobs:
     steps:
       - checkout
       - *restore_cache_step
-      - run: tox -e 'celery_contrib-{py27,py34,py35,py36}-celery{31,40,41,42}-redis{210}' --result-json /tmp/celery.results
+      - run: tox -e 'celery_contrib-{py27,py34,py35,py36}-celery{31}-redis{210}' --result-json /tmp/celery.1.results
+      - run: tox -e 'celery_contrib-{py27,py34,py35,py36}-celery{40,41,42}-{redis210-kombu43,redis320-kombu44}' --result-json /tmp/celery.2.results
       - persist_to_workspace:
           root: /tmp
           paths:
-            - celery.results
+            - celery.1.results
+            - celery.2.results
       - *save_cache_step
 
   elasticsearch:

tox.ini

@@ -44,7 +44,12 @@ envlist =
     botocore_contrib-{py27,py34,py35,py36}-botocore
     bottle_contrib{,_autopatch}-{py27,py34,py35,py36}-bottle{11,12}-webtest
     cassandra_contrib-{py27,py34,py35,py36}-cassandra{35,36,37,38,315}
-    celery_contrib-{py27,py34,py35,py36}-celery{31,40,41,42}-redis{210}
+# Non-4.x celery should be able to use the older redis lib, since it locks to an older kombu
+    celery_contrib-{py27,py34,py35,py36}-celery{31}-redis{210}
+# 4.x celery bumps kombu to 4.4+, which requires redis 3.2 or later, this tests against
+# older redis with an older kombu, and newer kombu/newer redis.
+# https://github.com/celery/kombu/blob/3e60e6503a77b9b1a987cf7954659929abac9bac/Changelog#L35
+    celery_contrib-{py27,py34,py35,py36}-celery{40,41,42}-{redis210-kombu43,redis320-kombu44}
     dbapi_contrib-{py27,py34,py35,py36}
     django_contrib{,_autopatch}-{py27,py34,py35,py36}-django{18,111}-djangopylibmc06-djangoredis45-pylibmc-redis{210}-memcached
     django_contrib{,_autopatch}-{py34,py35,py36}-django{200}-djangopylibmc06-djangoredis45-pylibmc-redis{210}-memcached
@@ -256,8 +261,11 @@ deps =
     redis29: redis>=2.9,<2.10
     redis210: redis>=2.10,<2.11
     redis300: redis>=3.0.0,<3.1.0
+    redis320: redis>=3.2.0,<3.3.0
     rediscluster135: redis-py-cluster>=1.3.5,<1.3.6
     rediscluster136: redis-py-cluster>=1.3.6,<1.3.7
+    kombu44:  kombu>=4.4,<4.5
+    kombu43:  kombu>=4.3,<4.4
     kombu42:  kombu>=4.2,<4.3
     kombu41:  kombu>=4.1,<4.2
     kombu40:  kombu>=4.0,<4.1