Add reorder-python-imports hook

Author: nicoddemus

.pre-commit-config.yaml

@@ -18,6 +18,11 @@ 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.790  # NOTE: keep this in sync with tox.ini
     hooks:

setup.py

@@ -1,6 +1,7 @@
 from io import open
 
-from setuptools import setup, find_packages
+from setuptools import find_packages
+from setuptools import setup
 
 setup(
     name="pytest-mock",

src/pytest_mock/__init__.py

@@ -1,14 +1,12 @@
-from pytest_mock.plugin import (
-    MockerFixture,
-    PytestMockWarning,
-    pytest_addoption,
-    pytest_configure,
-    session_mocker,
-    package_mocker,
-    module_mocker,
-    class_mocker,
-    mocker,
-)
+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"