fix pep8 environment, explicit python versions and require pytest>=2.5

Author: andymccurdy

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 .