diff --git a/tox-tmpl.ini b/tox-tmpl.ini index d285323..5403423 100644 --- a/tox-tmpl.ini +++ b/tox-tmpl.ini @@ -54,6 +54,10 @@ commands= deps= SQLAlchemy<=0.5.99 +constraints= + !python:py32 + + [axis:sqlalchemy:sa6] deps= SQLAlchemy<=0.6.99 diff --git a/tox.ini b/tox.ini index c65dd34..ab7c3d7 100644 --- a/tox.ini +++ b/tox.ini @@ -565,56 +565,6 @@ deps = simplejson basepython = python2.7 -[testenv:py32-sa5-lxml-json] -commands = - {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --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 -deps = - {[common]testtools} - transaction - https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip - SQLAlchemy<=0.5.99 - lxml -basepython = python3.2 - -[testenv:py32-sa5] -commands = - {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --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 -deps = - {[common]testtools} - transaction - https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip - SQLAlchemy<=0.5.99 - lxml -basepython = python3.2 - -[testenv:py32-sa5-nolxml-json] -commands = - {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --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 -deps = - {[common]testtools} - transaction - https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip - SQLAlchemy<=0.5.99 -basepython = python3.2 - -[testenv:py32-sa5-nolxml] -commands = - {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --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 -deps = - {[common]testtools} - transaction - https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip - SQLAlchemy<=0.5.99 -basepython = python3.2 - [testenv:py32-sa6-lxml-json] commands = {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs}