bump version in setup.py to 0.7.0 (#22)

* bump version in setup.py to 0.7.0
* bump dependencies, fix mypy warning

Author: ldruschk

dev-requirements.txt

@@ -1,7 +1,7 @@
-mypy==0.910
-black==21.6b0
-isort==5.9.1
-flake8==3.9.2
-coverage==5.5
-pytest==6.2.4
-pytest-asyncio==0.15.1
+mypy==0.942
+black==22.3.0
+isort==5.10.1
+flake8==4.0.1
+coverage==6.3.2
+pytest==7.1.2
+pytest-asyncio==0.18.3

enochecker3/enochecker.py

@@ -107,10 +107,9 @@ async def get(self, t: type) -> Any:
         args = await self._exit_stack.enter_async_context(
             self.checker._inject_dependencies(self.task, injector, None)
         )
-        if isawaitable(injector):
-            res = await injector(*args)
-        else:
-            res = injector(*args)
+        res = injector(*args)
+        if isawaitable(res):
+            res = await res
 
         if not hasattr(res, "__enter__") and not hasattr(res, "__aenter__"):
             return res
@@ -261,10 +260,10 @@ async def _inject_dependencies(
                 async with self._inject_dependencies(
                     task, injector, dependencies.union([v.annotation])
                 ) as args_:
-                    if isawaitable(injector):
-                        args.append(await injector(*args_))
-                    else:
-                        args.append(injector(*args_))
+                    arg = injector(*args_)
+                    if isawaitable(arg):
+                        arg = await arg
+                    args.append(arg)
 
         async with AsyncExitStack() as stack:
             # new_args contains the return values of __(a)enter__, which would be the "x" in "(async) with ... as x:"

requirements.txt

@@ -1,5 +1,5 @@
-httpx>=0.18.2,<0.19.0
-motor[asyncio]>=2.4.0,<3.0.0
-fastapi>=0.65.2,<0.66.0
-uvicorn>=0.14.0,<0.15.0
+httpx>=0.22.0,<0.23.0
+motor[asyncio]>=2.5.1,<3.0.0
+fastapi>=0.75.2,<0.76.0
+uvicorn>=0.17.6,<0.18.0
 gunicorn==20.1.0

setup.py

@@ -9,7 +9,7 @@
 
 setuptools.setup(
     name="enochecker3",
-    version="0.6.0",
+    version="0.7.0",
     author="ldruschk",
     author_email="[email protected]",
     description="FastAPI based library for building async python checkers for the EnoEngine A/D CTF Framework",