Merge pull request #283 from pytest-dev/pre-commit-ci-update-config

Author: nicoddemus

.pre-commit-config.yaml

@@ -19,12 +19,12 @@ repos:
         language: python
         additional_dependencies: [pygments, restructuredtext_lint]
   - repo: https://github.com/asottile/reorder_python_imports
-    rev: v2.7.1
+    rev: v3.0.1
     hooks:
     - id: reorder-python-imports
       args: ['--application-directories=.:src']
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.931  # NOTE: keep this in sync with tox.ini
+    rev: v0.940  # NOTE: keep this in sync with tox.ini
     hooks:
       - id: mypy
         files: ^(src|tests)

tests/test_pytest_mock.py

@@ -2,6 +2,7 @@
 import platform
 import re
 import sys
+import warnings
 from contextlib import contextmanager
 from typing import Any
 from typing import Callable
@@ -758,12 +759,12 @@ def test(mocker):
         "*Args:",
         "*assert ('fo',) == ('',)",
         "*At index 0 diff: 'fo' != ''*",
-        "*Use -v to get the full diff*",
+        "*Use -v to get more diff*",
         "*Kwargs:*",
         "*assert {} == {'bar': 4}*",
         "*Right contains* more item*",
         "*{'bar': 4}*",
-        "*Use -v to get the full diff*",
+        "*Use -v to get more diff*",
     ]
     result.stdout.fnmatch_lines(expected_lines)
 
@@ -799,12 +800,12 @@ async def test(mocker):
         "*Args:",
         "*assert ('fo',) == ('',)",
         "*At index 0 diff: 'fo' != ''*",
-        "*Use -v to get the full diff*",
+        "*Use -v to get more diff*",
         "*Kwargs:*",
         "*assert {} == {'bar': 4}*",
         "*Right contains* more item*",
         "*{'bar': 4}*",
-        "*Use -v to get the full diff*",
+        "*Use -v to get more diff*",
     ]
     result.stdout.fnmatch_lines(expected_lines)
 
@@ -929,7 +930,7 @@ def doIt(self):
 
     a = A()
 
-    with pytest.warns(None) as warn_record:
+    with warnings.catch_warnings(record=True) as warn_record:
         with mocker.patch.context_manager(a, "doIt", return_value=True):
             assert a.doIt() is True