Permalink
Browse files

Merge branch '1.0-branch' of github.com:michr/pyramid into 1.0-branch

  • Loading branch information...
2 parents f361e49 + bd6a5e9 commit 2be361adf844af5ffb60cba1eb74b1acf8024714 michr committed Oct 1, 2011
Showing with 45 additions and 7 deletions.
  1. +2 −7 .gitignore
  2. +43 −0 tox.ini
View
@@ -7,16 +7,11 @@
*~
.coverage
tutorial.db
-env26/
-env26-debug/
bookenv/
-env24/
-env25/
-env27/
-jyenv/
-pypyenv/
+env*/
build/
dist/
.idea/
.tox/
nosetests.xml
+pyramid/coverage.xml
View
43 tox.ini
@@ -0,0 +1,43 @@
+[tox]
+envlist =
+ py24,py25,py26,py27,pypy,jython,cover
+
+[testenv]
+commands =
+ python setup.py test -q
+deps =
+ Sphinx
+ docutils<0.8
+ repoze.sphinx.autointerface
+ virtualenv
+ PasteDeploy<1.5
+ Chameleon<1.4
+ WebOb<=1.0.99
+ WebTest<=1.2.99
+
+[testenv:jython]
+commands =
+ jython setup.py test -q
+
+[testenv:cover]
+basepython =
+ python2.6
+commands =
+ python setup.py nosetests --with-xunit --with-xcoverage
+deps =
+ Sphinx
+ docutils<0.8
+ repoze.sphinx.autointerface
+ virtualenv
+ PasteDeploy<1.5
+ Chameleon<1.4
+ WebOb<=1.0.99
+ WebTest<=1.2.99
+ nose
+ coverage==3.4
+ nosexcover
+
+# we separate coverage into its own testenv because a) "last run wins" wrt
+# cobertura jenkins reporting and b) pypy and jython can't handle any
+# combination of versions of coverage and nosexcover that i can find.
+

0 comments on commit 2be361a

Please sign in to comment.