Skip to content

Fix regression due to 'mock' import - Release 3.8.1 #299

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 24, 2022
Merged

Fix regression due to 'mock' import - Release 3.8.1 #299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
Releases
========

3.8.1 (2022-06-24)
------------------

* Fix regression caused by an explicit ``mock`` dependency in the code (`#298`_).

.. _#298: https://github.com/pytest-dev/pytest-mock/issues/298

3.8.0 (2022-06-24)
------------------
Expand Down
3 changes: 1 addition & 2 deletions src/pytest_mock/plugin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@
if sys.version_info[:2] > (3, 7):
AsyncMockType = unittest.mock.AsyncMock
else:
import mock
AsyncMockType = mock.AsyncMock
AsyncMockType = Any


class PytestMockWarning(UserWarning):
Expand Down