summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorCeridwen <ceridwenv@gmail.com>2015-08-14 12:02:40 -0400
committerCeridwen <ceridwenv@gmail.com>2015-08-14 12:02:40 -0400
commitc39599ad4f32608cb03e680516678a8fd1ba4dee (patch)
treead7c279bb7a3b34241547ca3d0b079c396533f5f /tox.ini
parent43f27a00205f5b9b4a341a2c2e3f645dffe14904 (diff)
parentd7294bd79062a4f47db8a761d79e6c1dd166bc72 (diff)
downloadastroid-git-c39599ad4f32608cb03e680516678a8fd1ba4dee.tar.gz
Merge main into default
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini42
1 files changed, 20 insertions, 22 deletions
diff --git a/tox.ini b/tox.ini
index ebb4c224..466a6fa3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,22 +1,20 @@
-[tox]
-# official list is
-# envlist = py27, py33, py34, pypy, jython
-# envlist = py27, py34, pylint
-envlist = py27, py33
-
-[testenv:pylint]
-deps =
- lazy-object-proxy
- logilab-common
- six
- hg+https://bitbucket.org/logilab/astroid
- hg+https://bitbucket.org/logilab/pylint
-commands = pylint -rn --rcfile={toxinidir}/pylintrc {envsitepackagesdir}/astroid
-
-[testenv]
-deps =
- lazy-object-proxy
- logilab-common
- six
-
-commands = python -m unittest discover -s {envsitepackagesdir}/astroid/tests -p "unittest*.py"
+[tox]
+# official list is
+# envlist = py27, py33, py34, pypy, jython
+# envlist = py27, py34, pylint
+envlist = py27, py33
+
+[testenv:pylint]
+deps =
+ lazy-object-proxy
+ six
+ hg+https://bitbucket.org/logilab/astroid
+ hg+https://bitbucket.org/logilab/pylint
+commands = pylint -rn --rcfile={toxinidir}/pylintrc {envsitepackagesdir}/astroid
+
+[testenv]
+deps =
+ lazy-object-proxy
+ six
+
+commands = python -m unittest discover -s {envsitepackagesdir}/astroid/tests -p "unittest*.py"