Use conditional deps to simplify tox.ini

1 files changed, 9 insertions, 23 deletions

diff --git a/tox.ini b/tox.ini
index 53c797e..15bda87 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,32 +1,18 @@
 [tox]
-# official list is
-# envlist = py27, py33, py34, pypy, jython
-envlist = py27, py33, pylint
-
-[testenv:pylint]
-deps =
-  lazy-object-proxy
-  singledispatch
-  six
-  wrapt
-  hg+https://bitbucket.org/logilab/pylint
-commands = pylint -rn --rcfile={toxinidir}/pylintrc {envsitepackagesdir}/astroid
+# Official list
+# envlist = py27, py33, py34, py35, pypy, jython, pylint
 
-# This is commented out because tox will try to load the interpreter
-# for any defined environment even if it's not in envlist, which will
-# then fail on drone.io.
+# drone.io
+envlist = py27, py33, pylint
 
-# [testenv:py34]
-# deps =
-#   lazy-object-proxy
-#   six
-#   wrapt
+# For testing off drone.io---please don't delete.
+# envlist = py27, py34, pypy, pylint
 
 [testenv]
 deps =
   lazy-object-proxy
-  singledispatch
+  py27,py33,pypy,jython: singledispatch
   six
   wrapt
-
-commands = python -m unittest discover -s {envsitepackagesdir}/astroid/tests -p "unittest*.py"           
+  pylint: hg+https://bitbucket.org/logilab/pylint
+commands = python -m unittest discover -s {envsitepackagesdir}/astroid/tests -p "unittest*.py"