Skip to content

Commit

Permalink
Merge branch '1.3-branch'
Browse files Browse the repository at this point in the history
  • Loading branch information
mcdonc committed Mar 17, 2012
2 parents 692fd68 + 89f1581 commit 2c6f63a
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions tox.ini
Expand Up @@ -11,15 +11,19 @@ deps =
repoze.sphinx.autointerface
WebTest
virtualenv
venusian>=1.0a3
venusian
nose
coverage

[testenv:py32]
commands =
python setup.py test -q
deps =
WebTest
virtualenv
venusian>=1.0a3
venusian
nose
coverage

[testenv:cover]
basepython =
Expand All @@ -32,9 +36,9 @@ deps =
WebTest
repoze.sphinx.autointerface
virtualenv
venusian>=1.0a3
venusian
nose
coverage==3.4
coverage
nosexcover

# we separate coverage into its own testenv because a) "last run wins" wrt
Expand Down

0 comments on commit 2c6f63a

Please sign in to comment.