summaryrefslogtreecommitdiffhomepage
path: root/tox.ini
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2014-09-08 15:13:09 -0700
committerJeff Forcier <jeff@bitprophet.org>2014-09-08 15:13:09 -0700
commit5e8e088ed610ae6dd264ea2c72fa30c3aa32b850 (patch)
tree2600619b98f7ff96c71008321dd1749b9e1959fe /tox.ini
parent56417507ee0fbe28b938e03909945c127c8bbde1 (diff)
parent9c9dcaf4885653f4dcd100b2724199976a20c21e (diff)
Merge branch 'master' into 346-int
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini2
1 files changed, 1 insertions, 1 deletions
diff --git a/tox.ini b/tox.ini
index 43c391dd..83704dfc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
[tox]
-envlist = py26,py27,py32,py33
+envlist = py26,py27,py32,py33,py34
[testenv]
commands = pip install --use-mirrors -q -r tox-requirements.txt