Merge pull request #19 from zopefoundation/doctest-all-the-things

100% coverage, run doctests everywhere, drop 'setup.py test' and Py 3.3

1 files changed, 22 insertions, 29 deletions

diff --git a/tox.ini b/tox.ini
index 8669b87..fda63e1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,34 +1,13 @@
 [tox]
 envlist =
-# Jython support pending 2.7 support, due 2012-07-15 or so.  See:
-# http://fwierzbicki.blogspot.com/2012/03/adconion-to-fund-jython-27.html
-#   py27,jython,pypy,coverage
-    py27,py27-pure,py33,py33-pure,py34,py35,py36,pypy,coverage,docs
+    py27,py27-pure,py34,py35,py36,py36-pure,pypy,coverage,docs
 
 [testenv]
-commands =
-    zope-testrunner --test-path=src
 deps =
-     .[test]
-     zope.testrunner
-
-[testenv:py27-pure]
-basepython =
-    python2.7
-setenv =
-    PURE_PYTHON = 1
-    PIP_CACHE_DIR = {envdir}/.cache
-
-[testenv:py33-pure]
-basepython =
-    python3.3
-setenv =
-    PURE_PYTHON = 1
-    PIP_CACHE_DIR = {envdir}/.cache
-
-[testenv:jython]
+    .[test,docs]
 commands =
-   jython setup.py test -q
+    zope-testrunner --test-path=src
+    sphinx-build -b doctest -d {envdir}/doctrees docs {envdir}/doctest
 
 [testenv:coverage]
 basepython =
@@ -39,9 +18,10 @@ commands =
 #   version, before running nosetests.
     pip uninstall -y zope.proxy
     pip install -e .
-    nosetests --with-xunit --with-xcoverage
+    coverage run -m zope.testrunner --test-path=src
 deps =
-    .[testing]
+    .[test]
+    coverage
 
 [testenv:docs]
 basepython =
@@ -50,5 +30,18 @@ commands =
     sphinx-build -b html -d docs/_build/doctrees docs docs/_build/html
     sphinx-build -b doctest -d docs/_build/doctrees docs docs/_build/doctest
 deps =
-    Sphinx
-    repoze.sphinx.autointerface
+    .[test,docs]
+
+[testenv:py27-pure]
+basepython =
+    python2.7
+setenv =
+    PURE_PYTHON = 1
+    PIP_CACHE_DIR = {envdir}/.cache
+
+[testenv:py36-pure]
+basepython =
+    python3.6
+setenv =
+    PURE_PYTHON = 1
+    PIP_CACHE_DIR = {envdir}/.cache