diff options
author | INADA Naoki <methane@users.noreply.github.com> | 2015-11-23 04:34:39 +0900 |
---|---|---|
committer | INADA Naoki <methane@users.noreply.github.com> | 2015-11-23 04:34:39 +0900 |
commit | 88a38dce06d57dcfddea33e038b34a575fb2415a (patch) | |
tree | bdcb17edd44d6a861e14008de921f5079ffd3db2 | |
parent | 29266b024ec82c281fa63bf2b73622088a8c188c (diff) | |
parent | 81177caff7ddc9b193da9fcfd27fcd6807da7fe1 (diff) | |
download | msgpack-python-88a38dce06d57dcfddea33e038b34a575fb2415a.tar.gz |
Merge pull request #159 from thedrow/patch-1
Added Python 3.5 to the build matrix
-rw-r--r-- | .travis.yml | 6 | ||||
-rw-r--r-- | tox.ini | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 7695184..7a80cdf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ sudo: false cache: pip language: python python: - - 2.7 + - 3.5 branches: only: @@ -10,9 +10,9 @@ branches: env: - TOXENV=py26-c,py27-c - - TOXENV=py32-c,py33-c,py34-c + - TOXENV=py32-c,py33-c,py34-c,py35-c - TOXENV=py26-pure,py27-pure - - TOXENV=py32-pure,py33-pure,py34-pure + - TOXENV=py32-pure,py33-pure,py34-pure,py35-pure - TOXENV=pypy-pure,pypy3-pure install: @@ -1,5 +1,5 @@ [tox] -envlist = {py26,py27,py32,py33,py34}-{c,pure},{pypy,pypy3}-pure,py27-x86,py34-x86 +envlist = {py26,py27,py32,py33,py34,py35}-{c,pure},{pypy,pypy3}-pure,py27-x86,py34-x86 [variants:pure] setenv= |