summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorCeridwen <ceridwenv@gmail.com>2015-11-06 18:16:41 -0500
committerCeridwen <ceridwenv@gmail.com>2015-11-06 18:16:41 -0500
commitf36ec7a8d88415fd033da99226c25030356a1bbc (patch)
tree03b2656d1552d9287afdc715915d2e2847eef97f /tox.ini
parentf659abbc89ae9eb295540d765e6e9f003578daf4 (diff)
parentcc7ea53df2383cd188e2b0958b231e1eb70fc79c (diff)
downloadastroid-f36ec7a8d88415fd033da99226c25030356a1bbc.tar.gz
Merge upstream changes
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini4
1 files changed, 2 insertions, 2 deletions
diff --git a/tox.ini b/tox.ini
index 6373dea..ea3a10c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,10 +3,10 @@
# envlist = py27, py33, py34, py35, pypy, jython, pylint
# drone.io
-# envlist = py27, py33, pylint
+envlist = py27, py33, pylint
# For testing off drone.io---please don't delete.
-envlist = py27, py34, pypy, pylint
+# envlist = py27, py34, pypy, pylint
[testenv:pylint]
commands = pylint -rn --rcfile={toxinidir}/pylintrc {envsitepackagesdir}/astroid