diff --git a/tox-tmpl.ini b/tox-tmpl.ini index f8b7fce..200b622 100644 --- a/tox-tmpl.ini +++ b/tox-tmpl.ini @@ -7,6 +7,11 @@ testtools= nose coverage d2to1 +py25deps= + --insecure + six + simplegeneric + webob <= 1.1.1 [axes] python=py25,py27,py32,pypy @@ -28,7 +33,7 @@ commands= [axis:python:py25] deps= - --insecure + {[common]py25deps} {[common]testtools} webtest < 1.4.99 zope.interface<=3.8.99 @@ -96,7 +101,7 @@ downloadcache=.tox/cache [testenv:sphinxext] basepython=python2.5 deps= - --insecure + {[common]py25deps} d2to1 nose coverage @@ -110,7 +115,7 @@ commands= [testenv:tg11] basepython=python2.5 deps= - --insecure + {[common]py25deps} d2to1 nose webtest @@ -126,7 +131,7 @@ commands= [testenv:tg15] basepython=python2.5 deps= - --insecure + {[common]py25deps} d2to1 nose webtest @@ -142,7 +147,7 @@ commands= [testenv:tg21] basepython=python2.5 deps= - --insecure + {[common]py25deps} d2to1 nose coverage diff --git a/tox.ini b/tox.ini index 1657c2d..4724254 100644 --- a/tox.ini +++ b/tox.ini @@ -6,6 +6,11 @@ testtools = nose coverage d2to1 +py25deps = + --insecure + six + simplegeneric + webob <= 1.1.1 [testenv] setenv = @@ -15,6 +20,7 @@ downloadcache = .tox/cache [testenv:sphinxext] basepython = python2.5 deps = + {[common]py25deps} d2to1 nose coverage @@ -28,6 +34,7 @@ commands = [testenv:tg11] basepython = python2.5 deps = + {[common]py25deps} d2to1 nose webtest @@ -43,6 +50,7 @@ commands = [testenv:tg15] basepython = python2.5 deps = + {[common]py25deps} d2to1 nose webtest @@ -58,6 +66,7 @@ commands = [testenv:tg21] basepython = python2.5 deps = + {[common]py25deps} d2to1 nose coverage @@ -124,7 +133,7 @@ commands = {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py basepython = python2.5 deps = - --insecure + {[common]py25deps} {[common]testtools} webtest < 1.4.99 zope.interface<=3.8.99 @@ -141,7 +150,7 @@ commands = {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py basepython = python2.5 deps = - --insecure + {[common]py25deps} {[common]testtools} webtest < 1.4.99 zope.interface<=3.8.99 @@ -158,7 +167,7 @@ commands = {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py basepython = python2.5 deps = - --insecure + {[common]py25deps} {[common]testtools} webtest < 1.4.99 zope.interface<=3.8.99 @@ -175,7 +184,7 @@ commands = {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py basepython = python2.5 deps = - --insecure + {[common]py25deps} {[common]testtools} webtest < 1.4.99 zope.interface<=3.8.99 @@ -192,7 +201,7 @@ commands = {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py basepython = python2.5 deps = - --insecure + {[common]py25deps} {[common]testtools} webtest < 1.4.99 zope.interface<=3.8.99 @@ -209,7 +218,7 @@ commands = {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py basepython = python2.5 deps = - --insecure + {[common]py25deps} {[common]testtools} webtest < 1.4.99 zope.interface<=3.8.99