update test env matrixci

re-enable windows on appveyor
enable osx on travis

1 files changed, 29 insertions, 7 deletions

diff --git a/tox.ini b/tox.ini
index ef4a703..1f68f4d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,13 +1,35 @@
 [tox]
-envlist = py27,py34,py35,py36,pypy
-skip_missing_interpreters = true
+envlist = py{36,35,34,27,py}
 
 [testenv]
 passenv = LANG
-commands = {env:TEST_RUNNER:pytest} {posargs}
 deps =
     pytest
-    colorama: colorama
-    coverage: coverage
-setenv =
-    coverage: TEST_RUNNER=coverage run -m pytest
+    coverage
+    colorama
+commands = coverage run -p -m pytest {posargs:tests}
+
+[testenv:docs-html]
+deps = sphinx
+commands = sphinx-build -W -b html -d {envtmpdir}/doctrees docs {envtmpdir}/html
+
+[testenv:docs-linkcheck]
+deps = sphinx
+commands = sphinx-build -W -b linkcheck -d {envtmpdir}/doctrees docs {envtmpdir}/linkcheck
+
+[testenv:coverage-report]
+deps = coverage
+skip_install = true
+commands =
+    coverage combine
+    coverage report
+    coverage html
+
+[testenv:codecov]
+passenv = CI TRAVIS TRAVIS_* APPVEYOR APPVEYOR_*
+deps = codecov
+skip_install = true
+commands =
+    coverage combine
+    coverage report
+    codecov