diff options
| author | Steve Piercy <web@stevepiercy.com> | 2016-08-20 22:15:02 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-20 22:15:02 -0700 |
| commit | 395b176283543b9e771bc4be04b5a3ae382ed778 (patch) | |
| tree | eed405ea5614e4f0c38ef83ec07790168f402f4b | |
| parent | 1c864fdc211ac1a14628a3427d00ac1253c24cde (diff) | |
| parent | 1941d27c65c99a38b29dde9536e71d08dc9f64d9 (diff) | |
| download | pyramid-395b176283543b9e771bc4be04b5a3ae382ed778.tar.gz pyramid-395b176283543b9e771bc4be04b5a3ae382ed778.tar.bz2 pyramid-395b176283543b9e771bc4be04b5a3ae382ed778.zip | |
Merge pull request #2754 from stevepiercy/master
add testing for py36
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | tox.ini | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index fbdd88224..7528a948a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,6 +20,10 @@ matrix: env: TOXENV=docs - python: 3.5 env: TOXENV=pep8 + - python: nightly + env: TOXENV=py36 + allow_failures: + - env: TOXENV=py36 install: - travis_retry pip install tox @@ -1,8 +1,9 @@ [tox] envlist = - py27,py33,py34,py35,pypy, + py27,py33,py34,py35,py36,pypy, docs,pep8, {py2,py3}-cover,coverage, +skip-missing-interpreters = True [testenv] # Most of these are defaults but if you specify any you can't fall back @@ -12,6 +13,7 @@ basepython = py33: python3.3 py34: python3.4 py35: python3.5 + py36: python3.6 pypy: pypy py2: python2.7 py3: python3.5 |