Merge pull request #13 from 0xDEC0DE/issue/12

Try harder to import redis-py

Author: NicolasLM

spinach/brokers/redis.py

@@ -9,7 +9,10 @@
 import uuid
 
 from redis import StrictRedis, ConnectionError, TimeoutError
-from redis.client import Script
+try:  # Redis < 4.1.0
+    from redis.client import Script
+except ImportError:  # Redis >= 4.1.0
+    from redis.commands.core import Script
 
 from ..brokers.base import Broker
 from ..job import Job, JobStatus

tox.ini

@@ -9,7 +9,6 @@ envdir =
 usedevelop = True
 whitelist_externals =
     docker-compose
-    sh
 deps =
     pytest
     pytest-cov
@@ -23,6 +22,6 @@ commands =
     pycodestyle --ignore=E252,W503,W504 spinach tests
 
 [testenv:py3]
-commands =
-    docker-compose -f {toxinidir}/tests/docker-compose.yml up -d
-    sh -c 'pytest tests {posargs}; stat=$?; docker-compose -f {toxinidir}/tests/docker-compose.yml down; exit $stat'
+commands_pre = docker-compose -f {toxinidir}/tests/docker-compose.yml up -d
+commands = pytest tests {posargs}
+commands_post = docker-compose -f {toxinidir}/tests/docker-compose.yml down