From 6d6b8e0ffb6ab452bd708e92336fec8367f33ff0 Mon Sep 17 00:00:00 2001
From: Christophe de Vienne <cdevienne@gmail.com>
Date: Sat, 26 Jan 2013 22:11:59 +0100
Subject: [PATCH] Do not test py25 with std json

---
 tox-tmpl.ini |  4 +++
 tox.ini      | 84 ----------------------------------------------------
 2 files changed, 4 insertions(+), 84 deletions(-)

diff --git a/tox-tmpl.ini b/tox-tmpl.ini
index 5403423..c12e24d 100644
--- a/tox-tmpl.ini
+++ b/tox-tmpl.ini
@@ -66,6 +66,10 @@ deps=
 deps=
     SQLAlchemy<=0.7.99
 
+[axis:json:json]
+constraints=
+    !python:py25
+
 [axis:json:simplejson]
 deps=
     simplejson
diff --git a/tox.ini b/tox.ini
index ab7c3d7..2f407b2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -105,34 +105,6 @@ changedir =
 commands = 
 	make clean ziphtml
 
-[testenv:py25-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 wsme/*.py wsme/rest/*.py wsmeext/*.py
-	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
-basepython = python2.5
-deps = 
-	{[common]testtools}
-	zope.interface<=3.8.99
-	transaction<=1.1.1
-	suds
-	SQLAlchemy<=0.5.99
-	lxml
-
-[testenv:py25-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 wsme/*.py wsme/rest/*.py wsmeext/*.py
-	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
-basepython = python2.5
-deps = 
-	{[common]testtools}
-	zope.interface<=3.8.99
-	transaction<=1.1.1
-	suds
-	SQLAlchemy<=0.5.99
-	lxml
-
 [testenv:py25-sa5-lxml-simplejson]
 commands = 
 	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs}
@@ -163,34 +135,6 @@ deps =
 	lxml
 	simplejson
 
-[testenv:py25-sa6-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 wsme/*.py wsme/rest/*.py wsmeext/*.py
-	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
-basepython = python2.5
-deps = 
-	{[common]testtools}
-	zope.interface<=3.8.99
-	transaction<=1.1.1
-	suds
-	SQLAlchemy<=0.6.99
-	lxml
-
-[testenv:py25-sa6]
-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 wsme/*.py wsme/rest/*.py wsmeext/*.py
-	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
-basepython = python2.5
-deps = 
-	{[common]testtools}
-	zope.interface<=3.8.99
-	transaction<=1.1.1
-	suds
-	SQLAlchemy<=0.6.99
-	lxml
-
 [testenv:py25-sa6-lxml-simplejson]
 commands = 
 	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs}
@@ -221,34 +165,6 @@ deps =
 	lxml
 	simplejson
 
-[testenv:py25-sa7-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 wsme/*.py wsme/rest/*.py wsmeext/*.py
-	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
-basepython = python2.5
-deps = 
-	{[common]testtools}
-	zope.interface<=3.8.99
-	transaction<=1.1.1
-	suds
-	SQLAlchemy<=0.7.99
-	lxml
-
-[testenv:py25]
-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 wsme/*.py wsme/rest/*.py wsmeext/*.py
-	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
-basepython = python2.5
-deps = 
-	{[common]testtools}
-	zope.interface<=3.8.99
-	transaction<=1.1.1
-	suds
-	SQLAlchemy<=0.7.99
-	lxml
-
 [testenv:py25-sa7-lxml-simplejson]
 commands = 
 	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs}