chore: improve test imports (#661)

Author: adhtruong

.pre-commit-config.yaml

@@ -18,7 +18,7 @@ repos:
       - id: mixed-line-ending
       - id: trailing-whitespace
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: "v0.9.7"
+    rev: "v0.11.0"
     hooks:
       - id: ruff
         args: ["--fix"]
@@ -28,7 +28,7 @@ repos:
     hooks:
       - id: codespell
   - repo: https://github.com/pycontribs/mirrors-prettier
-    rev: "v3.5.2"
+    rev: "v3.5.3"
     hooks:
       - id: prettier
         exclude: ".all-contributorsrc"

polyfactory/factories/base.py

@@ -247,7 +247,7 @@ def _get_build_context(cls, build_context: BuildContext | None) -> BuildContext:
         return copy.deepcopy(build_context)
 
     @classmethod
-    def _infer_model_type(cls: type[F]) -> type[T] | None:
+    def _infer_model_type(cls) -> type[T] | None:
         """Return model type inferred from class declaration.
         class Foo(ModelFactory[MyModel]):  # <<< MyModel
             ...

polyfactory/factories/pydantic_factory.py

@@ -203,7 +203,7 @@ def from_field_info(
                     metadata.append(m)
 
             constraints = cast(
-                PydanticConstraints,
+                "PydanticConstraints",
                 cls.parse_constraints(metadata=metadata) if metadata else {},
             )
 
@@ -438,7 +438,7 @@ def get_constrained_field_value(
         field_build_parameters: Any | None = None,
         build_context: BuildContext | None = None,
     ) -> Any:
-        constraints = cast(PydanticConstraints, field_meta.constraints)
+        constraints = cast("PydanticConstraints", field_meta.constraints)
         if constraints.pop("json", None):
             value = cls.get_field_value(
                 field_meta, field_build_parameters=field_build_parameters, build_context=build_context

polyfactory/pytest_plugin.py

@@ -78,7 +78,7 @@ def __call__(self, factory: type[T], depth: int = 1) -> type[T]:
 
         def _factory_fixture() -> type[T]:
             """The wrapped factory"""
-            return cast(Type[T], factory)
+            return cast("Type[T]", factory)
 
         caller_globals = inspect.stack()[depth][0].f_globals
         caller_globals[fixture_name] = fixture_register(_factory_fixture)

polyfactory/utils/model_coverage.py

@@ -54,7 +54,7 @@ def next_value(self) -> T:
             if value.is_done():
                 # Only move onto the next instance if the sub-container is done
                 self._pos += 1
-            return cast(T, result)
+            return cast("T", result)
 
         self._pos += 1
         return value

polyfactory/value_generators/complex_types.py

@@ -5,11 +5,11 @@
 from typing_extensions import is_typeddict
 
 from polyfactory.constants import INSTANTIABLE_TYPE_MAPPING, PY_38
-from polyfactory.field_meta import FieldMeta
 from polyfactory.utils.model_coverage import CoverageContainer
 
 if TYPE_CHECKING:
     from polyfactory.factories.base import BaseFactory, BuildContext
+    from polyfactory.field_meta import FieldMeta
 
 
 def handle_collection_type(
@@ -42,7 +42,7 @@ def handle_collection_type(
 
     if issubclass(container_type, MutableMapping) or is_typeddict(container_type):
         for key_field_meta, value_field_meta in cast(
-            Iterable[Tuple[FieldMeta, FieldMeta]],
+            "Iterable[Tuple[FieldMeta, FieldMeta]]",
             zip(field_meta.children[::2], field_meta.children[1::2]),
         ):
             key = factory.get_field_value(
@@ -112,7 +112,7 @@ def handle_collection_type_coverage(  # noqa: C901, PLR0911
 
     if issubclass(container_type, MutableMapping) or is_typeddict(container_type):
         for key_field_meta, value_field_meta in cast(
-            Iterable[Tuple[FieldMeta, FieldMeta]],
+            "Iterable[Tuple[FieldMeta, FieldMeta]]",
             zip(field_meta.children[::2], field_meta.children[1::2]),
         ):
             key = CoverageContainer(factory.get_field_value_coverage(key_field_meta, build_context=build_context))

pyproject.toml

@@ -162,6 +162,7 @@ markers = [
     # Marks tests that use `attrs` library
     "attrs",
 ]
+asyncio_default_fixture_loop_scope = "function"
 
 [tool.coverage.report]
 exclude_lines = [

tests/sqlalchemy_factory/test_sqlalchemy_factory_v2.py

@@ -92,10 +92,10 @@ class SqlaModel(Base):
         mssql_json: orm.Mapped[Dict] = orm.mapped_column(type_=MSSQL_JSON)
 
         multible_pg_json_type: orm.Mapped[Dict] = orm.mapped_column(
-            type_=MutableDict.as_mutable(JSON(astext_type=Text()))  # type: ignore[no-untyped-call]
+            type_=MutableDict.as_mutable(JSON(astext_type=Text()))
         )
         multible_pg_jsonb_type: orm.Mapped[Dict] = orm.mapped_column(
-            type_=MutableDict.as_mutable(JSONB(astext_type=Text()))  # type: ignore[no-untyped-call]
+            type_=MutableDict.as_mutable(JSONB(astext_type=Text()))
         )
         multible_common_json_type: orm.Mapped[Dict] = orm.mapped_column(type_=MutableDict.as_mutable(types.JSON()))
         multible_mysql_json: orm.Mapped[Dict] = orm.mapped_column(type_=MutableDict.as_mutable(MYSQL_JSON()))

tests/test_beanie_factory.py

@@ -3,22 +3,11 @@
 
 import pymongo
 import pytest
+from beanie import Document, Link, init_beanie
+from beanie.odm.fields import Indexed, PydanticObjectId
+from mongomock_motor import AsyncMongoMockClient
 
-try:
-    from beanie import Document, Link, init_beanie
-    from beanie.odm.fields import Indexed, PydanticObjectId
-    from mongomock_motor import AsyncMongoMockClient
-
-    from polyfactory.factories.beanie_odm_factory import BeanieDocumentFactory
-except ImportError:
-    pytest.importorskip("beanie")
-
-    BeanieDocumentFactory = None  # type: ignore
-    Document = None  # type: ignore
-    Link = None  # type: ignore
-    init_beanie = None  # type: ignore
-    Indexed = None  # type: ignore
-    PydanticObjectId = None  # type: ignore
+from polyfactory.factories.beanie_odm_factory import BeanieDocumentFactory
 
 
 @pytest.fixture()

tests/test_odmantic_factory.py

@@ -6,15 +6,15 @@
 import pytest
 from bson import ObjectId
 
-from polyfactory.decorators import post_generated
+import pydantic
+
+if not pydantic.VERSION.startswith("1"):
+    pytest.skip("only for pydantic v1", allow_module_level=True)
 
-try:
-    from odmantic import AIOEngine, EmbeddedModel, Model
+from odmantic import AIOEngine, EmbeddedModel, Model
 
-    from polyfactory.factories.odmantic_odm_factory import OdmanticModelFactory
-except ImportError:
-    AIOEngine, EmbeddedModel, Model, OdmanticModelFactory = None, None, None, None  # type: ignore
-    pytest.importorskip("odmantic")
+from polyfactory.decorators import post_generated
+from polyfactory.factories.odmantic_odm_factory import OdmanticModelFactory
 
 
 class OtherEmbeddedDocument(EmbeddedModel):  # type: ignore