Merge 6c0bced into 620bdef

.travis.yml

@@ -10,14 +10,16 @@ env:
   - TOXENV=py34
   - TOXENV=pypy
   - TOXENV=pypy3
-  - TOXENV=cover
 
 install:
-  - travis_retry pip install tox
+  - travis_retry pip install tox coveralls
 
 script:
   - travis_retry tox
 
 notifications:
   email:
     - pyramid-checkins@lists.repoze.org
+
+after_success:
+  - coveralls

README.rst

@@ -8,6 +8,9 @@ Pyramid
         :target: http://docs.pylonsproject.org/projects/pyramid/en/master/
         :alt: Documentation Status
 
+.. image:: https://coveralls.io/repos/sontek/pyramid/badge.svg
+        :target: https://coveralls.io/r/sontek/pyramid
+
 Pyramid is a small, fast, down-to-earth, open source Python web framework.
 It makes real-world web application development and
 deployment more fun, more predictable, and more productive.

setup.cfg

@@ -7,7 +7,7 @@ where=pyramid
 nocapture=1
 cover-package=pyramid
 cover-erase=1
-cover-min-percentage=100
+#cover-min-percentage=100
 
 [aliases]
 dev = develop easy_install pyramid[testing]

tox.ini

@@ -1,22 +1,11 @@
 [tox]
-envlist = 
-    py26,py27,py32,py33,py34,pypy,pypy3,cover
+envlist =
+    py26,py27,py32,py33,py34,pypy,pypy3
 
 [testenv]
-commands = 
-    python setup.py -q dev
-    python setup.py -q test -q
-
-[testenv:cover]
-basepython =
-    python2.6
-commands = 
-    python setup.py -q dev
-    nosetests --with-xunit --with-xcoverage
 deps =
     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.
-
+commands =
+    python setup.py -q dev
+    nosetests --with-xunit --with-xcoverage