summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorAndy McCurdy <andy@andymccurdy.com>2014-03-29 10:58:34 -0700
committerAndy McCurdy <andy@andymccurdy.com>2014-03-29 10:58:34 -0700
commit310c7c2b18a8352ddf6af20eeb794c5d55098b73 (patch)
treefa220fcd9db8587c7d5f409bf94a38a9af18098a /tox.ini
parent018e1324699832d6c3ed819a26968d318929464c (diff)
downloadredis-py-310c7c2b18a8352ddf6af20eeb794c5d55098b73.tar.gz
fix pep8 environment, explicit python versions and require pytest>=2.5
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini24
1 files changed, 11 insertions, 13 deletions
diff --git a/tox.ini b/tox.ini
index 62ab86a..5dd93df 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,40 +1,38 @@
[tox]
-envlist = py25, py26, py27, py32, py33, hi26, hi27, hi32, hi33, pep8
+envlist = py26, py27, py32, py33, hi26, hi27, hi32, hi33, pep8
[testenv]
-deps=pytest
+deps=pytest>=2.5.0
commands = py.test []
-[testenv:py25]
-setenv =
- PIP_INSECURE=1
-deps =
- pytest
-
[testenv:hi26]
+basepython = python2.6
deps =
hiredis
- pytest
+ pytest>=2.5.0
commands = py.test []
[testenv:hi27]
+basepython = python2.7
deps =
hiredis
- pytest
+ pytest>=2.5.0
commands = py.test []
[testenv:hi32]
+basepython = python3.2
deps =
hiredis
- pytest
+ pytest>=2.5.0
commands = py.test []
[testenv:hi33]
+basepython = python3.3
deps =
hiredis
- pytest
+ pytest>=2.5.0
commands = py.test []
[testenv:pep8]
deps = pep8
-commands = pep8 --repeat --show-source --exclude=.venv,.tox,dist,doc,build,*.egg .
+commands = pep8 --repeat --show-source --exclude=.venv,.tox,dist,docs,build,*.egg .