summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorJoel Nothman <joel.nothman@gmail.com>2012-10-04 11:31:40 +1000
committerJoel Nothman <joel.nothman@gmail.com>2012-10-04 11:31:40 +1000
commitdf4f23779d14f2b41e9a5ecca0a06e21385cc603 (patch)
treebf03928d8eb40e9f5391eb49676001a32b83f39e /tox.ini
parente7c51d9089e9270ce197c00a6af1c60e45f36e97 (diff)
parentd5f99959cc2ec393c13fc9e44714351272bac7fc (diff)
downloadmsgpack-python-df4f23779d14f2b41e9a5ecca0a06e21385cc603.tar.gz
Merge commit 'd5f9995' into read_bytes
Conflicts: msgpack/_msgpack.pyx
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini3
1 files changed, 2 insertions, 1 deletions
diff --git a/tox.ini b/tox.ini
index 5e80dd0..214c4c4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,6 @@
[tox]
-envlist = py26,py27,py32
+envlist = py26,py27,py32,py33
+
[testenv]
deps=
nose