Fix tox and travis by using zope.testrunner

DRY with regards to dependencies. This lets us simplify travis to not
use Tox which in turn lets us easily enable coveralls.

Fixes #26

1 files changed, 6 insertions, 35 deletions

diff --git a/tox.ini b/tox.ini
index f4e5734..b1721bb 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,42 +2,29 @@
 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,py27-minimal,py27-pure,pypy,py33,py34,py34-pure,py35,py35-pure,pypy3,coverage,docs
+    py27,py27-minimal,py27-pure,pypy,py33,py34,py34-pure,py35,py35-pure,py36,pypy3,coverage,docs
 
 [mindeps]
 deps =
-    zope.event
-    zope.hookable
-    zope.i18nmessageid
-    zope.interface
-    zope.schema
-    zope.configuration
+    .[mintests]
 
 [fulldeps]
 deps =
-    {[mindeps]deps}
-    persistent
-    zope.location
-    zope.proxy
-    zope.security
-    zope.testing
+    .[test]
 
 [testenv]
 deps =
     {[fulldeps]deps}
 commands =
-    python setup.py -q test -q
+    zope-testrunner --test-path=src
 
 [testenv:py27-minimal]
-usedevelop = true
 basepython =
     python2.7
 deps =
     {[mindeps]deps}
-    ordereddict
-    nose
 commands =
-    nosetests -I persistentregistry -I security
+    zope-testrunner --test-path=src -t !persistentregistry -t !security
 
 [testenv:py34-pure]
 basepython =
@@ -60,18 +47,6 @@ setenv =
     PURE_PYTHON = 1
     PIP_CACHE_DIR = {envdir}/.cache
 
-[testenv:coverage]
-usedevelop = true
-basepython =
-    python2.7
-commands =
-    nosetests --with-xunit --with-xcoverage
-deps =
-    {[fulldeps]deps}
-    nose
-    coverage
-    nosexcover
-
 [testenv:docs]
 basepython =
     python2.7
@@ -80,8 +55,4 @@ commands =
     sphinx-build -b doctest -d docs/_build/doctrees docs docs/_build/doctest
 deps =
     {[fulldeps]deps}
-    ZODB3
-    Sphinx
-    repoze.sphinx.autointerface
-#   Ugh.  Need this for docs/testlayer.rst
-    zope.testrunner
+    .[docs]