diff options
| author | Bert JW Regeer <bertjw@regeer.org> | 2015-10-11 22:45:07 -0600 |
|---|---|---|
| committer | Bert JW Regeer <bertjw@regeer.org> | 2015-10-11 22:45:07 -0600 |
| commit | cc9126ed2b215fe6c59ca9eb74e6e0a55b9fc76e (patch) | |
| tree | b8747a778bd588ceb194015183c64925f706f3af | |
| parent | 18231f8387b01e21a846b57b4a01e3ceb46e607d (diff) | |
| download | pyramid-cc9126ed2b215fe6c59ca9eb74e6e0a55b9fc76e.tar.gz pyramid-cc9126ed2b215fe6c59ca9eb74e6e0a55b9fc76e.tar.bz2 pyramid-cc9126ed2b215fe6c59ca9eb74e6e0a55b9fc76e.zip | |
Make sure we test on Python 3.5
| -rw-r--r-- | .travis.yml | 34 | ||||
| -rw-r--r-- | tox.ini | 3 |
2 files changed, 24 insertions, 13 deletions
diff --git a/.travis.yml b/.travis.yml index ba077d342..79d9fa09d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,18 +2,28 @@ language: python sudo: false -env: - - TOXENV=py26 - - TOXENV=py27 - - TOXENV=py32 - - TOXENV=py33 - - TOXENV=py34 - - TOXENV=pypy - - TOXENV=pypy3 - - TOXENV=py2-docs - - TOXENV=py3-docs - - TOXENV=py2-cover,py3-cover,coverage - - TOXENV=pep8 +matrix: + include: + - python: 2.6 + env: TOXENV=py26 + - python: 2.7 + env: TOXENV=py27 + - python: 3.2 + env: TOXENV=py32 + - python: 3.3 + env: TOXENV=py33 + - python: 3.4 + env: TOXENV=py34 + - python: 3.5 + env: TOXENV=py35 + - python: pypy + env: TOXENV=pypy + - python: pypy3 + env: TOXENV=pypy3 + - python: 3.5 + env: TOXENV=py2-cover,py3-cover,coverage + - python: 3.5 + env: TOXENV=pep8 install: - travis_retry pip install tox @@ -1,6 +1,6 @@ [tox] envlist = - py26,py27,py32,py33,py34,pypy,pypy3,pep8, + py26,py27,py32,py33,py34,py35,pypy,pypy3,pep8, {py2,py3}-docs, {py2,py3}-cover,coverage, @@ -13,6 +13,7 @@ basepython = py32: python3.2 py33: python3.3 py34: python3.4 + py35: python3.5 pypy: pypy pypy3: pypy3 py2: python2.7 |