Enable and fix Sphinx tests

This remove the Sphinx environment and makes sure we run its test for
all Python version. This therefore fixes the test for Python 3.3.

Change-Id: Iba431e837d2b23761905155ff65ae909774ce0b2

3 files changed, 305 insertions, 521 deletions

diff --git a/tox-tmpl.ini b/tox-tmpl.ini
index 533dbd5..b34f3b7 100644
--- a/tox-tmpl.ini
+++ b/tox-tmpl.ini
@@ -1,12 +1,18 @@
 # content of: tox.ini , put in same dir as setup.py
 [tox]
-envlist = py26,py26-nolxml,py27,py27-nolxml,py32,py32-nolxml,pypy,sphinxext,tg11,tg15,flask,cornice,coverage,py33,py33-nolxml,pecan-dev26,pecan-dev27,pecan-dev32,pecan-dev33,pep8
+envlist = py26,py26-nolxml,py27,py27-nolxml,py32,py32-nolxml,pypy,tg11,tg15,flask,cornice,coverage,py33,py33-nolxml,pecan-dev26,pecan-dev27,pecan-dev32,pecan-dev33,pep8
 
 [common]
 testtools=
     nose
     coverage
     pbr
+    webtest
+basedeps=
+    transaction
+    pecan
+    Sphinx
+
 
 [axes]
 python=py26,py27,py32,py33,pypy
@@ -17,24 +23,20 @@ json=json*,simplejson
 [axis:python]
 deps = 
     {[common]testtools}
-    webtest
-    transaction
+    {[common]basedeps}
     suds
-    pecan
 
 commands=
-    {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
+    {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
     {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
     {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 
 [axis:python:py26]
 deps = 
     {[common]testtools}
-    webtest
-    transaction
-    suds
-    pecan
     unittest2
+    {[common]basedeps}
+    suds
 basepython=python2.6
 
 [axis:python:py27]
@@ -45,30 +47,26 @@ basepython=python3.2
 
 deps = 
     {[common]testtools}
-    webtest
-    transaction
-    pecan
+    {[common]basedeps}
     https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip
 
 commands=
-    {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/pecantest --verbose {posargs}
-    {envbindir}/coverage xml -o coverage-{envname}.xml --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py
-    {envbindir}/coverage report --show-missing --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py
+    {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/pecantest tests/test_sphinxext.py --verbose {posargs}
+    {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
+    {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 
 [axis:python:py33]
 basepython=python3.3
 
 deps =
     {[common]testtools}
-    webtest
-    transaction
-    pecan
+    {[common]basedeps}
     https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip
 
 commands=
-    {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
-    {envbindir}/coverage xml -o coverage-{envname}.xml --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py
-    {envbindir}/coverage report --show-missing --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py
+    {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
+    {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
+    {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 
 [axis:sqlalchemy:sa5]
 deps=
@@ -101,20 +99,6 @@ deps=
 setenv=
     COVERAGE_FILE=.coverage.{envname}
 
-[testenv:sphinxext]
-basepython=python2.6
-deps=
-    pbr
-    nose
-    coverage
-    simplejson
-    Jinja2<=2.6.99
-    Sphinx
-commands=
-    {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml tests/test_sphinxext.py --verbose {posargs}
-    {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
-    {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
-
 [testenv:tg11]
 basepython=python2.6
 deps=
diff --git a/tox.ini b/tox.ini
index 37dced0..09d9126 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,30 +1,21 @@
 [tox]
-envlist = py26,py26-nolxml,py27,py27-nolxml,py32,py32-nolxml,pypy,sphinxext,tg11,tg15,flask,cornice,coverage,py33,py33-nolxml,pecan-dev26,pecan-dev27,pecan-dev32,pecan-dev33,pep8
+envlist = py26,py26-nolxml,py27,py27-nolxml,py32,py32-nolxml,pypy,tg11,tg15,flask,cornice,coverage,py33,py33-nolxml,pecan-dev26,pecan-dev27,pecan-dev32,pecan-dev33,pep8
 
 [common]
 testtools = 
 	nose
 	coverage
 	pbr
+	webtest
+basedeps = 
+	transaction
+	pecan
+	Sphinx
 
 [testenv]
 setenv = 
 	COVERAGE_FILE=.coverage.{envname}
 
-[testenv:sphinxext]
-basepython = python2.6
-deps = 
-	pbr
-	nose
-	coverage
-	simplejson
-	Jinja2<=2.6.99
-	Sphinx
-commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml tests/test_sphinxext.py --verbose {posargs}
-	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
-	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
-
 [testenv:tg11]
 basepython = python2.6
 deps = 
@@ -158,397 +149,347 @@ deps =
 
 [testenv:py26-sa5-lxml-json]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 basepython = python2.6
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
-	suds
-	pecan
 	unittest2
+	{[common]basedeps}
+	suds
 	SQLAlchemy<=0.5.99
 	lxml
 
 [testenv:py26-sa5]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 basepython = python2.6
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
-	suds
-	pecan
 	unittest2
+	{[common]basedeps}
+	suds
 	SQLAlchemy<=0.5.99
 	lxml
 
 [testenv:py26-sa5-lxml-simplejson]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 basepython = python2.6
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
-	suds
-	pecan
 	unittest2
+	{[common]basedeps}
+	suds
 	SQLAlchemy<=0.5.99
 	lxml
 	simplejson
 
 [testenv:py26-sa5-simplejson]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 basepython = python2.6
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
-	suds
-	pecan
 	unittest2
+	{[common]basedeps}
+	suds
 	SQLAlchemy<=0.5.99
 	lxml
 	simplejson
 
 [testenv:py26-sa5-nolxml-json]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 basepython = python2.6
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
-	suds
-	pecan
 	unittest2
+	{[common]basedeps}
+	suds
 	SQLAlchemy<=0.5.99
 
 [testenv:py26-sa5-nolxml]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 basepython = python2.6
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
-	suds
-	pecan
 	unittest2
+	{[common]basedeps}
+	suds
 	SQLAlchemy<=0.5.99
 
 [testenv:py26-sa5-nolxml-simplejson]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 basepython = python2.6
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
-	suds
-	pecan
 	unittest2
+	{[common]basedeps}
+	suds
 	SQLAlchemy<=0.5.99
 	simplejson
 
 [testenv:py26-sa6-lxml-json]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 basepython = python2.6
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
-	suds
-	pecan
 	unittest2
+	{[common]basedeps}
+	suds
 	SQLAlchemy<=0.6.99
 	lxml
 
 [testenv:py26-sa6]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 basepython = python2.6
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
-	suds
-	pecan
 	unittest2
+	{[common]basedeps}
+	suds
 	SQLAlchemy<=0.6.99
 	lxml
 
 [testenv:py26-sa6-lxml-simplejson]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 basepython = python2.6
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
-	suds
-	pecan
 	unittest2
+	{[common]basedeps}
+	suds
 	SQLAlchemy<=0.6.99
 	lxml
 	simplejson
 
 [testenv:py26-sa6-simplejson]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 basepython = python2.6
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
-	suds
-	pecan
 	unittest2
+	{[common]basedeps}
+	suds
 	SQLAlchemy<=0.6.99
 	lxml
 	simplejson
 
 [testenv:py26-sa6-nolxml-json]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 basepython = python2.6
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
-	suds
-	pecan
 	unittest2
+	{[common]basedeps}
+	suds
 	SQLAlchemy<=0.6.99
 
 [testenv:py26-sa6-nolxml]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 basepython = python2.6
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
-	suds
-	pecan
 	unittest2
+	{[common]basedeps}
+	suds
 	SQLAlchemy<=0.6.99
 
 [testenv:py26-sa6-nolxml-simplejson]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 basepython = python2.6
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
-	suds
-	pecan
 	unittest2
+	{[common]basedeps}
+	suds
 	SQLAlchemy<=0.6.99
 	simplejson
 
 [testenv:py26-sa7-lxml-json]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 basepython = python2.6
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
-	suds
-	pecan
 	unittest2
+	{[common]basedeps}
+	suds
 	SQLAlchemy<=0.7.99
 	lxml
 
 [testenv:py26]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 basepython = python2.6
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
-	suds
-	pecan
 	unittest2
+	{[common]basedeps}
+	suds
 	SQLAlchemy<=0.7.99
 	lxml
 
 [testenv:py26-sa7-lxml-simplejson]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 basepython = python2.6
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
-	suds
-	pecan
 	unittest2
+	{[common]basedeps}
+	suds
 	SQLAlchemy<=0.7.99
 	lxml
 	simplejson
 
 [testenv:py26-simplejson]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 basepython = python2.6
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
-	suds
-	pecan
 	unittest2
+	{[common]basedeps}
+	suds
 	SQLAlchemy<=0.7.99
 	lxml
 	simplejson
 
 [testenv:py26-sa7-nolxml-json]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 basepython = python2.6
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
-	suds
-	pecan
 	unittest2
+	{[common]basedeps}
+	suds
 	SQLAlchemy<=0.7.99
 
 [testenv:py26-nolxml]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 basepython = python2.6
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
-	suds
-	pecan
 	unittest2
+	{[common]basedeps}
+	suds
 	SQLAlchemy<=0.7.99
 
 [testenv:py26-sa7-nolxml-simplejson]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 basepython = python2.6
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
-	suds
-	pecan
 	unittest2
+	{[common]basedeps}
+	suds
 	SQLAlchemy<=0.7.99
 	simplejson
 
 [testenv:py26-nolxml-simplejson]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 basepython = python2.6
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
-	suds
-	pecan
 	unittest2
+	{[common]basedeps}
+	suds
 	SQLAlchemy<=0.7.99
 	simplejson
 
 [testenv:py27-sa5-lxml-json]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
+	{[common]basedeps}
 	suds
-	pecan
 	SQLAlchemy<=0.5.99
 	lxml
 basepython = python2.7
 
 [testenv:py27-sa5]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
+	{[common]basedeps}
 	suds
-	pecan
 	SQLAlchemy<=0.5.99
 	lxml
 basepython = python2.7
 
 [testenv:py27-sa5-lxml-simplejson]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
+	{[common]basedeps}
 	suds
-	pecan
 	SQLAlchemy<=0.5.99
 	lxml
 	simplejson
@@ -556,15 +497,13 @@ basepython = python2.7
 
 [testenv:py27-sa5-simplejson]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
+	{[common]basedeps}
 	suds
-	pecan
 	SQLAlchemy<=0.5.99
 	lxml
 	simplejson
@@ -572,88 +511,76 @@ basepython = python2.7
 
 [testenv:py27-sa5-nolxml-json]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
+	{[common]basedeps}
 	suds
-	pecan
 	SQLAlchemy<=0.5.99
 basepython = python2.7
 
 [testenv:py27-sa5-nolxml]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
+	{[common]basedeps}
 	suds
-	pecan
 	SQLAlchemy<=0.5.99
 basepython = python2.7
 
 [testenv:py27-sa5-nolxml-simplejson]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
+	{[common]basedeps}
 	suds
-	pecan
 	SQLAlchemy<=0.5.99
 	simplejson
 basepython = python2.7
 
 [testenv:py27-sa6-lxml-json]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
+	{[common]basedeps}
 	suds
-	pecan
 	SQLAlchemy<=0.6.99
 	lxml
 basepython = python2.7
 
 [testenv:py27-sa6]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
+	{[common]basedeps}
 	suds
-	pecan
 	SQLAlchemy<=0.6.99
 	lxml
 basepython = python2.7
 
 [testenv:py27-sa6-lxml-simplejson]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
+	{[common]basedeps}
 	suds
-	pecan
 	SQLAlchemy<=0.6.99
 	lxml
 	simplejson
@@ -661,15 +588,13 @@ basepython = python2.7
 
 [testenv:py27-sa6-simplejson]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
+	{[common]basedeps}
 	suds
-	pecan
 	SQLAlchemy<=0.6.99
 	lxml
 	simplejson
@@ -677,88 +602,76 @@ basepython = python2.7
 
 [testenv:py27-sa6-nolxml-json]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
+	{[common]basedeps}
 	suds
-	pecan
 	SQLAlchemy<=0.6.99
 basepython = python2.7
 
 [testenv:py27-sa6-nolxml]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
+	{[common]basedeps}
 	suds
-	pecan
 	SQLAlchemy<=0.6.99
 basepython = python2.7
 
 [testenv:py27-sa6-nolxml-simplejson]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
+	{[common]basedeps}
 	suds
-	pecan
 	SQLAlchemy<=0.6.99
 	simplejson
 basepython = python2.7
 
 [testenv:py27-sa7-lxml-json]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
+	{[common]basedeps}
 	suds
-	pecan
 	SQLAlchemy<=0.7.99
 	lxml
 basepython = python2.7
 
 [testenv:py27]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
+	{[common]basedeps}
 	suds
-	pecan
 	SQLAlchemy<=0.7.99
 	lxml
 basepython = python2.7
 
 [testenv:py27-sa7-lxml-simplejson]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
+	{[common]basedeps}
 	suds
-	pecan
 	SQLAlchemy<=0.7.99
 	lxml
 	simplejson
@@ -766,15 +679,13 @@ basepython = python2.7
 
 [testenv:py27-simplejson]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
+	{[common]basedeps}
 	suds
-	pecan
 	SQLAlchemy<=0.7.99
 	lxml
 	simplejson
@@ -782,72 +693,62 @@ basepython = python2.7
 
 [testenv:py27-sa7-nolxml-json]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
+	{[common]basedeps}
 	suds
-	pecan
 	SQLAlchemy<=0.7.99
 basepython = python2.7
 
 [testenv:py27-nolxml]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
+	{[common]basedeps}
 	suds
-	pecan
 	SQLAlchemy<=0.7.99
 basepython = python2.7
 
 [testenv:py27-sa7-nolxml-simplejson]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
+	{[common]basedeps}
 	suds
-	pecan
 	SQLAlchemy<=0.7.99
 	simplejson
 basepython = python2.7
 
 [testenv:py27-nolxml-simplejson]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
+	{[common]basedeps}
 	suds
-	pecan
 	SQLAlchemy<=0.7.99
 	simplejson
 basepython = python2.7
 
 [testenv:py32-sa6-lxml-json]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/pecantest --verbose {posargs}
-	{envbindir}/coverage xml -o coverage-{envname}.xml --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py
-	{envbindir}/coverage report --show-missing --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py
+	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/pecantest tests/test_sphinxext.py --verbose {posargs}
+	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
+	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
-	pecan
+	{[common]basedeps}
 	https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip
 	SQLAlchemy<=0.6.99
 	lxml
@@ -855,14 +756,12 @@ basepython = python3.2
 
 [testenv:py32-sa6]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/pecantest --verbose {posargs}
-	{envbindir}/coverage xml -o coverage-{envname}.xml --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py
-	{envbindir}/coverage report --show-missing --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py
+	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/pecantest tests/test_sphinxext.py --verbose {posargs}
+	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
+	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
-	pecan
+	{[common]basedeps}
 	https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip
 	SQLAlchemy<=0.6.99
 	lxml
@@ -870,42 +769,36 @@ basepython = python3.2
 
 [testenv:py32-sa6-nolxml-json]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/pecantest --verbose {posargs}
-	{envbindir}/coverage xml -o coverage-{envname}.xml --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py
-	{envbindir}/coverage report --show-missing --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py
+	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/pecantest tests/test_sphinxext.py --verbose {posargs}
+	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
+	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
-	pecan
+	{[common]basedeps}
 	https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip
 	SQLAlchemy<=0.6.99
 basepython = python3.2
 
 [testenv:py32-sa6-nolxml]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/pecantest --verbose {posargs}
-	{envbindir}/coverage xml -o coverage-{envname}.xml --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py
-	{envbindir}/coverage report --show-missing --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py
+	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/pecantest tests/test_sphinxext.py --verbose {posargs}
+	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
+	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
-	pecan
+	{[common]basedeps}
 	https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip
 	SQLAlchemy<=0.6.99
 basepython = python3.2
 
 [testenv:py32-sa7-lxml-json]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/pecantest --verbose {posargs}
-	{envbindir}/coverage xml -o coverage-{envname}.xml --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py
-	{envbindir}/coverage report --show-missing --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py
+	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/pecantest tests/test_sphinxext.py --verbose {posargs}
+	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
+	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
-	pecan
+	{[common]basedeps}
 	https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip
 	SQLAlchemy<=0.7.99
 	lxml
@@ -913,14 +806,12 @@ basepython = python3.2
 
 [testenv:py32]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/pecantest --verbose {posargs}
-	{envbindir}/coverage xml -o coverage-{envname}.xml --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py
-	{envbindir}/coverage report --show-missing --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py
+	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/pecantest tests/test_sphinxext.py --verbose {posargs}
+	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
+	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
-	pecan
+	{[common]basedeps}
 	https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip
 	SQLAlchemy<=0.7.99
 	lxml
@@ -928,42 +819,36 @@ basepython = python3.2
 
 [testenv:py32-sa7-nolxml-json]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/pecantest --verbose {posargs}
-	{envbindir}/coverage xml -o coverage-{envname}.xml --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py
-	{envbindir}/coverage report --show-missing --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py
+	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/pecantest tests/test_sphinxext.py --verbose {posargs}
+	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
+	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
-	pecan
+	{[common]basedeps}
 	https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip
 	SQLAlchemy<=0.7.99
 basepython = python3.2
 
 [testenv:py32-nolxml]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/pecantest --verbose {posargs}
-	{envbindir}/coverage xml -o coverage-{envname}.xml --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py
-	{envbindir}/coverage report --show-missing --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py
+	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/pecantest tests/test_sphinxext.py --verbose {posargs}
+	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
+	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
-	pecan
+	{[common]basedeps}
 	https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip
 	SQLAlchemy<=0.7.99
 basepython = python3.2
 
 [testenv:py33-sa5-lxml-json]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
-	{envbindir}/coverage xml -o coverage-{envname}.xml --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py
-	{envbindir}/coverage report --show-missing --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py
+	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
+	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
+	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
-	pecan
+	{[common]basedeps}
 	https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip
 	SQLAlchemy<=0.5.99
 	lxml
@@ -971,14 +856,12 @@ basepython = python3.3
 
 [testenv:py33-sa5]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
-	{envbindir}/coverage xml -o coverage-{envname}.xml --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py
-	{envbindir}/coverage report --show-missing --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py
+	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
+	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
+	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
-	pecan
+	{[common]basedeps}
 	https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip
 	SQLAlchemy<=0.5.99
 	lxml
@@ -986,14 +869,12 @@ basepython = python3.3
 
 [testenv:py33-sa5-lxml-simplejson]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
-	{envbindir}/coverage xml -o coverage-{envname}.xml --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py
-	{envbindir}/coverage report --show-missing --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py
+	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
+	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
+	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
-	pecan
+	{[common]basedeps}
 	https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip
 	SQLAlchemy<=0.5.99
 	lxml
@@ -1002,14 +883,12 @@ basepython = python3.3
 
 [testenv:py33-sa5-simplejson]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
-	{envbindir}/coverage xml -o coverage-{envname}.xml --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py
-	{envbindir}/coverage report --show-missing --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py
+	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
+	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
+	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
-	pecan
+	{[common]basedeps}
 	https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip
 	SQLAlchemy<=0.5.99
 	lxml
@@ -1018,42 +897,36 @@ basepython = python3.3
 
 [testenv:py33-sa5-nolxml-json]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
-	{envbindir}/coverage xml -o coverage-{envname}.xml --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py
-	{envbindir}/coverage report --show-missing --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py
+	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
+	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
+	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
-	pecan
+	{[common]basedeps}
 	https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip
 	SQLAlchemy<=0.5.99
 basepython = python3.3
 
 [testenv:py33-sa5-nolxml]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
-	{envbindir}/coverage xml -o coverage-{envname}.xml --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py
-	{envbindir}/coverage report --show-missing --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py
+	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
+	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
+	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
-	pecan
+	{[common]basedeps}
 	https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip
 	SQLAlchemy<=0.5.99
 basepython = python3.3
 
 [testenv:py33-sa5-nolxml-simplejson]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
-	{envbindir}/coverage xml -o coverage-{envname}.xml --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py
-	{envbindir}/coverage report --show-missing --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py
+	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
+	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
+	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
-	pecan
+	{[common]basedeps}
 	https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip
 	SQLAlchemy<=0.5.99
 	simplejson
@@ -1061,14 +934,12 @@ basepython = python3.3
 
 [testenv:py33-sa6-lxml-json]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
-	{envbindir}/coverage xml -o coverage-{envname}.xml --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py
-	{envbindir}/coverage report --show-missing --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py
+	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
+	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
+	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
-	pecan
+	{[common]basedeps}
 	https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip
 	SQLAlchemy<=0.6.99
 	lxml
@@ -1076,14 +947,12 @@ basepython = python3.3
 
 [testenv:py33-sa6]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
-	{envbindir}/coverage xml -o coverage-{envname}.xml --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py
-	{envbindir}/coverage report --show-missing --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py
+	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
+	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
+	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
-	pecan
+	{[common]basedeps}
 	https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip
 	SQLAlchemy<=0.6.99
 	lxml
@@ -1091,14 +960,12 @@ basepython = python3.3
 
 [testenv:py33-sa6-lxml-simplejson]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
-	{envbindir}/coverage xml -o coverage-{envname}.xml --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py
-	{envbindir}/coverage report --show-missing --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py
+	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
+	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
+	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
-	pecan
+	{[common]basedeps}
 	https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip
 	SQLAlchemy<=0.6.99
 	lxml
@@ -1107,14 +974,12 @@ basepython = python3.3
 
 [testenv:py33-sa6-simplejson]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
-	{envbindir}/coverage xml -o coverage-{envname}.xml --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py
-	{envbindir}/coverage report --show-missing --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py
+	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
+	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
+	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
-	pecan
+	{[common]basedeps}
 	https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip
 	SQLAlchemy<=0.6.99
 	lxml
@@ -1123,42 +988,36 @@ basepython = python3.3
 
 [testenv:py33-sa6-nolxml-json]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
-	{envbindir}/coverage xml -o coverage-{envname}.xml --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py
-	{envbindir}/coverage report --show-missing --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py
+	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
+	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
+	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
-	pecan
+	{[common]basedeps}
 	https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip
 	SQLAlchemy<=0.6.99
 basepython = python3.3
 
 [testenv:py33-sa6-nolxml]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
-	{envbindir}/coverage xml -o coverage-{envname}.xml --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py
-	{envbindir}/coverage report --show-missing --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py
+	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
+	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
+	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
-	pecan
+	{[common]basedeps}
 	https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip
 	SQLAlchemy<=0.6.99
 basepython = python3.3
 
 [testenv:py33-sa6-nolxml-simplejson]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
-	{envbindir}/coverage xml -o coverage-{envname}.xml --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py
-	{envbindir}/coverage report --show-missing --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py
+	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
+	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
+	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
-	pecan
+	{[common]basedeps}
 	https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip
 	SQLAlchemy<=0.6.99
 	simplejson
@@ -1166,14 +1025,12 @@ basepython = python3.3
 
 [testenv:py33-sa7-lxml-json]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
-	{envbindir}/coverage xml -o coverage-{envname}.xml --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py
-	{envbindir}/coverage report --show-missing --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py
+	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
+	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
+	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
-	pecan
+	{[common]basedeps}
 	https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip
 	SQLAlchemy<=0.7.99
 	lxml
@@ -1181,14 +1038,12 @@ basepython = python3.3
 
 [testenv:py33]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
-	{envbindir}/coverage xml -o coverage-{envname}.xml --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py
-	{envbindir}/coverage report --show-missing --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py
+	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
+	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
+	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
-	pecan
+	{[common]basedeps}
 	https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip
 	SQLAlchemy<=0.7.99
 	lxml
@@ -1196,14 +1051,12 @@ basepython = python3.3
 
 [testenv:py33-sa7-lxml-simplejson]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
-	{envbindir}/coverage xml -o coverage-{envname}.xml --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py
-	{envbindir}/coverage report --show-missing --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py
+	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
+	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
+	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
-	pecan
+	{[common]basedeps}
 	https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip
 	SQLAlchemy<=0.7.99
 	lxml
@@ -1212,14 +1065,12 @@ basepython = python3.3
 
 [testenv:py33-simplejson]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
-	{envbindir}/coverage xml -o coverage-{envname}.xml --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py
-	{envbindir}/coverage report --show-missing --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py
+	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
+	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
+	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
-	pecan
+	{[common]basedeps}
 	https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip
 	SQLAlchemy<=0.7.99
 	lxml
@@ -1228,42 +1079,36 @@ basepython = python3.3
 
 [testenv:py33-sa7-nolxml-json]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
-	{envbindir}/coverage xml -o coverage-{envname}.xml --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py
-	{envbindir}/coverage report --show-missing --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py
+	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
+	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
+	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
-	pecan
+	{[common]basedeps}
 	https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip
 	SQLAlchemy<=0.7.99
 basepython = python3.3
 
 [testenv:py33-nolxml]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
-	{envbindir}/coverage xml -o coverage-{envname}.xml --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py
-	{envbindir}/coverage report --show-missing --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py
+	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
+	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
+	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
-	pecan
+	{[common]basedeps}
 	https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip
 	SQLAlchemy<=0.7.99
 basepython = python3.3
 
 [testenv:py33-sa7-nolxml-simplejson]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
-	{envbindir}/coverage xml -o coverage-{envname}.xml --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py
-	{envbindir}/coverage report --show-missing --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py
+	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
+	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
+	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
-	pecan
+	{[common]basedeps}
 	https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip
 	SQLAlchemy<=0.7.99
 	simplejson
@@ -1271,14 +1116,12 @@ basepython = python3.3
 
 [testenv:py33-nolxml-simplejson]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
-	{envbindir}/coverage xml -o coverage-{envname}.xml --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py
-	{envbindir}/coverage report --show-missing --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py
+	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
+	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
+	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
-	pecan
+	{[common]basedeps}
 	https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip
 	SQLAlchemy<=0.7.99
 	simplejson
@@ -1286,309 +1129,265 @@ basepython = python3.3
 
 [testenv:pypy-sa5-lxml-json]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
+	{[common]basedeps}
 	suds
-	pecan
 	SQLAlchemy<=0.5.99
 	lxml
 
 [testenv:pypy-sa5]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
+	{[common]basedeps}
 	suds
-	pecan
 	SQLAlchemy<=0.5.99
 	lxml
 
 [testenv:pypy-sa5-lxml-simplejson]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
+	{[common]basedeps}
 	suds
-	pecan
 	SQLAlchemy<=0.5.99
 	lxml
 	simplejson
 
 [testenv:pypy-sa5-simplejson]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
+	{[common]basedeps}
 	suds
-	pecan
 	SQLAlchemy<=0.5.99
 	lxml
 	simplejson
 
 [testenv:pypy-sa5-nolxml-json]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
+	{[common]basedeps}
 	suds
-	pecan
 	SQLAlchemy<=0.5.99
 
 [testenv:pypy-sa5-nolxml]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
+	{[common]basedeps}
 	suds
-	pecan
 	SQLAlchemy<=0.5.99
 
 [testenv:pypy-sa5-nolxml-simplejson]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
+	{[common]basedeps}
 	suds
-	pecan
 	SQLAlchemy<=0.5.99
 	simplejson
 
 [testenv:pypy-sa6-lxml-json]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
+	{[common]basedeps}
 	suds
-	pecan
 	SQLAlchemy<=0.6.99
 	lxml
 
 [testenv:pypy-sa6]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
+	{[common]basedeps}
 	suds
-	pecan
 	SQLAlchemy<=0.6.99
 	lxml
 
 [testenv:pypy-sa6-lxml-simplejson]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
+	{[common]basedeps}
 	suds
-	pecan
 	SQLAlchemy<=0.6.99
 	lxml
 	simplejson
 
 [testenv:pypy-sa6-simplejson]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
+	{[common]basedeps}
 	suds
-	pecan
 	SQLAlchemy<=0.6.99
 	lxml
 	simplejson
 
 [testenv:pypy-sa6-nolxml-json]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
+	{[common]basedeps}
 	suds
-	pecan
 	SQLAlchemy<=0.6.99
 
 [testenv:pypy-sa6-nolxml]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
+	{[common]basedeps}
 	suds
-	pecan
 	SQLAlchemy<=0.6.99
 
 [testenv:pypy-sa6-nolxml-simplejson]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
+	{[common]basedeps}
 	suds
-	pecan
 	SQLAlchemy<=0.6.99
 	simplejson
 
 [testenv:pypy-sa7-lxml-json]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
+	{[common]basedeps}
 	suds
-	pecan
 	SQLAlchemy<=0.7.99
 	lxml
 
 [testenv:pypy]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
+	{[common]basedeps}
 	suds
-	pecan
 	SQLAlchemy<=0.7.99
 	lxml
 
 [testenv:pypy-sa7-lxml-simplejson]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
+	{[common]basedeps}
 	suds
-	pecan
 	SQLAlchemy<=0.7.99
 	lxml
 	simplejson
 
 [testenv:pypy-simplejson]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
+	{[common]basedeps}
 	suds
-	pecan
 	SQLAlchemy<=0.7.99
 	lxml
 	simplejson
 
 [testenv:pypy-sa7-nolxml-json]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
+	{[common]basedeps}
 	suds
-	pecan
 	SQLAlchemy<=0.7.99
 
 [testenv:pypy-nolxml]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
+	{[common]basedeps}
 	suds
-	pecan
 	SQLAlchemy<=0.7.99
 
 [testenv:pypy-sa7-nolxml-simplejson]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
+	{[common]basedeps}
 	suds
-	pecan
 	SQLAlchemy<=0.7.99
 	simplejson
 
 [testenv:pypy-nolxml-simplejson]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
 	{[common]testtools}
-	webtest
-	transaction
+	{[common]basedeps}
 	suds
-	pecan
 	SQLAlchemy<=0.7.99
 	simplejson
 
diff --git a/wsmeext/sphinxext.py b/wsmeext/sphinxext.py
index f905e9a..03e096c 100644
--- a/wsmeext/sphinxext.py
+++ b/wsmeext/sphinxext.py
@@ -2,6 +2,8 @@ import inspect
 import re
 import sys
 
+import six
+
 from sphinx import addnodes
 from sphinx.ext import autodoc
 from sphinx.domains.python import PyClasslike, PyClassmember
@@ -37,7 +39,7 @@ def datatypename(datatype):
 
 def make_sample_object(datatype):
     if datatype is wsme.types.bytes:
-        return 'samplestring'
+        return six.b('samplestring')
     if datatype is wsme.types.text:
         return u'sample unicode'
     if datatype is int:
@@ -223,8 +225,6 @@ class TypeDocumenter(autodoc.ClassDocumenter):
         # Check where to include the samples
         samples_slot = self.options.samples_slot or self.default_samples_slot
 
-        print 'SAMPLES SLOT:', self.options.samples_slot
-
         def add_docstring():
             super(TypeDocumenter, self).add_content(
                 more_content, no_docstring)
@@ -250,8 +250,9 @@ class TypeDocumenter(autodoc.ClassDocumenter):
                         u'    .. code-block:: ' + language,
                         u'',
                     ])
-                    content.extend((
-                        u' ' * 8 + line for line in sample.split('\n')))
+                    content.extend(
+                        u' ' * 8 + line
+                        for line in six.text_type(sample).split('\n'))
             for line in content:
                 self.add_line(line, u'<wsmeext.sphinxext')