diff --git a/tox-tmpl.ini b/tox-tmpl.ini index ee322e7e..ba3f175d 100644 --- a/tox-tmpl.ini +++ b/tox-tmpl.ini @@ -42,9 +42,23 @@ ignore = H402 builtins = _ exclude = .venv,.tox,dist,doc,./taskflow/openstack/common,*egg,.git,build,tools +# NOTE(imelnikov): pyXY envs are considered to be default, so they must have +# richest set of test requirements +[testenv:py26] +basepython = python2.6 +deps = {[testenv:py27-sa7-ev]deps} + +[testenv:py27] +basepython = python2.7 +deps = {[testenv:py27-sa9-ev]deps} + +[testenv:py33] +basepython = python3.3 +deps = {[testenv:py33-sa9]deps} + [axes] python = py26,py27,py33 -sqlalchemy = sa7,sa8,sa9,* +sqlalchemy = sa7,sa8,sa9,nosa eventlet = ev,* [axis:python:py26] @@ -79,3 +93,6 @@ deps = deps = SQLAlchemy>=0.9,<=0.9.99 alembic>=0.4.1 + +[axis:sqlalchemy:nosa] +# empty diff --git a/tox.ini b/tox.ini index 798fa4fd..63d5de57 100644 --- a/tox.ini +++ b/tox.ini @@ -6,7 +6,8 @@ skipsdist = True envlist = cover, pep8, py26, - py26-ev, + py26-nosa, + py26-nosa-ev, py26-sa7, py26-sa7-ev, py26-sa8, @@ -14,7 +15,8 @@ envlist = cover, py26-sa9, py26-sa9-ev, py27, - py27-ev, + py27-nosa, + py27-nosa-ev, py27-sa7, py27-sa7-ev, py27-sa8, @@ -22,6 +24,7 @@ envlist = cover, py27-sa9, py27-sa9-ev, py33, + py33-nosa, py33-sa7, py33-sa8, py33-sa9, @@ -63,6 +66,18 @@ ignore = H402 builtins = _ exclude = .venv,.tox,dist,doc,./taskflow/openstack/common,*egg,.git,build,tools +[testenv:py26] +basepython = python2.6 +deps = {[testenv:py27-sa7-ev]deps} + +[testenv:py27] +basepython = python2.7 +deps = {[testenv:py27-sa9-ev]deps} + +[testenv:py33] +basepython = python3.3 +deps = {[testenv:py33-sa9]deps} + [testenv:py26-sa7-ev] deps = {[testenv]deps} SQLAlchemy<=0.7.99 @@ -102,12 +117,12 @@ deps = {[testenv]deps} alembic>=0.4.1 basepython = python2.6 -[testenv:py26-ev] +[testenv:py26-nosa-ev] deps = {[testenv]deps} eventlet>=0.13.0 basepython = python2.6 -[testenv:py26] +[testenv:py26-nosa] deps = {[testenv]deps} basepython = python2.6 @@ -150,12 +165,12 @@ deps = {[testenv]deps} alembic>=0.4.1 basepython = python2.7 -[testenv:py27-ev] +[testenv:py27-nosa-ev] deps = {[testenv]deps} eventlet>=0.13.0 basepython = python2.7 -[testenv:py27] +[testenv:py27-nosa] deps = {[testenv]deps} basepython = python2.7 @@ -177,7 +192,7 @@ deps = {[testenv]deps} alembic>=0.4.1 basepython = python3.3 -[testenv:py33] +[testenv:py33-nosa] deps = {[testenv]deps} basepython = python3.3