Update CHANGELOG and setup.py to version 1.2 · pytest-dev/pytest-mock@fb401b1 (original) (raw)

Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
1 -1.2.dev
2 --------
1 +1.2
2 +---
3 3
4 4 * Try to import ``mock`` first instead of ``unittest.mock``. This gives the user flexibility
5 5 to install a newer ``mock`` version from PyPI instead of using the one available in the
6 6 Python distribution.
7 7 Thanks `@wcooley`_ for the PR (`#54`_).
8 +
8 9 * ``mock.sentinel`` is now aliased as ``mocker.sentinel`` for convenience.
10 + Thanks `@kjwilcox`_ for the PR (`#56`_).
9 11
10 12 .. _@wcooley: https://github.com/wcooley
11 -.. _#54: https://github.com/pytest-dev/pytest-mock/issues/54
13 +.. _@kjwilcox: https://github.com/kjwilcox
14 +.. _#54: https://github.com/pytest-dev/pytest-mock/issues/54
15 +.. _#56: https://github.com/pytest-dev/pytest-mock/pull/56
12 16
13 17 1.1
14 18 ---