Initial code.

tox.ini

@@ -4,45 +4,54 @@
 skip_missing_interpreters=True
 toxworkdir=build/
 envlist=
-        {py27,py33,py34,py35}-{tests,nomodules,coverage}-posix
-        py27-{tests,nomodules,coverage}-windows,
+        {py27,py33,py34,py35}-allmodules-{withcoverage,nocoverage}-posix
+        py27-allmodules-{withcoverage,nocoverage}-windows,
+        py27-nomodules-withcoverage,
         pyflakes,twistedchecker,apidocs,narrativedocs,topfile
 
 [testenv]
 changedir={envtmpdir}
 deps =
-     ; Some relatively standard dependencies that we want to have
-     ; We cannot use extras here, because it is not supported on Py3
-     {tests,coverage}: cryptography >= 0.9
-     {tests,coverage}: pyopenssl >= 0.13
-     {tests,coverage}: service_identity
-     {tests,coverage}: idna >= 0.6
-     {tests,coverage}: pyserial
-     {tests,coverage}: python-subunit
-     {tests,coverage}: pycrypto
-     {tests,coverage}: appdirs
-     {tests,coverage}: h2
-     {tests,coverage}: priority
+    ; Some relatively standard dependencies that we want to have
+    ; We cannot use extras here, because it is not supported on Py3
+    allmodules: cryptography >= 0.9
+    allmodules: pyopenssl >= 0.13
+    allmodules: service_identity
+    allmodules: idna >= 0.6
+    allmodules: pyserial
+    allmodules: python-subunit
+    allmodules: pycrypto
+    allmodules: appdirs
+    allmodules: h2
+    allmodules: priority
 
-     py27-{tests,coverage}-posix: pysqlite
-     py27-{tests,coverage}: soappy
+    py27-allmodules-posix: pysqlite
+    py27-allmodules: soappy
 
-     windows: pypiwin32
+    windows: pypiwin32
 
-     coverage: coverage
+    withcoverage: coverage
 
-     ; Code quality checkers
-     pyflakes: pyflakes
-     twistedchecker: twistedchecker
+    ; Code quality checkers
+    pyflakes: pyflakes
+    twistedchecker: twistedchecker
+
+    ; Documentation
+    apidocs: pydoctor
+    narrativedocs: sphinx
 
-     ; Documentation
-     apidocs: pydoctor
-     narrativedocs: sphinx
 setenv =
    COVERAGE_PROCESS_START = {toxinidir}/.coveragerc
 
 commands =
-    {tests,nomodules}: {envbindir}/trial --reactor={env:TWISTED_REACTOR:default} --reporter={env:TRIAL_REPORTER:verbose}  {posargs:twisted}
+    nocoverage: {envbindir}/trial --reactor={env:TWISTED_REACTOR:default} --reporter={env:TRIAL_REPORTER:verbose}  {posargs:twisted}
+
+    withcoverage: python {toxinidir}/admin/_copy.py {toxinidir}/admin/zz_coverage.pth {envsitepackagesdir}/zz_coverage.pth
+    withcoverage: coverage erase
+    withcoverage: coverage run -p --rcfile={toxinidir}/.coveragerc {envbindir}/trial --reactor={env:TWISTED_REACTOR:default} --reporter={env:TRIAL_REPORTER:verbose} {posargs:twisted.protocols}
+    withcoverage: python {toxinidir}/admin/_copy.py "_trial_temp/.coverage*" {toxinidir}
+    withcoverage: python {toxinidir}/admin/_copy.py ".coverage*" {toxinidir}
+
 
     twistedchecker: twistedchecker {posargs:twisted}
     pyflakes: pyflakes {posargs:twisted admin bin}
@@ -50,12 +59,6 @@ commands =
     apidocs: {toxinidir}/bin/admin/build-apidocs {toxinidir} apidocs
     narrativedocs: sphinx-build -aW -b html -d {toxinidir}/docs/_build {toxinidir}/docs {toxinidir}/docs/_build/
 
-    coverage: python {toxinidir}/admin/_copy.py {toxinidir}/admin/zz_coverage.pth {envsitepackagesdir}/zz_coverage.pth
-    coverage: coverage erase
-    coverage: coverage run -p --rcfile={toxinidir}/.coveragerc {envbindir}/trial --reactor={env:TWISTED_REACTOR:default} --reporter={env:TRIAL_REPORTER:verbose} {posargs:twisted}
-    coverage: python {toxinidir}/admin/_copy.py "_trial_temp/.coverage*" {toxinidir}
-    coverage: python {toxinidir}/admin/_copy.py ".coverage*" {toxinidir}
-
     topfile: python {toxinidir}/bin/admin/check-topfile "{toxinidir}"
 
 [testenv:twistedchecker]
@@ -73,7 +76,7 @@ changedir={toxinidir}
 [tox:travis]
 ; This section is used by tox-travis
 ; https://pypi.python.org/pypi/tox-travis
-2.7 = py27-coverage-posix,py27-nomodules-posix,topfile,narrativedocs,pyflakes
-3.3 = py33-coverage-posix
-3.4 = py34-coverage-posix
-3.5 = py35-coverage-posix
+2.7 = py27-allmodules-withcoverage-posix,py27-nomodules-withcoverage,topfile,narrativedocs,pyflakes
+3.3 = py33-allmodules-withcoverage-posix
+3.4 = py34-allmodules-withcoverage-posix
+3.5 = py35-allmodules-withcoverage-posix