summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2019-03-25 22:43:13 -0500
committerMichael Merickel <michael@merickel.org>2019-03-25 22:49:47 -0500
commitca2b7a178a36d50b41d22d0ca536415e2137061c (patch)
tree8c48416e6866370e4b7b7de2b709995069c1caa2
parent8111dd66188ffa225fd13ece31f6f9fcb34495ba (diff)
downloadwaitress-ca2b7a178a36d50b41d22d0ca536415e2137061c.tar.gz
use tox extras key for testing and add pypy3update-tox
-rw-r--r--.travis.yml4
-rw-r--r--tox.ini32
2 files changed, 15 insertions, 21 deletions
diff --git a/.travis.yml b/.travis.yml
index 8db3000..e0a8843 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,8 +22,10 @@ matrix:
sudo: true
- python: pypy
env: TOXENV=pypy
+ - python: pypy3
+ env: TOXENV=pypy3
- python: 3.5
- env: TOXENV=py2-cover,py3-cover,coverage
+ env: TOXENV=py27-cover,py35-cover,coverage
- python: 3.5
env: TOXENV=docs
allow_failures:
diff --git a/tox.ini b/tox.ini
index f9b4227..2533fb8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,48 +1,40 @@
[tox]
envlist =
- py27,py34,py35,py36,py37,pypy,
+ py27,py34,py35,py36,py37,pypy,pypy3,
docs,
- {py2,py3}-cover,coverage
+ {py27,py35}-cover,coverage
[testenv]
-# Most of these are defaults but if you specify any you can't fall back
-# to defaults for others.
-basepython =
- py27: python2.7
- py34: python3.4
- py35: python3.5
- py36: python3.6
- py37: python3.7
- py38: python3.8
- pypy: pypy
- py2: python2.7
- py3: python3.5
-
commands =
- pip install waitress[testing]
nosetests --with-xunit --xunit-file=nosetests-{envname}.xml {posargs:}
+extras =
+ testing
+
[testenv:docs]
basepython = python3.5
whitelist_externals = make
commands =
- pip install waitress[docs]
make -C docs clean html epub BUILDDIR={envdir} "SPHINXOPTS=-W -E"
+extras =
+ docs
[py-cover]
commands =
- pip install waitress[testing]
coverage run --source=waitress --parallel-mode {envbindir}/nosetests
coverage combine
coverage xml -o {envname}.xml
-[testenv:py2-cover]
+extras =
+ testing
+
+[testenv:py27-cover]
commands =
{[py-cover]commands}
setenv =
COVERAGE_FILE=.coverage.py2
-[testenv:py3-cover]
+[testenv:py35-cover]
commands =
{[py-cover]commands}
setenv =