Bump dependencies (#874)

* fix pytest-asynio bump to 0.19

* bump mypy

* fix coverage of async fixtures

.pre-commit-config.yaml

@@ -11,7 +11,7 @@ repos:
         exclude: ^(docs_src/|examples/|tests/)
         args: [ '--max-line-length=88' ]
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.961
+    rev: v0.982
     hooks:
       - id: mypy
         exclude: ^(docs_src/|examples/)

ormar/fields/foreign_key.py

@@ -1,5 +1,4 @@
 import string
-import sys
 import uuid
 from dataclasses import dataclass
 from random import choices
@@ -15,24 +14,18 @@ from typing import (
     overload,
 )
 
+import ormar  # noqa I101
 import sqlalchemy
+from ormar.exceptions import ModelDefinitionError, RelationshipInstanceError
+from ormar.fields.base import BaseField
+from ormar.fields.referential_actions import ReferentialAction
 from pydantic import BaseModel, create_model
 from pydantic.typing import ForwardRef, evaluate_forwardref
 
-import ormar  # noqa I101
-from ormar.exceptions import ModelDefinitionError, RelationshipInstanceError
-from ormar.fields.referential_actions import ReferentialAction
-from ormar.fields.base import BaseField
-
 if TYPE_CHECKING:  # pragma no cover
     from ormar.models import Model, NewBaseModel, T
     from ormar.fields import ManyToManyField
 
-    if sys.version_info < (3, 7):
-        ToType = Type["T"]
-    else:
-        ToType = Union[Type["T"], "ForwardRef"]
-
 
 def create_dummy_instance(fk: Type["T"], pk: Any = None) -> "T":
     """
@@ -205,7 +198,7 @@ def ForeignKey(to: ForwardRef, **kwargs: Any) -> "Model":  # pragma: no cover
 
 
 def ForeignKey(  # type: ignore # noqa CFQ002
-    to: "ToType",
+    to: Union[Type["T"], "ForwardRef"],
     *,
     name: str = None,
     unique: bool = False,

pyproject.toml

@@ -74,7 +74,7 @@ python = "<3.8"
 pytest = "^7.1.3"
 pytest-cov = "^4.0.0"
 codecov = "^2.1.12"
-pytest-asyncio = "^0.18.3"
+pytest-asyncio = "^0.19.0"
 fastapi = ">=0.70.1,<0.86"
 flake8 = "^3.9.2"
 flake8-black = "^0.3.3"
@@ -88,7 +88,7 @@ flake8-functions = "^0.0.7"
 flake8-expression-complexity = "^0.0.11"
 
 # types
-mypy = "^0.971"
+mypy = "^0.982"
 types-ujson = "^5.5.0"
 types-PyMySQL = "^1.0.19"
 types-ipaddress = "^1.0.1"

tests/test_deferred/test_forward_refs.py

@@ -3,6 +3,7 @@ from typing import List
 
 import databases
 import pytest
+import pytest_asyncio
 import sqlalchemy as sa
 from pydantic.typing import ForwardRef
 from sqlalchemy import create_engine
@@ -77,7 +78,7 @@ def create_test_database():
     metadata.drop_all(engine)
 
 
-@pytest.fixture(scope="function")
+@pytest_asyncio.fixture(scope="function")
 async def cleanup():
     yield
     async with db:

tests/test_deferred/test_more_same_table_joins.py

@@ -67,15 +67,8 @@ class Teacher(ormar.Model):
     category: Optional[Category] = ormar.ForeignKey(Category, nullable=True)
 
 
-@pytest.fixture(scope="module")
-def event_loop():
-    loop = asyncio.get_event_loop()
-    yield loop
-    loop.close()
-
-
 @pytest.fixture(autouse=True, scope="module")
-async def create_test_database():
+def create_test_database():
     engine = sqlalchemy.create_engine(DATABASE_URL)
     metadata.drop_all(engine)
     metadata.create_all(engine)

tests/test_deferred/test_same_table_joins.py

@@ -67,15 +67,8 @@ class Teacher(ormar.Model):
     category: Optional[Category] = ormar.ForeignKey(Category, nullable=True)
 
 
-@pytest.fixture(scope="module")
-def event_loop():
-    loop = asyncio.get_event_loop()
-    yield loop
-    loop.close()
-
-
 @pytest.fixture(autouse=True, scope="module")
-async def create_test_database():
+def create_test_database():
     engine = sqlalchemy.create_engine(DATABASE_URL)
     metadata.drop_all(engine)
     metadata.create_all(engine)

tests/test_fastapi/test_relations_with_nested_defaults.py

@@ -2,6 +2,7 @@ from typing import Optional
 
 import databases
 import pytest
+import pytest_asyncio
 import sqlalchemy
 from fastapi import FastAPI
 from starlette.testclient import TestClient
@@ -71,7 +72,7 @@ def create_test_database():
     metadata.drop_all(engine)
 
 
-@pytest.fixture()
+@pytest_asyncio.fixture
 async def sample_data():
     async with database:
         country = await Country(id=1, name="USA").save()

tests/test_model_definition/pks_and_fks/test_saving_string_pks.py

@@ -3,6 +3,7 @@ from string import ascii_uppercase
 
 import databases
 import pytest
+import pytest_asyncio
 import sqlalchemy
 from sqlalchemy import create_engine
 
@@ -51,7 +52,7 @@ def create_test_database():
     metadata.drop_all(engine)
 
 
-@pytest.fixture(scope="function")
+@pytest_asyncio.fixture(scope="function")
 async def cleanup():
     yield
     async with database:

tests/test_model_definition/test_model_definition.py

@@ -6,6 +6,7 @@ import decimal
 import databases
 import pydantic
 import pytest
+import pytest_asyncio
 import sqlalchemy
 import typing
 
@@ -63,15 +64,8 @@ class ExampleModel2(Model):
     test_string: str = ormar.String(max_length=250)
 
 
-@pytest.fixture(scope="module")
-def event_loop():
-    loop = asyncio.get_event_loop()
-    yield loop
-    loop.close()
-
-
 @pytest.fixture(autouse=True, scope="module")
-async def create_test_database():
+def create_test_database():
     engine = sqlalchemy.create_engine(DATABASE_URL)
     metadata.create_all(engine)
     yield

tests/test_model_definition/test_server_default.py

@@ -27,15 +27,8 @@ class Product(ormar.Model):
     created: datetime = ormar.DateTime(server_default=func.now())
 
 
-@pytest.fixture(scope="module")
-def event_loop():
-    loop = asyncio.get_event_loop()
-    yield loop
-    loop.close()
-
-
 @pytest.fixture(autouse=True, scope="module")
-async def create_test_database():
+def create_test_database():
     engine = sqlalchemy.create_engine(DATABASE_URL)
     metadata.drop_all(engine)
     metadata.create_all(engine)

tests/test_ordering/test_default_model_order.py

@@ -2,6 +2,7 @@ from typing import Optional
 
 import databases
 import pytest
+import pytest_asyncio
 import sqlalchemy
 
 import ormar
@@ -46,7 +47,7 @@ def create_test_database():
     metadata.drop_all(engine)
 
 
-@pytest.fixture(autouse=True, scope="function")
+@pytest_asyncio.fixture(autouse=True, scope="function")
 async def cleanup():
     yield
     async with database:

tests/test_ordering/test_default_relation_order.py

@@ -3,6 +3,7 @@ from uuid import UUID, uuid4
 
 import databases
 import pytest
+import pytest_asyncio
 import sqlalchemy
 
 import ormar
@@ -70,7 +71,7 @@ def create_test_database():
     metadata.drop_all(engine)
 
 
-@pytest.fixture(autouse=True, scope="function")
+@pytest_asyncio.fixture(autouse=True, scope="function")
 async def cleanup():
     yield
     async with database:

tests/test_ordering/test_proper_order_of_sorting_apply.py

@@ -2,6 +2,7 @@ from typing import Optional
 
 import databases
 import pytest
+import pytest_asyncio
 import sqlalchemy
 
 import ormar
@@ -47,7 +48,7 @@ def create_test_database():
     metadata.drop_all(engine)
 
 
-@pytest.fixture(autouse=True, scope="function")
+@pytest_asyncio.fixture(autouse=True, scope="function")
 async def cleanup():
     yield
     async with database:

tests/test_queries/test_aggr_functions.py

@@ -2,6 +2,7 @@ from typing import Optional
 
 import databases
 import pytest
+import pytest_asyncio
 import sqlalchemy
 
 import ormar
@@ -47,7 +48,7 @@ def create_test_database():
     metadata.drop_all(engine)
 
 
-@pytest.fixture(autouse=True, scope="function")
+@pytest_asyncio.fixture(autouse=True, scope="function")
 async def cleanup():
     yield
     async with database:

tests/test_queries/test_queryproxy_on_m2m_models.py

@@ -67,15 +67,8 @@ class Post(ormar.Model):
     author: Optional[Author] = ormar.ForeignKey(Author)
 
 
-@pytest.fixture(scope="module")
-def event_loop():
-    loop = asyncio.get_event_loop()
-    yield loop
-    loop.close()
-
-
 @pytest.fixture(autouse=True, scope="module")
-async def create_test_database():
+def create_test_database():
     engine = sqlalchemy.create_engine(DATABASE_URL)
     metadata.create_all(engine)
     yield

tests/test_queries/test_selecting_subset_of_columns.py

@@ -5,6 +5,7 @@ from typing import Optional, List
 import databases
 import pydantic
 import pytest
+import pytest_asyncio
 import sqlalchemy
 
 import ormar
@@ -86,7 +87,7 @@ def event_loop():
     loop.close()
 
 
-@pytest.fixture(autouse=True, scope="module")
+@pytest_asyncio.fixture(autouse=True, scope="module")
 async def sample_data(event_loop, create_test_database):
     async with database:
         nick1 = await NickNames.objects.create(name="Nippon", is_lame=False)

tests/test_queries/test_values_and_values_list.py

@@ -3,6 +3,7 @@ from typing import List, Optional
 
 import databases
 import pytest
+import pytest_asyncio
 import sqlalchemy
 
 import ormar
@@ -69,7 +70,7 @@ def event_loop():
     loop.close()
 
 
-@pytest.fixture(autouse=True, scope="module")
+@pytest_asyncio.fixture(autouse=True, scope="module")
 async def sample_data(event_loop, create_test_database):
     async with database:
         creator = await User(name="Anonymous").save()

tests/test_relations/test_cascades.py

@@ -2,6 +2,7 @@ from typing import Optional
 
 import databases
 import pytest
+import pytest_asyncio
 import sqlalchemy
 
 import ormar
@@ -72,7 +73,7 @@ def create_test_database():
     metadata.drop_all(engine)
 
 
-@pytest.fixture(scope="function")
+@pytest_asyncio.fixture(scope="function")
 async def cleanup():
     yield
     async with database:

tests/test_relations/test_many_to_many.py

@@ -3,6 +3,7 @@ from typing import List, Optional
 
 import databases
 import pytest
+import pytest_asyncio
 import sqlalchemy
 
 import ormar
@@ -53,7 +54,7 @@ def event_loop():
     loop.close()
 
 
-@pytest.fixture(autouse=True, scope="module")
+@pytest_asyncio.fixture(autouse=True, scope="module")
 async def create_test_database():
     engine = sqlalchemy.create_engine(DATABASE_URL)
     metadata.create_all(engine)
@@ -61,7 +62,7 @@ async def create_test_database():
     metadata.drop_all(engine)
 
 
-@pytest.fixture(scope="function")
+@pytest_asyncio.fixture(scope="function")
 async def cleanup():
     yield
     async with database:

tests/test_relations/test_python_style_relations.py

@@ -2,6 +2,7 @@ from typing import List, Optional
 
 import databases
 import pytest
+import pytest_asyncio
 import sqlalchemy
 
 import ormar
@@ -52,7 +53,7 @@ def create_test_database():
     metadata.drop_all(engine)
 
 
-@pytest.fixture(scope="function")
+@pytest_asyncio.fixture(scope="function")
 async def cleanup():
     yield
     async with database:

tests/test_relations/test_skipping_reverse.py

@@ -2,6 +2,7 @@ from typing import List, Optional
 
 import databases
 import pytest
+import pytest_asyncio
 import sqlalchemy
 
 import ormar
@@ -51,7 +52,7 @@ def create_test_database():
     metadata.drop_all(engine)
 
 
-@pytest.fixture(scope="function")
+@pytest_asyncio.fixture(scope="function")
 async def cleanup():
     yield
     async with database:

tests/test_signals/test_signals.py

@@ -3,6 +3,7 @@ from typing import Optional
 import databases
 import pydantic
 import pytest
+import pytest_asyncio
 import sqlalchemy
 
 import ormar
@@ -66,7 +67,7 @@ def create_test_database():
     metadata.drop_all(engine)
 
 
-@pytest.fixture(scope="function")
+@pytest_asyncio.fixture(scope="function")
 async def cleanup():
     yield
     async with database:

tests/test_signals/test_signals_for_relations.py

@@ -2,6 +2,7 @@ from typing import Optional
 
 import databases
 import pytest
+import pytest_asyncio
 import sqlalchemy
 
 import ormar
@@ -70,7 +71,7 @@ def create_test_database():
     metadata.drop_all(engine)
 
 
-@pytest.fixture(autouse=True, scope="function")
+@pytest_asyncio.fixture(autouse=True, scope="function")
 async def cleanup():
     yield
     async with database: