diff options
| author | Chris McDonough <chrism@plope.com> | 2012-09-13 18:12:33 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-09-13 18:12:33 -0400 |
| commit | a9f5e705bb331098946eef774857511a02e4f498 (patch) | |
| tree | 35eee0505157215b5286203d7424a2d8cce39af7 /tox.ini | |
| parent | 3aeb794d49655e7cd81b7d553f0da275b0cde3a9 (diff) | |
| parent | 9ff3b26dcb8ab9e846356d64a18f1ec10440e02e (diff) | |
| download | pyramid-a9f5e705bb331098946eef774857511a02e4f498.tar.gz pyramid-a9f5e705bb331098946eef774857511a02e4f498.tar.bz2 pyramid-a9f5e705bb331098946eef774857511a02e4f498.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'tox.ini')
| -rw-r--r-- | tox.ini | 33 |
1 files changed, 2 insertions, 31 deletions
@@ -4,45 +4,16 @@ envlist = [testenv] commands = + python setup.py dev python setup.py test -q -deps = - zope.component - Sphinx - repoze.sphinx.autointerface - WebTest - virtualenv - venusian - -[testenv:py32] -commands = - python setup.py test -q -deps = - WebTest - virtualenv - venusian - -[testenv:py33] -commands = - python setup.py test -q -deps = - WebTest - virtualenv - venusian [testenv:cover] basepython = python2.6 commands = + python setup.py dev python setup.py nosetests --with-xunit --with-xcoverage deps = - zope.component - Sphinx - WebTest - repoze.sphinx.autointerface - virtualenv - venusian - nose - coverage nosexcover # we separate coverage into its own testenv because a) "last run wins" wrt |