tox all the things

Author: Kriechi

Diff for: .codecov.yml

@@ -0,0 +1 @@
+comment: off

Diff for: .coveragerc

@@ -1,39 +1,62 @@
-language: python
+dist: trusty
 sudo: false
-python:
-  - "2.7"
-  - "3.5"
-  - "3.6"
+language: python
 
 branches:
   only:
     - master
+    - /^\d+\.\d+\.X$/
+
+cache: pip
 
 env:
-  - MODE=pytest
-  - MODE=autobahn
-    SIDE=client
-  - MODE=autobahn
-    SIDE=server
+  global:
+    - CI_DEPS=codecov>=2.0.5
+    - CI_COMMANDS=codecov
 
 matrix:
   include:
-  - python: 2.7
-    env: MODE=pytest WSACCEL=0
-  - python: 3.6
-    env: MODE=pytest WSACCEL=0
-  - os: linux
-    language: generic
-    env: MODE=pytest PYPY_VERSION=pypy-5.8
-  - os: linux
-    language: generic
-    env: MODE=pytest PYPY_VERSION=pypy3.5-5.8-beta
-  - python: 3.6
-    env: MODE=docs
-  - python: 3.6
-    env: MODE=prospector
+    # Main tests on supported Python versions.
+    - python: 2.7
+      env: TOXENV=py27
+    - python: 3.5
+      env: TOXENV=py35
+    - python: 3.6
+      env: TOXENV=py36
+    - python: 2.7
+      env: TOXENV=py27 EXTRA_DEPS=wsaccel
+    - python: 3.5
+      env: TOXENV=py35 EXTRA_DEPS=wsaccel
+    - python: 3.6
+      env: TOXENV=py36 EXTRA_DEPS=wsaccel
+    - python: 2.7
+      env: TOXENV=autobahn EXTRA_DEPS=wsaccel SIDE=client
+    - python: 3.5
+      env: TOXENV=autobahn EXTRA_DEPS=wsaccel SIDE=client
+    - python: 3.6
+      env: TOXENV=autobahn EXTRA_DEPS=wsaccel SIDE=client
+    - python: 2.7
+      env: TOXENV=autobahn EXTRA_DEPS=wsaccel SIDE=server
+    - python: 3.5
+      env: TOXENV=autobahn EXTRA_DEPS=wsaccel SIDE=server
+    - python: 3.6
+      env: TOXENV=autobahn EXTRA_DEPS=wsaccel SIDE=server
+    - python: "pypy-5.7.1"
+      env: TOXENV=pypy
+    - python: "pypy3.5-5.7.1-beta"
+      env: TOXENV=pypy
 
-cache: pip
+    # Linting, docs, and other non-test stuff.
+    - python: 3.6
+      env: TOXENV=lint
+    - python: 3.6
+      env: TOXENV=docs
+    # - python: "2.7"
+    #   env: TOXENV=packaging
+
+install:
+  - "pip install -U pip setuptools"
+  - "pip install -U tox"
 
 script:
-  - "./.travis/run.sh"
+  - tox -- --verbose

Diff for: .travis.yml

@@ -1 +1,5 @@
-include README.rst LICENSE
+include README.rst LICENSE CONTRIBUTORS.rst HISTORY.rst tox.ini Pipfile
+recursive-include test *.py
+recursive-include compliance *.py *.json
+graft docs
+prune docs/build

Diff for: .travis/run.sh

@@ -92,8 +92,7 @@ def coverage(command, coverage_settings):
         return [sys.executable] + command
 
     return ([sys.executable, "-m", "coverage", "run",
-             "--include", coverage_settings["wsproto-path"],
-             "--rcfile", coverage_settings["coveragerc"]]
+             "--include", coverage_settings["wsproto-path"]]
             + command)
 
 def summarize(report_path):

Diff for: MANIFEST.in

@@ -1,2 +1,15 @@
 [wheel]
 universal = 1
+
+[tool:pytest]
+testpaths = test
+addopts = --capture=no --color=yes
+
+[coverage:run]
+branch = False
+
+[coverage:report]
+show_missing = True
+exclude_lines =
+    pragma: no cover
+    raise NotImplementedError()

Diff for: compliance/run-autobahn-tests.py

@@ -1,21 +1,48 @@
 [tox]
-envlist = py27, py35, py36, pypy, pypy3, lint, docs
+envlist = py27, py35, py36, pypy, lint, packaging, docs
 
 [testenv]
-deps = -r{toxinidir}/test_requirements.txt
-passenv = COVERAGE_FILE
-commands = pytest --cov {envsitepackagesdir}/wsproto --cov-report term-missing --cov-config {toxinidir}/.coveragerc {toxinidir}/test/
+deps =
+    pytest==3.2.1
+    pytest-cov==2.5.1
+    {env:CI_DEPS:}
+    {env:EXTRA_DEPS:}
+commands =
+    pytest --cov=wsproto {posargs}
+    {env:CI_COMMANDS:python -c ""}
+
+[testenv:pypy]
+# temporarily disable coverage testing on PyPy due to performance problems
+commands = pytest {posargs}
+
+[testenv:autobahn]
+deps =
+    {env:CI_DEPS:}
+    {env:EXTRA_DEPS:}
+changedir = {toxinidir}/compliance
+commands =
+    python run-autobahn-tests.py {env:SIDE:}
+    {env:CI_COMMANDS:python -c ""}
 
-[testenv:prospector]
+[testenv:lint]
 basepython = python3.6
-deps = prospector
+deps = prospector==0.12.7
 commands = prospector
 
 [testenv:docs]
 basepython = python3.6
-deps = sphinx==1.4.6
+deps = sphinx==1.4.9
 whitelist_externals = make
 changedir = {toxinidir}/docs
 commands =
     make clean
     make html
+
+[testenv:packaging]
+basepython=python2.7
+deps =
+   check-manifest==0.35
+   readme_renderer==17.2
+commands =
+   check-manifest
+   python setup.py check --metadata --restructuredtext --strict