aboutsummaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2017-01-19 11:49:37 -0800
committerDylan Baker <dylan@pnwbakers.com>2017-01-19 13:20:29 -0800
commit9861294a9d1a98338782998a03ae2c8a687f06da (patch)
tree6b4f71c98f00e59cee9a03a52066044c396e7b1c /tox.ini
parente9faa8076307de389b4b18815846ec2ac1f0467d (diff)
downloadpiglit-9861294a9d1a98338782998a03ae2c8a687f06da.tar.gz
CI: Add python 3.6 to build matrix
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini8
1 files changed, 4 insertions, 4 deletions
diff --git a/tox.ini b/tox.ini
index 2d7b44a89..01cf445b9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
[tox]
-envlist = py{27,33,34,35}-{generator,noaccel}, py{27,33,34,35}-accel-{win,nix}, py{27,33,34,35}-streams
+envlist = py{27,33,34,35,36}-{generator,noaccel}, py{27,33,34,35,36}-accel-{win,nix}, py{27,33,34,35,36}-streams
skipsdist = True
[pytest]
@@ -16,10 +16,10 @@ deps =
accel: simplejson
generator: numpy==1.7.0
mock==1.0.1
- py27-accel-nix,py{33,34,35}-{accel,noaccel}: psutil
+ py27-accel-nix,py{33,34,35,36}-{accel,noaccel}: psutil
py27-accel-nix: backports.lzma
py27-accel-nix: subprocess32
- py35: mako==1.0.2
+ py{35,36}: mako==1.0.2
pytest<3.0.2
pytest-mock
pytest-pythonpath
@@ -29,7 +29,7 @@ deps =
py{27,33,34}: mako==0.8.0
six==1.5.2
{accel,noaccel,streams}: jsonschema
- streams: jsonstreams>=0.4.0
+ streams: jsonstreams>=0.4.1
commands =
{accel,noaccel}: py.test -rw unittests/framework unittests/suites []
generator: py.test -rw unittests/generators []