summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBert JW Regeer <bertjw@regeer.org>2016-11-16 13:47:19 -0700
committerBert JW Regeer <bertjw@regeer.org>2016-11-16 14:00:01 -0700
commit49909639a9ba8cdfeac2b21eed5f4fb7b0b2f60c (patch)
treeeeda94cc4aa963c3720d6dacf5613f257a544a7b
parent94bb2c66132d33dcc8cea94792af6244526e836d (diff)
downloadwebob-fixup/PATH_SAFE.tar.gz
Update tox and travis Python versionsfixup/PATH_SAFE
Remove PyPy3, it is no longer supported by pip
-rw-r--r--.travis.yml9
-rw-r--r--tox.ini8
2 files changed, 12 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index de5f487..7037c57 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,12 +12,17 @@ matrix:
env: TOXENV=py34
- python: 3.5
env: TOXENV=py35
+ - python: 3.6-dev
+ env: TOXENV=py36
+ - python: nightly
+ env: TOXENV=py37
- python: pypy
env: TOXENV=pypy
- - python: pypy3
- env: TOXENV=pypy3
- python: 3.5
env: TOXENV=py2-cover,py3-cover,coverage
+ allow_failures:
+ - env: TOXENV=py36
+ - env: TOXENV=py37
install:
- travis_retry pip install tox
diff --git a/tox.ini b/tox.ini
index 402fd6a..79ee9c3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,8 @@
[tox]
envlist =
- py27,py33,py34,py35,pypy,pypy3,
+ py27,py33,py34,py35,py36,py37,pypy,
docs,{py2,py3}-cover,coverage
+skip_missing_interpreters = True
[testenv]
# Most of these are defaults but if you specify any you can't fall back
@@ -11,10 +12,11 @@ basepython =
py33: python3.3
py34: python3.4
py35: python3.5
+ py36: python3.6
+ py37: python3.7
pypy: pypy
- pypy3: pypy3
py2: python2.7
- py3: python3.4
+ py3: python3.5
commands =
pip install webob[testing]