Merge pull request #148 from skarzi/feature/introduce-isort

.pre-commit-config.yaml

@@ -5,6 +5,10 @@ repos:
     rev: 22.3.0
     hooks:
     - id: black
+-   repo: https://github.com/pycqa/isort
+    rev: 5.10.1
+    hooks:
+    -   id: isort
 -   repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.2.0
     hooks:

docs/conf.py

@@ -15,8 +15,8 @@
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 
-import sys
 import os
+import sys
 
 sys.path.insert(0, os.path.abspath(".."))
 

pyproject.toml

@@ -5,3 +5,6 @@ build-backend = "setuptools.build_meta"
 [tool.black]
 line-length = 120
 target-version = ['py37', 'py38', 'py39', 'py310']
+
+[tool.isort]
+profile = 'black'

pytest_factoryboy/__init__.py

@@ -1,5 +1,5 @@
 """pytest-factoryboy public API."""
-from .fixture import register, LazyFixture
+from .fixture import LazyFixture, register
 
 __version__ = "2.2.0"
 

pytest_factoryboy/codegen.py

@@ -8,7 +8,7 @@
 import shutil
 import tempfile
 import typing
-from dataclasses import field, dataclass
+from dataclasses import dataclass, field
 from functools import lru_cache
 from types import ModuleType
 

pytest_factoryboy/compat.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
-import sys
+
 import pathlib
+import sys
 
 try:
     from factory.declarations import PostGenerationContext

pytest_factoryboy/fixture.py

@@ -5,24 +5,24 @@
 import sys
 from dataclasses import dataclass
 from inspect import signature
+from typing import TYPE_CHECKING, overload
 
 import factory
 import factory.builder
 import factory.declarations
 import factory.enums
 import inflection
+from typing_extensions import Protocol
 
-from .codegen import make_fixture_model_module, FixtureDef
+from .codegen import FixtureDef, make_fixture_model_module
 from .compat import PostGenerationContext
-from typing import TYPE_CHECKING, overload
-from typing_extensions import Protocol
 
 if TYPE_CHECKING:
     from typing import Any, Callable, TypeVar
+
     from _pytest.fixtures import FixtureRequest
     from factory.builder import BuildStep
-    from factory.declarations import PostGeneration
-    from factory.declarations import PostGenerationContext
+    from factory.declarations import PostGeneration, PostGenerationContext
 
     FactoryType = type[factory.Factory]
     T = TypeVar("T")

pytest_factoryboy/plugin.py

@@ -2,17 +2,18 @@
 from __future__ import annotations
 
 from collections import defaultdict
-import pytest
 from typing import TYPE_CHECKING
 
+import pytest
 
 if TYPE_CHECKING:
     from typing import Any
-    from factory import Factory
-    from _pytest.fixtures import FixtureRequest
+
     from _pytest.config import PytestPluginManager
-    from _pytest.python import Metafunc
+    from _pytest.fixtures import FixtureRequest
     from _pytest.nodes import Item
+    from _pytest.python import Metafunc
+    from factory import Factory
 
     from .fixture import DeferredFunction
 

tests/test_circular.py

@@ -1,7 +1,7 @@
 """Test circular definitions."""
 from __future__ import annotations
 
-from dataclasses import field, dataclass
+from dataclasses import dataclass, field
 
 import factory
 

tests/test_factory_fixtures.py

@@ -2,16 +2,17 @@
 from __future__ import annotations
 
 from dataclasses import dataclass, field
+from typing import TYPE_CHECKING
 
 import factory
-from factory import fuzzy
 import pytest
+from factory import fuzzy
 
-from pytest_factoryboy import register, LazyFixture
-from typing import TYPE_CHECKING
+from pytest_factoryboy import LazyFixture, register
 
 if TYPE_CHECKING:
     from typing import Any
+
     from factory.declarations import LazyAttribute
 
 

tests/test_lazy_fixture.py

@@ -6,7 +6,7 @@
 import factory
 import pytest
 
-from pytest_factoryboy import register, LazyFixture
+from pytest_factoryboy import LazyFixture, register
 
 
 @dataclass

tests/test_postgen_dependencies.py

@@ -2,15 +2,16 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
+from typing import TYPE_CHECKING
 
 import factory
 import pytest
 
 from pytest_factoryboy import register
-from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
     from typing import Any
+
     from pytest_factoryboy.plugin import Request
 
 

tests/test_validation.py

@@ -2,6 +2,7 @@
 
 import factory
 import pytest
+
 from pytest_factoryboy import register