Merge pull request #34 from pytest-dev/linting

Add linting checks (rst and flakes)

CHANGELOG.rst

@@ -65,7 +65,7 @@ Thanks to `@fogo`_, mocker.spy can now prey upon staticmethods and classmethods.
 -----
 
 * Two new auxiliary methods, ``spy`` and ``stub``. See ``README`` for usage.
-(Thanks `@fogo`_ for complete PR!)
+  (Thanks `@fogo`_ for complete PR!)
 
 
 0.5.0

README.rst

@@ -3,7 +3,7 @@ pytest-mock
 ===========
 
 This plugin installs a ``mocker`` fixture which is a thin-wrapper around the patching API
-provided by the excellent `mock <http://pypi.python.org/pypi/mock>`_ package,
+provided by the excellent `mock package <http://pypi.python.org/pypi/mock>`_,
 but with the benefit of not having to worry about undoing patches at the end
 of a test:
 

tox.ini

@@ -1,7 +1,7 @@
 [tox]
 # note that tox expects interpreters to be found at C:\PythonXY,
 # with XY being python version ("27" or "34") for instance
-envlist = py{26,27,34,35}-pytest{27,28}
+envlist = py{26,27,34,35}-pytest{27,28},linting
 
 [testenv]
 passenv = USER USERNAME
@@ -10,3 +10,15 @@ deps =
     pytest27: pytest==2.7.3
     pytest28: pytest==2.8.7
 commands = coverage run --append --source=pytest_mock.py -m pytest test_pytest_mock.py
+
+
+[testenv:linting]
+basepython = python3.5
+skip_install=True
+deps =
+    pytest-flakes
+    restructuredtext_lint 
+    pygments
+commands =
+    py.test --flakes pytest_mock.py test_pytest_mock.py -m flakes
+    rst-lint CHANGELOG.rst README.rst