diff options
| author | Chris McDonough <chrism@plope.com> | 2011-09-25 04:07:30 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-09-25 04:07:30 -0400 |
| commit | e04cbb0a8cfd1b565df4eab2e581d1c3fa34b5c1 (patch) | |
| tree | d412f584344287f57c65fe6f5d39382b52aea72a /tox.ini | |
| parent | 92bb880e148a06339426359e4f66c820503a02e9 (diff) | |
| parent | fd266a8ffe324a0c45bffded28522ff9984765a3 (diff) | |
| download | pyramid-e04cbb0a8cfd1b565df4eab2e581d1c3fa34b5c1.tar.gz pyramid-e04cbb0a8cfd1b565df4eab2e581d1c3fa34b5c1.tar.bz2 pyramid-e04cbb0a8cfd1b565df4eab2e581d1c3fa34b5c1.zip | |
fix merge conflicts
Diffstat (limited to 'tox.ini')
| -rw-r--r-- | tox.ini | 16 |
1 files changed, 12 insertions, 4 deletions
@@ -1,19 +1,25 @@ [tox] envlist = - py25,py26,py27,jython,pypy,cover + py26,py27,py32,pypy,cover [testenv] commands = python setup.py test -q deps = + https://github.com/Pylons/webob/zipball/master + zope.component Sphinx - WebTest repoze.sphinx.autointerface + WebTest virtualenv -[testenv:jython] +[testenv:py32] commands = - jython setup.py test -q + python setup.py test -q +deps = + https://github.com/Pylons/webob/zipball/master + WebTest + virtualenv [testenv:cover] basepython = @@ -21,6 +27,8 @@ basepython = commands = python setup.py nosetests --with-xunit --with-xcoverage deps = + https://github.com/Pylons/webob/zipball/master + zope.component Sphinx WebTest repoze.sphinx.autointerface |