Merge "Update the tox.ini template and regenerate tox.ini"

doc/changes.rst

@@ -1,6 +1,12 @@
 Changes
 =======
 
+0.9.4 (future)
+--------------
+
+* SQLAlchemy support is deprecated and will be removed in one of the next
+  releases. It has never actually worked to begin with.
+
 0.8.0 (2015-08-25)
 ------------------
 

tox-tmpl.ini

@@ -1,6 +1,6 @@
 # content of: tox.ini , put in same dir as setup.py
 [tox]
-envlist = py27,py27-nolxml,pypy,tg11,tg15,cornice,cornice-py3,coverage,py35,py35-nolxml,pecan-dev27,pecan-dev35,pep8
+envlist = py27,py27-nolxml,pypy,cornice,cornice-py3,coverage,py36,py35,py36-nolxml,py35-nolxml,pecan-dev27,pecan-dev35,pecan-dev36,pep8
 
 [common]
 testtools=
@@ -15,10 +15,10 @@ basedeps=
     Sphinx < 1.2.99
     Flask
     flask-restful
+    SQLAlchemy<=0.7.99
 
 [axes]
-python=py27,py35,pypy
+python=py27,py35,py36,pypy
-sqlalchemy=sa5,sa6,sa7*
 lxml=lxml*,nolxml
 json=json*,simplejson
 
@@ -30,7 +30,6 @@ deps =
 
 commands=
     {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.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:py27]
@@ -39,17 +38,8 @@ basepython=python2.7
 [axis:python:py35]
 basepython=python3.5
 
-[axis:sqlalchemy:sa5]
+[axis:python:py36]
-deps=
+basepython=python3.6
-    SQLAlchemy<=0.5.99
-
-[axis:sqlalchemy:sa6]
-deps=
-    SQLAlchemy<=0.6.99
-
-[axis:sqlalchemy:sa7]
-deps=
-    SQLAlchemy<=0.7.99
 
 [axis:json:simplejson]
 deps=
@@ -77,7 +67,7 @@ commands=
     {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsmeext/cornice.py
 
 [testenv:cornice-py3]
-basepython = python3.5
+basepython = python3.6
 usedevelop = {[testenv:cornice]usedevelop}
 deps = {[testenv:cornice]deps}
 # disable hash randomization
@@ -92,7 +82,7 @@ deps=
     {[common]testtools}
     transaction
     suds-jurko
-    https://github.com/stackforge/pecan/zipball/master
+    https://github.com/pecan/pecan/zipball/master
 
 [testenv:pecan-dev27]
 basepython=python2.7
@@ -106,8 +96,14 @@ deps={[testenv:pecan-dev-base]deps}
 commands=
     {envbindir}/nosetests tests/pecantest --with-xunit --xunit-file nosetests-{envname}.xml --verbose {posargs}
 
+[testenv:pecan-dev36]
+basepython=python3.6
+deps={[testenv:pecan-dev-base]deps}
+commands=
+    {envbindir}/nosetests tests/pecantest --with-xunit --xunit-file nosetests-{envname}.xml --verbose {posargs}
+
 [testenv:coverage]
-basepython=python
+basepython=python3
 deps=
     coverage < 3.99
 setenv=
@@ -119,6 +115,7 @@ commands=
     {envbindir}/coverage report --show-missing wsme/*.py wsme/protocols/*.py wsmeext/*.py
 
 [testenv:doc]
+basepython=python3
 deps=
     cloud_sptheme
     Sphinx < 1.2.99
@@ -130,6 +127,7 @@ commands=
     make clean ziphtml
 
 [testenv:pep8]
+basepython=python3
 deps = flake8
 commands = flake8 wsme wsmeext setup.py
 

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py27-nolxml,pypy,tg11,tg15,cornice,cornice-py3,coverage,py35,py36,py35-nolxml,py36-nolxml,pecan-dev27,pecan-dev35,pecan-dev36,pep8
+envlist = py27,py27-nolxml,pypy,cornice,cornice-py3,coverage,py36,py35,py36-nolxml,py35-nolxml,pecan-dev27,pecan-dev35,pecan-dev36,pep8
 
 [common]
 testtools = 
@@ -14,6 +14,7 @@ basedeps =
 	Sphinx < 1.2.99
 	Flask
 	flask-restful
+	SQLAlchemy<=0.7.99
 
 [testenv]
 setenv = 
@@ -33,7 +34,7 @@ commands =
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsmeext/cornice.py
 
 [testenv:cornice-py3]
-basepython = python3.5
+basepython = python3.6
 usedevelop = {[testenv:cornice]usedevelop}
 deps = {[testenv:cornice]deps}
 setenv = 
@@ -43,7 +44,6 @@ commands =
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsmeext/cornice.py
 
 [testenv:pecan-dev-base]
-basepython = python3
 deps = 
 	{[common]testtools}
 	transaction
@@ -62,6 +62,12 @@ deps = {[testenv:pecan-dev-base]deps}
 commands = 
 	{envbindir}/nosetests tests/pecantest --with-xunit --xunit-file nosetests-{envname}.xml --verbose {posargs}
 
+[testenv:pecan-dev36]
+basepython = python3.6
+deps = {[testenv:pecan-dev-base]deps}
+commands = 
+	{envbindir}/nosetests tests/pecantest --with-xunit --xunit-file nosetests-{envname}.xml --verbose {posargs}
+
 [testenv:coverage]
 basepython = python3
 deps = 
@@ -71,6 +77,7 @@ setenv =
 commands = 
 	{envbindir}/coverage erase
 	{envbindir}/coverage combine
+	{envbindir}/coverage xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/protocols/*.py wsmeext/*.py
 
 [testenv:doc]
@@ -89,7 +96,6 @@ deps = flake8
 commands = flake8 wsme wsmeext setup.py
 
 [testenv:venv]
-basepython = python3
 commands = {posargs}
 usedevelop = True
 deps = 
@@ -97,224 +103,36 @@ deps =
 	oslo.config
 	oslotest
 
-[testenv:py27-sa5-lxml-json]
+[testenv:py27-lxml-json]
 commands = 
 	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.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}
 	{[common]basedeps}
 	suds-jurko
-	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 tests/test_sphinxext.py tests/test_flask.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}
-	{[common]basedeps}
-	suds-jurko
-	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 tests/test_sphinxext.py tests/test_flask.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}
-	{[common]basedeps}
-	suds-jurko
-	SQLAlchemy<=0.5.99
-	lxml
-	simplejson
-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 tests/test_sphinxext.py tests/test_flask.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}
-	{[common]basedeps}
-	suds-jurko
-	SQLAlchemy<=0.5.99
-	lxml
-	simplejson
-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 tests/test_sphinxext.py tests/test_flask.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}
-	{[common]basedeps}
-	suds-jurko
-	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 tests/test_sphinxext.py tests/test_flask.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}
-	{[common]basedeps}
-	suds-jurko
-	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 tests/test_sphinxext.py tests/test_flask.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}
-	{[common]basedeps}
-	suds-jurko
-	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 tests/test_sphinxext.py tests/test_flask.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}
-	{[common]basedeps}
-	suds-jurko
-	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 tests/test_sphinxext.py tests/test_flask.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}
-	{[common]basedeps}
-	suds-jurko
-	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 tests/test_sphinxext.py tests/test_flask.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}
-	{[common]basedeps}
-	suds-jurko
-	SQLAlchemy<=0.6.99
-	lxml
-	simplejson
-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 tests/test_sphinxext.py tests/test_flask.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}
-	{[common]basedeps}
-	suds-jurko
-	SQLAlchemy<=0.6.99
-	lxml
-	simplejson
-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 tests/test_sphinxext.py tests/test_flask.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}
-	{[common]basedeps}
-	suds-jurko
-	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 tests/test_sphinxext.py tests/test_flask.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}
-	{[common]basedeps}
-	suds-jurko
-	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 tests/test_sphinxext.py tests/test_flask.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}
-	{[common]basedeps}
-	suds-jurko
-	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 tests/test_sphinxext.py tests/test_flask.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}
-	{[common]basedeps}
-	suds-jurko
-	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 tests/test_sphinxext.py tests/test_flask.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}
 	{[common]basedeps}
 	suds-jurko
-	SQLAlchemy<=0.7.99
 	lxml
 basepython = python2.7
 
-[testenv:py27-sa7-lxml-simplejson]
+[testenv:py27-lxml-simplejson]
 commands = 
 	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.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}
 	{[common]basedeps}
 	suds-jurko
-	SQLAlchemy<=0.7.99
 	lxml
 	simplejson
 basepython = python2.7
@@ -322,285 +140,76 @@ 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 tests/test_sphinxext.py tests/test_flask.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}
 	{[common]basedeps}
 	suds-jurko
-	SQLAlchemy<=0.7.99
 	lxml
 	simplejson
 basepython = python2.7
 
-[testenv:py27-sa7-nolxml-json]
+[testenv:py27-nolxml-json]
 commands = 
 	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.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}
 	{[common]basedeps}
 	suds-jurko
-	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 tests/test_sphinxext.py tests/test_flask.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}
 	{[common]basedeps}
 	suds-jurko
-	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 tests/test_sphinxext.py tests/test_flask.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}
-	{[common]basedeps}
-	suds-jurko
-	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 tests/test_sphinxext.py tests/test_flask.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}
 	{[common]basedeps}
 	suds-jurko
-	SQLAlchemy<=0.7.99
 	simplejson
 basepython = python2.7
 
-[testenv:py35-sa5-lxml-json]
+[testenv:py35-lxml-json]
 commands = 
 	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.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}
 	{[common]basedeps}
 	suds-jurko
-	SQLAlchemy<=0.5.99
-	lxml
-basepython = python3.5
-
-[testenv:py35-sa5]
-commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.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}
-	{[common]basedeps}
-	suds-jurko
-	SQLAlchemy<=0.5.99
-	lxml
-basepython = python3.5
-
-[testenv:py35-sa5-lxml-simplejson]
-commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.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}
-	{[common]basedeps}
-	suds-jurko
-	SQLAlchemy<=0.5.99
-	lxml
-	simplejson
-basepython = python3.5
-
-[testenv:py35-sa5-simplejson]
-commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.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}
-	{[common]basedeps}
-	suds-jurko
-	SQLAlchemy<=0.5.99
-	lxml
-	simplejson
-basepython = python3.5
-
-[testenv:py35-sa5-nolxml-json]
-commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.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}
-	{[common]basedeps}
-	suds-jurko
-	SQLAlchemy<=0.5.99
-basepython = python3.5
-
-[testenv:py35-sa5-nolxml]
-commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.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}
-	{[common]basedeps}
-	suds-jurko
-	SQLAlchemy<=0.5.99
-basepython = python3.5
-
-[testenv:py35-sa5-nolxml-simplejson]
-commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.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}
-	{[common]basedeps}
-	suds-jurko
-	SQLAlchemy<=0.5.99
-	simplejson
-basepython = python3.5
-
-[testenv:py35-sa6-lxml-json]
-commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.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}
-	{[common]basedeps}
-	suds-jurko
-	SQLAlchemy<=0.6.99
-	lxml
-basepython = python3.5
-
-[testenv:py35-sa6]
-commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.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}
-	{[common]basedeps}
-	suds-jurko
-	SQLAlchemy<=0.6.99
-	lxml
-basepython = python3.5
-
-[testenv:py35-sa6-lxml-simplejson]
-commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.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}
-	{[common]basedeps}
-	suds-jurko
-	SQLAlchemy<=0.6.99
-	lxml
-	simplejson
-basepython = python3.5
-
-[testenv:py35-sa6-simplejson]
-commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.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}
-	{[common]basedeps}
-	suds-jurko
-	SQLAlchemy<=0.6.99
-	lxml
-	simplejson
-basepython = python3.5
-
-[testenv:py35-sa6-nolxml-json]
-commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.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}
-	{[common]basedeps}
-	suds-jurko
-	SQLAlchemy<=0.6.99
-basepython = python3.5
-
-[testenv:py35-sa6-nolxml]
-commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.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}
-	{[common]basedeps}
-	suds-jurko
-	SQLAlchemy<=0.6.99
-basepython = python3.5
-
-[testenv:py35-sa6-nolxml-simplejson]
-commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.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}
-	{[common]basedeps}
-	suds-jurko
-	SQLAlchemy<=0.6.99
-	simplejson
-basepython = python3.5
-
-[testenv:py35-sa7-lxml-json]
-commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.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}
-	{[common]basedeps}
-	suds-jurko
-	SQLAlchemy<=0.7.99
 	lxml
 basepython = python3.5
 
 [testenv:py35]
 commands = 
 	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.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}
 	{[common]basedeps}
 	suds-jurko
-	SQLAlchemy<=0.7.99
 	lxml
 basepython = python3.5
 
-[testenv:py35-sa7-lxml-simplejson]
+[testenv:py35-lxml-simplejson]
 commands = 
 	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.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}
 	{[common]basedeps}
 	suds-jurko
-	SQLAlchemy<=0.7.99
 	lxml
 	simplejson
 basepython = python3.5
@@ -608,264 +217,134 @@ basepython = python3.5
 [testenv:py35-simplejson]
 commands = 
 	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.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}
 	{[common]basedeps}
 	suds-jurko
-	SQLAlchemy<=0.7.99
 	lxml
 	simplejson
 basepython = python3.5
 
-[testenv:py35-sa7-nolxml-json]
+[testenv:py35-nolxml-json]
 commands = 
 	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.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}
 	{[common]basedeps}
 	suds-jurko
-	SQLAlchemy<=0.7.99
 basepython = python3.5
 
 [testenv:py35-nolxml]
 commands = 
 	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.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}
 	{[common]basedeps}
 	suds-jurko
-	SQLAlchemy<=0.7.99
-basepython = python3.5
-
-[testenv:py35-sa7-nolxml-simplejson]
-commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.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}
-	{[common]basedeps}
-	suds-jurko
-	SQLAlchemy<=0.7.99
-	simplejson
 basepython = python3.5
 
 [testenv:py35-nolxml-simplejson]
 commands = 
 	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.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}
 	{[common]basedeps}
 	suds-jurko
-	SQLAlchemy<=0.7.99
 	simplejson
 basepython = python3.5
 
-[testenv:pypy-sa5-lxml-json]
+[testenv:py36-lxml-json]
-basepython = python3
 commands = 
 	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.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}
 	{[common]basedeps}
 	suds-jurko
-	SQLAlchemy<=0.5.99
 	lxml
+basepython = python3.6
 
-[testenv:pypy-sa5]
+[testenv:py36]
-basepython = python3
 commands = 
 	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.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}
 	{[common]basedeps}
 	suds-jurko
-	SQLAlchemy<=0.5.99
 	lxml
+basepython = python3.6
 
-[testenv:pypy-sa5-lxml-simplejson]
+[testenv:py36-lxml-simplejson]
-basepython = python3
 commands = 
 	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.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}
 	{[common]basedeps}
 	suds-jurko
-	SQLAlchemy<=0.5.99
 	lxml
 	simplejson
+basepython = python3.6
 
-[testenv:pypy-sa5-simplejson]
+[testenv:py36-simplejson]
-basepython = python3
 commands = 
 	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.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}
 	{[common]basedeps}
 	suds-jurko
-	SQLAlchemy<=0.5.99
 	lxml
 	simplejson
+basepython = python3.6
 
-[testenv:pypy-sa5-nolxml-json]
+[testenv:py36-nolxml-json]
-basepython = python3
 commands = 
 	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.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}
 	{[common]basedeps}
 	suds-jurko
-	SQLAlchemy<=0.5.99
+basepython = python3.6
 
-[testenv:pypy-sa5-nolxml]
+[testenv:py36-nolxml]
-basepython = python3
 commands = 
 	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.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}
 	{[common]basedeps}
 	suds-jurko
-	SQLAlchemy<=0.5.99
+basepython = python3.6
 
-[testenv:pypy-sa5-nolxml-simplejson]
+[testenv:py36-nolxml-simplejson]
-basepython = python3
 commands = 
 	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.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}
 	{[common]basedeps}
 	suds-jurko
-	SQLAlchemy<=0.5.99
 	simplejson
+basepython = python3.6
 
-[testenv:pypy-sa6-lxml-json]
+[testenv:pypy-lxml-json]
-basepython = python3
 commands = 
 	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.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}
 	{[common]basedeps}
 	suds-jurko
-	SQLAlchemy<=0.6.99
-	lxml
-
-[testenv:pypy-sa6]
-basepython = python3
-commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.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}
-	{[common]basedeps}
-	suds-jurko
-	SQLAlchemy<=0.6.99
-	lxml
-
-[testenv:pypy-sa6-lxml-simplejson]
-basepython = python3
-commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.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}
-	{[common]basedeps}
-	suds-jurko
-	SQLAlchemy<=0.6.99
-	lxml
-	simplejson
-
-[testenv:pypy-sa6-simplejson]
-basepython = python3
-commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.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}
-	{[common]basedeps}
-	suds-jurko
-	SQLAlchemy<=0.6.99
-	lxml
-	simplejson
-
-[testenv:pypy-sa6-nolxml-json]
-basepython = python3
-commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.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}
-	{[common]basedeps}
-	suds-jurko
-	SQLAlchemy<=0.6.99
-
-[testenv:pypy-sa6-nolxml]
-basepython = python3
-commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.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}
-	{[common]basedeps}
-	suds-jurko
-	SQLAlchemy<=0.6.99
-
-[testenv:pypy-sa6-nolxml-simplejson]
-basepython = python3
-commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.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}
-	{[common]basedeps}
-	suds-jurko
-	SQLAlchemy<=0.6.99
-	simplejson
-
-[testenv:pypy-sa7-lxml-json]
-basepython = python3
-commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.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}
-	{[common]basedeps}
-	suds-jurko
-	SQLAlchemy<=0.7.99
 	lxml
 
 [testenv:pypy]
-basepython = python3
 commands = 
 	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.py --verbose {posargs}
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
@@ -873,84 +352,55 @@ deps =
 	{[common]testtools}
 	{[common]basedeps}
 	suds-jurko
-	SQLAlchemy<=0.7.99
 	lxml
 
-[testenv:pypy-sa7-lxml-simplejson]
+[testenv:pypy-lxml-simplejson]
-basepython = python3
 commands = 
 	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.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}
 	{[common]basedeps}
 	suds-jurko
-	SQLAlchemy<=0.7.99
 	lxml
 	simplejson
 
 [testenv:pypy-simplejson]
-basepython = python3
 commands = 
 	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.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}
 	{[common]basedeps}
 	suds-jurko
-	SQLAlchemy<=0.7.99
 	lxml
 	simplejson
 
-[testenv:pypy-sa7-nolxml-json]
+[testenv:pypy-nolxml-json]
-basepython = python3
 commands = 
 	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.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}
 	{[common]basedeps}
 	suds-jurko
-	SQLAlchemy<=0.7.99
 
 [testenv:pypy-nolxml]
-basepython = python3
 commands = 
 	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.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}
 	{[common]basedeps}
 	suds-jurko
-	SQLAlchemy<=0.7.99
-
-[testenv:pypy-sa7-nolxml-simplejson]
-basepython = python3
-commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.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}
-	{[common]basedeps}
-	suds-jurko
-	SQLAlchemy<=0.7.99
-	simplejson
 
 [testenv:pypy-nolxml-simplejson]
-basepython = python3
 commands = 
 	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.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}
 	{[common]basedeps}
 	suds-jurko
-	SQLAlchemy<=0.7.99
 	simplejson