summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorINADA Naoki <methane@users.noreply.github.com>2015-11-23 04:34:39 +0900
committerINADA Naoki <methane@users.noreply.github.com>2015-11-23 04:34:39 +0900
commit88a38dce06d57dcfddea33e038b34a575fb2415a (patch)
treebdcb17edd44d6a861e14008de921f5079ffd3db2
parent29266b024ec82c281fa63bf2b73622088a8c188c (diff)
parent81177caff7ddc9b193da9fcfd27fcd6807da7fe1 (diff)
downloadmsgpack-python-88a38dce06d57dcfddea33e038b34a575fb2415a.tar.gz
Merge pull request #159 from thedrow/patch-1
Added Python 3.5 to the build matrix
-rw-r--r--.travis.yml6
-rw-r--r--tox.ini2
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:
diff --git a/tox.ini b/tox.ini
index 15feb51..56ded49 100644
--- a/tox.ini
+++ b/tox.ini
@@ -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=