Merge pull request #112 from nicoddemus/release-1.8.0

Prepare release 1.8.0

Author: nicoddemus

CHANGELOG.rst

@@ -1,3 +1,10 @@
+1.8.0
+-----
+
+* Add aliases for ``NonCallableMock`` and ``create_autospec`` to ``mocker``. Thanks `@mlhamel`_ for the PR (`#111`_).
+
+.. _#111: https://github.com/pytest-dev/pytest-mock/pull/111
+
 1.7.1
 -----
 
@@ -300,13 +307,14 @@ First release.
 
 .. _#2: https://github.com/pytest-dev/pytest-qt/issues/2
 
-.. _@mathrick: https://github.com/mathrick
-.. _@tigarmo: https://github.com/tigarmo
-.. _@rouge8: https://github.com/rouge8
 .. _@fogo: https://github.com/fogo
+.. _@kmosher: https://github.com/kmosher
 .. _@marcwebbie: https://github.com/marcwebbie
+.. _@mathrick: https://github.com/mathrick
+.. _@mlhamel: https://github.com/mlhamel
 .. _@RonnyPfannschmidt: https://github.com/RonnyPfannschmidt
+.. _@rouge8: https://github.com/rouge8
 .. _@The-Compiler: https://github.com/The-Compiler
-.. _@kmosher: https://github.com/kmosher
+.. _@tigarmo: https://github.com/tigarmo
 
 

tox.ini

@@ -1,15 +1,12 @@
 [tox]
-envlist = py{27,34,35,36}-pytest{30,31,32,33,34},linting,norewrite
+envlist = py{27,34,35,36}-pytest{34,35},linting,norewrite
 
 [testenv]
 passenv = USER USERNAME
 deps =
     coverage
-    pytest30: pytest~=3.0
-    pytest31: pytest~=3.1
-    pytest32: pytest~=3.2
-    pytest33: pytest~=3.3
     pytest34: pytest~=3.4
+    pytest35: pytest~=3.5
 commands =
     coverage run --append --source=pytest_mock.py -m pytest test_pytest_mock.py
 
@@ -21,8 +18,8 @@ commands =
 skip_install=True
 deps =
     pytest-flakes
-    restructuredtext_lint 
+    restructuredtext_lint
     pygments
 commands =
     py.test --flakes pytest_mock.py test_pytest_mock.py -m flakes
-    rst-lint CHANGELOG.rst README.rst    
+    rst-lint CHANGELOG.rst README.rst