Basic travis support.

Some of the pylint errors were also removed.

1 files changed, 5 insertions, 8 deletions

diff --git a/tox.ini b/tox.ini
index a37172c97..314b271cd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,19 +1,16 @@
 [tox]
-# official list is
-#envlist = py27, py32, py33, py34
-envlist = py27, py33, pylint
+envlist = py27, py33, py34, py35, pypy, jython, pylint
+skip_missing_interpreters = true
 
 [testenv:pylint]
 deps =
-  hg+https://bitbucket.org/logilab/astroid@master
-  six
-  hg+https://bitbucket.org/logilab/pylint
+   git+https://github.com/PyCQA/astroid@master
+
 commands = pylint -rn --rcfile={toxinidir}/pylintrc {envsitepackagesdir}/pylint
 
 [testenv]
 deps =
-  hg+https://bitbucket.org/logilab/astroid@master
-  six
+   git+https://github.com/PyCQA/astroid@master
 
 commands = python -Wi -m unittest discover -s {envsitepackagesdir}/pylint/test/ -p {posargs:*test_*}.py
 changedir = {toxworkdir}