Merge branch 'coverage'

Author: nicoddemus

.travis.yml

@@ -1,14 +1,18 @@
 language: python
-python: 2.7
-env:
-  - TOX_ENV=py26
-  - TOX_ENV=py27
-  - TOX_ENV=py32
-  - TOX_ENV=py33
-  - TOX_ENV=pypy
+python:
+  - 2.6
+  - 2.7
+  - 3.2
+  - 3.3
+  - 3.4
+  - pypy
 
 install:
-  - pip install tox
+  - pip install coveralls --use-wheel
 
 script:
-  - tox -e $TOX_ENV
+  - python setup.py develop
+  - coverage run --source=pytest_mock.py runtests.py
+
+after_success:
+  - coveralls

README.rst

@@ -25,6 +25,9 @@ of a test:
 
 .. |ci| image:: http://img.shields.io/travis/nicoddemus/pytest-mock.png
   :target: https://travis-ci.org/nicoddemus/pytest-mock
+
+.. |coverage| image:: http://img.shields.io/coveralls/nicoddemus/pytest-mock.png
+  :target: https://coveralls.io/r/nicoddemus/pytest-mock
 
 Usage
 =====

pytest_mock.py

@@ -3,7 +3,7 @@
 import pytest
 
 
-if sys.version_info >= (3, 3):
+if sys.version_info >= (3, 3): # pragma: no cover
     import unittest.mock as mock_module
 else:
     import mock as mock_module

runtests.py

@@ -0,0 +1,3 @@
+# simple pytest wrapper so we can execute it using "coverage run"
+import pytest, sys
+sys.exit(pytest.main())