Update deps (mirumee#1022)

ariadne/contrib/federation/schema.py

@@ -142,7 +142,7 @@ def extend_federated_schema(
         assume_valid_sdl,
     )
 
-    for (k, v) in schema.type_map.items():
+    for k, v in schema.type_map.items():
         resolve_reference = getattr(v, "__resolve_reference__", None)
         if resolve_reference and k in extended_schema.type_map:
             setattr(

ariadne/contrib/federation/utils.py

@@ -79,7 +79,7 @@ def resolve_entities(_: Any, info: GraphQLResolveInfo, **kwargs) -> Any:
         type_object = info.schema.get_type(__typename)
 
         if not type_object or not isinstance(type_object, GraphQLObjectType):
-            raise Exception(
+            raise TypeError(
                 f"The `_entities` resolver tried to load an entity for"
                 f' type "{__typename}", but no object type of that name'
                 f" was found in the schema",

ariadne/contrib/tracing/opentracing.py

@@ -129,6 +129,8 @@ def repr_upload_file(upload_file: Union[UploadFile, File]) -> str:
     else:
         filename = upload_file.filename
 
+    mime_type: Union[str, None]
+
     if isinstance(upload_file, File):
         mime_type = "not/available"
     else:

ariadne/enums.py

@@ -129,7 +129,6 @@ def is_invalid_enum_value(field: Union[GraphQLInputField, GraphQLArgument]) -> b
 def find_enum_values_in_schema(
     schema: GraphQLSchema,
 ) -> Generator[Union[ArgumentWithKeys, InputFieldWithKeys], None, None]:
-
     for name, type_ in schema.type_map.items():
         result = enum_values_in_types(type_, name)
         if result is not None:

ariadne/graphql.py

@@ -145,14 +145,14 @@ async def graphql(
                 debug=debug,
                 extension_manager=extension_manager,
             )
-        else:
-            return handle_query_result(
-                result,
-                logger=logger,
-                error_formatter=error_formatter,
-                debug=debug,
-                extension_manager=extension_manager,
-            )
+
+        return handle_query_result(
+            result,
+            logger=logger,
+            error_formatter=error_formatter,
+            debug=debug,
+            extension_manager=extension_manager,
+        )
 
 
 def graphql_sync(
@@ -250,14 +250,14 @@ def graphql_sync(
                 debug=debug,
                 extension_manager=extension_manager,
             )
-        else:
-            return handle_query_result(
-                result,
-                logger=logger,
-                error_formatter=error_formatter,
-                debug=debug,
-                extension_manager=extension_manager,
-            )
+
+        return handle_query_result(
+            result,
+            logger=logger,
+            error_formatter=error_formatter,
+            debug=debug,
+            extension_manager=extension_manager,
+        )
 
 
 async def subscribe(
@@ -328,13 +328,13 @@ async def subscribe(
     except GraphQLError as error:
         log_error(error, logger)
         return False, [error_formatter(error, debug)]
-    else:
-        if isinstance(result, ExecutionResult):
-            errors = cast(List[GraphQLError], result.errors)
-            for error_ in errors:  # mypy issue #5080
-                log_error(error_, logger)
-            return False, [error_formatter(error, debug) for error in errors]
-        return True, cast(AsyncGenerator, result)
+
+    if isinstance(result, ExecutionResult):
+        errors = cast(List[GraphQLError], result.errors)
+        for error_ in errors:  # mypy issue #5080
+            log_error(error_, logger)
+        return False, [error_formatter(error, debug) for error in errors]
+    return True, cast(AsyncGenerator, result)
 
 
 def handle_query_result(

ariadne/schema_visitor.py

@@ -174,7 +174,6 @@ def call_method(
         method_name: str, type_: VisitableSchemaType, *args: Any
     ) -> Union[VisitableSchemaType, Literal[False]]:
         for visitor in visitor_selector(type_, method_name):
-
             new_type = getattr(visitor, method_name)(type_, *args)
             if new_type is None:
                 # Keep going without modifying type.

tests/asgi/test_websockets_graphql_transport_ws.py

@@ -767,7 +767,6 @@ def test_invalid_operation_id_is_handled_graphql_transport_ws(
 def test_schema_not_set_graphql_transport_ws(
     client_graphql_transport_ws,
 ):
-
     client_graphql_transport_ws.app.websocket_handler.schema = None
     with pytest.raises(TypeError):
         with client_graphql_transport_ws.websocket_connect(
@@ -786,7 +785,6 @@ def test_schema_not_set_graphql_transport_ws(
 def test_http_handler_not_set_graphql_transport_ws(
     client_graphql_transport_ws,
 ):
-
     client_graphql_transport_ws.app.websocket_handler.http_handler = None
     with pytest.raises(TypeError):
         with client_graphql_transport_ws.websocket_connect(

tests/conftest.py

@@ -57,6 +57,7 @@ def resolve_test_root(root, *_):
 
 
 def resolve_error(*_):
+    # pylint: disable=broad-exception-raised
     raise Exception("Test exception")
 
 
@@ -94,6 +95,7 @@ async def ping_generator(*_):
 
 
 async def error_generator(*_):
+    # pylint: disable=broad-exception-raised
     raise Exception("Test exception")
     yield 1  # pylint: disable=unreachable
 

tests/test_directives.py

@@ -430,7 +430,7 @@ def _resolver(_, info, *, f=None, o=None):
 
                 user = _get_user(context["headers"]["authToken"])
                 if not user.has_role(required_role):
-                    raise Exception("not authorized")
+                    raise ValueError("not authorized")
 
                 return original_resolver(_, info)
 

tests/tracing/test_opentracing.py

@@ -1,3 +1,4 @@
+from io import BytesIO
 from unittest.mock import ANY, call
 
 import pytest
@@ -125,7 +126,12 @@ def arg_filter(args, _):
 
     file_size = 1024 * 1024
     extension = OpenTracingExtension(arg_filter=arg_filter)
-    file_ = UploadFile(filename="test", content_type="text/plain")
+    file_ = UploadFile(
+        BytesIO(),
+        size=0,
+        filename="test",
+        headers={"content-type": "application/json"},
+    )
     await file_.write(b"\0" * file_size)
     kwargs = {"0": file_}
     info = mocker.Mock()