diff options
| author | Chris McDonough <chrism@plope.com> | 2012-09-09 13:12:39 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-09-09 13:12:39 -0400 |
| commit | 05938c540918fd2e24db69851a7c1cec7ad6630f (patch) | |
| tree | 7219dc272800ae0d9b009c36fec8cb31c69f4288 | |
| parent | 25d3ddfd61bcc97ad6e2d5d9c51a71719f18af57 (diff) | |
| parent | f6bd88ecb34b26315b01650dfa586ea8b59dc746 (diff) | |
| download | pyramid-05938c540918fd2e24db69851a7c1cec7ad6630f.tar.gz pyramid-05938c540918fd2e24db69851a7c1cec7ad6630f.tar.bz2 pyramid-05938c540918fd2e24db69851a7c1cec7ad6630f.zip | |
Merge branch 'master' into feature.14removedeprecations
| -rw-r--r-- | CHANGES.txt | 1 | ||||
| -rw-r--r-- | tox.ini | 33 |
2 files changed, 3 insertions, 31 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index 294950d1d..dd5f66e5b 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,6 +1,7 @@ Next release ============ + Bug Fixes --------- @@ -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 |