Merge pull request #226 from nicoddemus/update-pre-commit

Author: nicoddemus

.pre-commit-config.yaml

@@ -1,12 +1,12 @@
 exclude: '^($|.*\.bin)'
 repos:
   - repo: https://github.com/ambv/black
-    rev: 19.10b0
+    rev: 20.8b1
     hooks:
       - id: black
         args: [--safe, --quiet]
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.5.0
+    rev: v3.4.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
@@ -18,8 +18,13 @@ repos:
         files: ^(CHANGELOG.rst|README.rst|HOWTORELEASE.rst|changelog/.*)$
         language: python
         additional_dependencies: [pygments, restructuredtext_lint]
+  - repo: https://github.com/asottile/reorder_python_imports
+    rev: v2.3.6
+    hooks:
+    - id: reorder-python-imports
+      args: ['--application-directories=.:src']
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.782  # NOTE: keep this in sync with tox.ini
+    rev: v0.790  # NOTE: keep this in sync with tox.ini
     hooks:
       - id: mypy
         files: ^(src|tests)

setup.py

@@ -1,14 +1,17 @@
 from io import open
 
-from setuptools import setup, find_packages
+from setuptools import find_packages
+from setuptools import setup
 
 setup(
     name="pytest-mock",
     entry_points={"pytest11": ["pytest_mock = pytest_mock"]},
     packages=find_packages(where="src"),
     package_dir={"": "src"},
     platforms="any",
-    package_data={"pytest_mock": ["py.typed"],},
+    package_data={
+        "pytest_mock": ["py.typed"],
+    },
     python_requires=">=3.5",
     install_requires=["pytest>=5.0"],
     use_scm_version={"write_to": "src/pytest_mock/_version.py"},

src/pytest_mock/__init__.py

@@ -1,4 +1,12 @@
-from pytest_mock.plugin import *
+from pytest_mock.plugin import class_mocker
+from pytest_mock.plugin import mocker
+from pytest_mock.plugin import MockerFixture
+from pytest_mock.plugin import module_mocker
+from pytest_mock.plugin import package_mocker
+from pytest_mock.plugin import pytest_addoption
+from pytest_mock.plugin import pytest_configure
+from pytest_mock.plugin import PytestMockWarning
+from pytest_mock.plugin import session_mocker
 
 MockFixture = MockerFixture  # backward-compatibility only (#204)
 

src/pytest_mock/plugin.py

@@ -1,24 +1,28 @@
+import asyncio
 import builtins
+import functools
+import inspect
+import sys
 import unittest.mock
-from typing import cast, overload, Generator, Mapping, Iterable, Tuple, TypeVar
+import warnings
 from typing import Any
 from typing import Callable
+from typing import cast
 from typing import Dict
+from typing import Generator
+from typing import Iterable
 from typing import List
-
+from typing import Mapping
 from typing import Optional
+from typing import overload
+from typing import Tuple
+from typing import TypeVar
 from typing import Union
 
-
-import asyncio
-import functools
-import inspect
-import warnings
-import sys
-
 import pytest
 
-from ._util import get_mock_module, parse_ini_boolean
+from ._util import get_mock_module
+from ._util import parse_ini_boolean
 
 _T = TypeVar("_T")
 

tests/test_pytest_mock.py

@@ -3,11 +3,17 @@
 import re
 import sys
 from contextlib import contextmanager
-from typing import Callable, Any, Tuple, Generator, Type
+from typing import Any
+from typing import Callable
+from typing import Generator
+from typing import Tuple
+from typing import Type
 from unittest.mock import MagicMock
 
 import pytest
-from pytest_mock import MockerFixture, PytestMockWarning
+
+from pytest_mock import MockerFixture
+from pytest_mock import PytestMockWarning
 
 pytest_plugins = "pytester"
 
@@ -249,7 +255,8 @@ def bar(self, arg):
     ),
 )
 def test_instance_method_spy_exception(
-    exc_cls: Type[BaseException], mocker: MockerFixture,
+    exc_cls: Type[BaseException],
+    mocker: MockerFixture,
 ) -> None:
     class Foo:
         def bar(self, arg):
@@ -627,12 +634,12 @@ def test_foo(mocker):
 
 
 def test_parse_ini_boolean() -> None:
-    import pytest_mock
+    from pytest_mock._util import parse_ini_boolean
 
-    assert pytest_mock.parse_ini_boolean("True") is True
-    assert pytest_mock.parse_ini_boolean("false") is False
+    assert parse_ini_boolean("True") is True
+    assert parse_ini_boolean("false") is False
     with pytest.raises(ValueError):
-        pytest_mock.parse_ini_boolean("foo")
+        parse_ini_boolean("foo")
 
 
 def test_patched_method_parameter_name(mocker: MockerFixture) -> None:
@@ -651,8 +658,7 @@ def request(cls, method, args):
 
 
 def test_monkeypatch_native(testdir: Any) -> None:
-    """Automatically disable monkeypatching when --tb=native.
-    """
+    """Automatically disable monkeypatching when --tb=native."""
     testdir.makepyfile(
         """
         def test_foo(mocker):
@@ -676,8 +682,7 @@ def test_foo(mocker):
 
 
 def test_monkeypatch_no_terminal(testdir: Any) -> None:
-    """Don't crash without 'terminal' plugin.
-    """
+    """Don't crash without 'terminal' plugin."""
     testdir.makepyfile(
         """
         def test_foo(mocker):
@@ -692,8 +697,7 @@ def test_foo(mocker):
 
 
 def test_standalone_mock(testdir: Any) -> None:
-    """Check that the "mock_use_standalone" is being used.
-    """
+    """Check that the "mock_use_standalone" is being used."""
     testdir.makepyfile(
         """
         def test_foo(mocker):
@@ -713,8 +717,7 @@ def test_foo(mocker):
 
 @pytest.mark.usefixtures("needs_assert_rewrite")
 def test_detailed_introspection(testdir: Any) -> None:
-    """Check that the "mock_use_standalone" is being used.
-    """
+    """Check that the "mock_use_standalone" is being used."""
     testdir.makepyfile(
         """
         def test(mocker):
@@ -755,8 +758,7 @@ def test(mocker):
 )
 @pytest.mark.usefixtures("needs_assert_rewrite")
 def test_detailed_introspection_async(testdir: Any) -> None:
-    """Check that the "mock_use_standalone" is being used.
-    """
+    """Check that the "mock_use_standalone" is being used."""
     testdir.makepyfile(
         """
         import pytest

tox.ini

@@ -23,7 +23,7 @@ commands = pre-commit run --all-files --show-diff-on-failure
 [testenv:mypy]
 skip_install = true
 deps =
-    mypy==0.782
+    mypy==0.790
 commands = mypy {posargs:src tests}
 
 [pytest]