Merge branch 'master' into fix_889_and_non-ascii_in_setup.cfg_take_2

1 files changed, 47 insertions, 3 deletions

diff --git a/tox.ini b/tox.ini
index 4b4b4fd8..a2f850df 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,10 +2,54 @@
 #
 # To run Tox against all supported Python interpreters, you can set:
 #
-# export TOXENV='py2{6,7},py3{3,4,5,6},pypy'
+# export TOXENV='py27,py3{4,5,6},pypy,pypy3'
+
+[tox]
+envlist=python
 
 [testenv]
 deps=-rtests/requirements.txt
-passenv=APPDATA USERPROFILE HOMEDRIVE HOMEPATH windir APPVEYOR
-commands=py.test {posargs}
+# Changed from default (`python -m pip ...`)
+# to prevent the current working directory
+# from being added to `sys.path`.
+install_command={envbindir}/pip install {opts} {packages}
+# Same as above.
+list_dependencies_command={envbindir}/pip freeze
+setenv=COVERAGE_FILE={toxworkdir}/.coverage.{envname}
+# TODO: The passed environment variables came from copying other tox.ini files
+# These should probably be individually annotated to explain what needs them.
+passenv=APPDATA HOMEDRIVE HOMEPATH windir APPVEYOR APPVEYOR_* CI CODECOV_* TRAVIS TRAVIS_*
+commands=pytest --cov-config={toxinidir}/tox.ini --cov-report= {posargs}
 usedevelop=True
+
+
+[testenv:coverage]
+description=Combine coverage data and create report
+deps=coverage
+skip_install=True
+changedir={toxworkdir}
+setenv=COVERAGE_FILE=.coverage
+commands=coverage erase
+         coverage combine
+         coverage {posargs:xml}
+
+[testenv:codecov]
+description=[Only run on CI]: Upload coverage data to codecov
+deps=codecov
+skip_install=True
+commands=codecov -X gcov --file {toxworkdir}/coverage.xml
+
+[testenv:docs]
+deps = -r{toxinidir}/docs/requirements.txt
+skip_install=True
+commands =
+    python {toxinidir}/bootstrap.py
+    sphinx-build -W -b html -d {envtmpdir}/doctrees docs docs/build/html
+    sphinx-build -W -b man -d {envtmpdir}/doctrees docs docs/build/man
+
+[coverage:run]
+source=
+	pkg_resources
+	setuptools
+omit=
+	*/_vendor/*