Fix deps and tests_tasks to drop support for 3.7 and fix issues for 3.8

Author: yuval9313

poetry.lock

@@ -49,20 +49,27 @@ psutil = "^5"
 pydantic-settings = { version= "^2.0.1", optional = true }
 typing-inspect = { version = "^0.9.0", optional = true}
 
-[tool.poetry.dev-dependencies]
+[tool.poetry.group.dev.dependencies]
 # Starlette features
 aiofiles = "*"  # Serving static files
 httpx = "*"  # TestClient
 
 # Testing
 pytest = "^7.0"
 pytest-cov = "*"
-pytest-asyncio = "*"
+pytest-asyncio = [
+  {version = "^0.21.1", python = "<3.9"},
+  {version = "*", python = ">=3.9"}
+]
 coverage = "*"
 codecov = "^2.1.13"
-mock = { version = "*", python = "<3.8" }
-types-mock = { version = "*", python = "<3.8" }
+pytest-timeout = "^2.3.1"
 
+# Documentation
+mkdocs = "*"
+mkdocs-material = "*"
+markdown-include = "*"
+autoflake = "^1.4"
 
 # Static
 ruff = ">0.3"
@@ -71,20 +78,10 @@ mypy = "*"
 sqlalchemy-stubs = "*"
 types-setuptools = "*"  # for pkg_resources import
 
-# Documentation
-mkdocs = "*"
-mkdocs-material = "*"
-markdown-include = "*"
-autoflake = "^1.4"
-
 [tool.poetry.extras]
 all = ["sqlalchemy", "pydantic-settings", "typing-inspect"]
 session = ["sqlalchemy"]
 
-[tool.poetry.group.dev.dependencies]
-codecov = "^2.1.13"
-pytest-timeout = "^2.3.1"
-
 [tool.black]
 line-length = 120
 target_version = ['py39']

pyproject.toml

@@ -1,17 +1,6 @@
 import asyncio
-import sys
-from typing import TYPE_CHECKING, NoReturn
-
-if TYPE_CHECKING:
-    if sys.version_info >= (3, 8):
-        from unittest.mock import AsyncMock, call, patch
-    else:
-        from mock import AsyncMock, call, patch
-else:
-    try:
-        from unittest.mock import AsyncMock, call, patch
-    except ImportError:
-        from mock import AsyncMock, call, patch
+from typing import NoReturn
+from unittest.mock import AsyncMock, call, patch
 
 import pytest