[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

src/pytest_bdd/generation.py

@@ -8,8 +8,8 @@
 
 import py
 from mako.template import Template
-
 from messages import Pickle, PickleStep  # type:ignore[attr-defined]
+
 from pytest_bdd.compatibility.importlib.resources import as_file, files
 from pytest_bdd.compatibility.pytest import Config, ExitCode, FixtureRequest, Item, Parser, Session, wrap_session
 from pytest_bdd.model import Feature, StepType

src/pytest_bdd/hooks.py

@@ -2,10 +2,10 @@
 from pathlib import Path
 from typing import Any, Iterable, Optional, Union
 
-from pytest import hookspec
-
 from messages import Envelope as Message  # type:ignore[attr-defined]
 from messages import Pickle  # type:ignore[attr-defined]
+from pytest import hookspec
+
 from pytest_bdd.compatibility.pytest import Config, FixtureRequest, Mark
 from pytest_bdd.model import Feature
 

src/pytest_bdd/message_plugin.py

@@ -17,9 +17,6 @@
 from ci_environment import detect_ci_environment
 from cucumber_expressions.parameter_type_registry import ParameterTypeRegistry
 from filelock import FileLock
-from pydantic import ValidationError
-from pytest import ExitCode, Session, hookimpl
-
 from messages import Attachment, Ci, ContentEncoding, Duration  # type:ignore[attr-defined]
 from messages import Envelope as Message  # type:ignore[attr-defined]
 from messages import (  # type:ignore[attr-defined]
@@ -42,6 +39,9 @@
     TestStepStarted,
     Timestamp,
 )
+from pydantic import ValidationError
+from pytest import ExitCode, Session, hookimpl
+
 from pytest_bdd.compatibility.pytest import Config, FixtureDef, FixtureRequest, Parser, get_config_root_path, is_set
 from pytest_bdd.packaging import get_distribution_version
 from pytest_bdd.steps import StepHandler

src/pytest_bdd/model/__init__.py

@@ -1,5 +1,6 @@
 from messages import Pickle, PickleStep, Step, Tag  # type:ignore[attr-defined]
 from messages import Type as StepType  # type:ignore[attr-defined]
+
 from pytest_bdd.model.gherkin_document import Feature
 
 __all__ = ["Feature", "Pickle", "PickleStep", "Step", "StepType", "Tag"]

src/pytest_bdd/model/gherkin_document.py

@@ -26,7 +26,6 @@
 from attr import Factory, attrib, attrs
 from gherkin.errors import CompositeParserException  # type: ignore[import]
 from gherkin.pickles.compiler import Compiler  # type: ignore[import]
-
 from messages import Background, Examples  # type:ignore[attr-defined]
 from messages import Feature as FeatureMessage  # type:ignore[attr-defined]
 from messages import (  # type:ignore[attr-defined]
@@ -40,6 +39,7 @@
     TableRow,
     Tag,
 )
+
 from pytest_bdd.const import TAG_PREFIX
 from pytest_bdd.utils import _itemgetter, deepattrgetter
 

src/pytest_bdd/parsers.py

@@ -16,8 +16,8 @@
 from cucumber_expressions.expression import CucumberExpression
 from cucumber_expressions.parameter_type_registry import ParameterTypeRegistry
 from cucumber_expressions.regular_expression import RegularExpression as CucumberRegularExpression
-
 from messages import ExpressionType  # type:ignore[attr-defined]
+
 from pytest_bdd.compatibility.pytest import FixtureRequest
 from pytest_bdd.model.messages_extension import ExpressionType as ExpressionTypeExtension
 from pytest_bdd.utils import StringableProtocol, stringify

src/pytest_bdd/plugin.py

@@ -12,9 +12,9 @@
 
 import pytest
 from _pytest.nodes import Collector
-
 from messages import Pickle  # type:ignore[attr-defined]
 from messages import PickleStep as Step  # type:ignore[attr-defined]
+
 from pytest_bdd import cucumber_json, generation, gherkin_terminal_reporter, given, steps, then, when
 from pytest_bdd.allure_logging import AllurePytestBDD
 from pytest_bdd.collector import FeatureFileModule as FeatureFileCollector

src/pytest_bdd/reporting.py

@@ -8,8 +8,8 @@
 
 import pytest
 from attr import Factory, attrib, attrs
-
 from messages import Pickle, PickleStep  # type:ignore[attr-defined]
+
 from pytest_bdd.compatibility.pytest import CallInfo, FixtureRequest, Item
 from pytest_bdd.model import Feature
 

src/pytest_bdd/runner.py

@@ -5,10 +5,10 @@
 from operator import attrgetter
 from typing import Optional
 
+from messages import PickleStep  # type:ignore[attr-defined]
 from pluggy import PluginManager
 from pytest import hookimpl
 
-from messages import PickleStep  # type:ignore[attr-defined]
 from pytest_bdd import exceptions
 from pytest_bdd.compatibility.pytest import FixtureRequest, Item, call_fixture_func
 from pytest_bdd.model import Feature

src/pytest_bdd/scenario_locator.py

@@ -14,8 +14,8 @@
 from _operator import methodcaller, truediv
 from _pytest.config import Config
 from attr import Factory, attrib, attrs
-
 from messages import Source  # type:ignore[attr-defined]
+
 from pytest_bdd.compatibility.parser import ParserProtocol
 from pytest_bdd.compatibility.pytest import get_config_root_path
 from pytest_bdd.mimetypes import Mimetype

src/pytest_bdd/steps.py

@@ -45,11 +45,11 @@ def given_beautiful_article(article):
 import pytest
 from _pytest.fixtures import FixtureRequest
 from attr import Factory, attrib, attrs
-from ordered_set import OrderedSet
-
 from messages import ExpressionType, Location, Pickle  # type:ignore[attr-defined]
 from messages import PickleStep as Step  # type:ignore[attr-defined]
 from messages import SourceReference, StepDefinition, StepDefinitionPattern  # type:ignore[attr-defined]
+from ordered_set import OrderedSet
+
 from pytest_bdd.compatibility.pytest import Config, Parser, TypeAlias, get_config_root_path
 from pytest_bdd.model import Feature, StepType
 from pytest_bdd.model.messages_extension import ExpressionType as ExpressionTypeExtension

src/pytest_bdd/struct_bdd/model.py

@@ -8,6 +8,7 @@
 from typing import Any, ClassVar, List, Literal, Mapping, Optional, Sequence, Type, Union
 
 from attr import attrib, attrs
+from messages import KeywordType, MediaType, Source  # type:ignore[attr-defined]
 from pydantic import (  # type:ignore[attr-defined] # migration to pydantic 2
     AfterValidator,
     BaseModel,
@@ -17,7 +18,6 @@
     model_validator,
 )
 
-from messages import KeywordType, MediaType, Source  # type:ignore[attr-defined]
 from pytest_bdd.compatibility.typing import Annotated, Self
 from pytest_bdd.mimetypes import Mimetype
 from pytest_bdd.scenario_locator import ScenarioLocatorFilterMixin

src/pytest_bdd/struct_bdd/model_builder.py

@@ -5,7 +5,6 @@
 
 from attr import attrib, attrs
 from gherkin.pickles.compiler import Compiler
-
 from messages import (  # type:ignore[attr-defined]
     DataTable,
     DocString,
@@ -22,6 +21,7 @@
     Tag,
     Type,
 )
+
 from pytest_bdd.model.gherkin_document import Feature as GherkinDocumentFeature
 from pytest_bdd.struct_bdd.model import Join as StructJoin
 from pytest_bdd.struct_bdd.model import StepPrototype as StructStep

tests/gherkin_integration/test_pickles_load.py

@@ -1,9 +1,8 @@
 import json
 from pathlib import Path
 
-from pytest import mark, param
-
 from messages import Pickle  # type:ignore[attr-defined]
+from pytest import mark, param
 
 test_data = Path(__file__).parent.parent.parent / "gherkin" / "testdata"
 

tests/messages/test_messages.py

@@ -4,8 +4,6 @@
 from pprint import pformat
 from typing import TYPE_CHECKING, Iterable, Type, Union, cast
 
-from pydantic import ValidationError
-
 from messages import Attachment, ContentEncoding  # type:ignore[attr-defined]
 from messages import Envelope as Message  # type:ignore[attr-defined]
 from messages import (  # type:ignore[attr-defined]
@@ -24,6 +22,8 @@
 from messages import TestRunStarted as _TestRunStarted  # type:ignore[attr-defined]
 from messages import TestStepFinished as _TestStepFinished  # type:ignore[attr-defined]
 from messages import TestStepStarted as _TestStepStarted  # type:ignore[attr-defined]
+from pydantic import ValidationError
+
 from pytest_bdd.utils import flip
 
 if TYPE_CHECKING:  # pragma: nocover

tests/struct_bdd/test_deserialization.py

@@ -3,11 +3,11 @@
 from textwrap import dedent
 
 from gherkin.pickles.compiler import Compiler
+from messages import KeywordType  # type:ignore[attr-defined]
 from pytest import mark
 from yaml import FullLoader
 from yaml import load as load_yaml
 
-from messages import KeywordType  # type:ignore[attr-defined]
 from pytest_bdd.compatibility.struct_bdd import STRUCT_BDD_INSTALLED
 from pytest_bdd.utils import IdGenerator, doesnt_raise