Update mypy and other tools

Cito · Cito · commit d6254c89b9ba · 2023-02-15T22:54:42.000+01:00
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -42,7 +42,7 @@ Changelog = "https://github.com/graphql-python/graphql-core/releases"
 [tool.poetry.dependencies]
 python = "^3.7"
 typing-extensions = [
-    { version = "^4.4", python = "<3.10" }
+    { version = "^4.5", python = "<3.10" }
 ]
 
 [tool.poetry.group.test]
@@ -61,15 +61,18 @@ tox = ">=3.0"
 optional = true
 
 [tool.poetry.group.lint.dependencies]
-black = "22.12.0"
+black = "23.1.0"
 flake8 = [
     { version = ">=5,<7", python = ">=3.8" },
     { version = ">=5,<6", python = "<3.8" }
 ]
 flake8-bandit = "^4.1"
-flake8-bugbear = "22.12.6"
-isort = "^5.11"
-mypy = "0.991"
+flake8-bugbear = "23.2.13"
+isort = [
+    { version = "^5.12", python = ">=3.8" },
+    { version = "^5.11", python = "<3.8" }
+]
+mypy = "1.0.0"
 bump2version = ">=1.0,<2"
 
 [tool.poetry.group.doc]
diff --git a/src/graphql/execution/execute.py b/src/graphql/execution/execute.py
@@ -1418,7 +1418,6 @@ def execute_subscription(
 
         result = resolve_fn(context.root_value, info, **args)
         if context.is_awaitable(result):
-
             # noinspection PyShadowingNames
             async def await_result() -> AsyncIterable[Any]:
                 try:
diff --git a/src/graphql/language/ast.py b/src/graphql/language/ast.py
@@ -240,7 +240,6 @@ def __hash__(self) -> int:
 
 
 class OperationType(Enum):
-
     QUERY = "query"
     MUTATION = "mutation"
     SUBSCRIPTION = "subscription"
@@ -479,7 +478,6 @@ class ArgumentNode(Node):
 
 
 class ConstArgumentNode(ArgumentNode):
-
     value: ConstValueNode
 
 
@@ -561,7 +559,6 @@ class ListValueNode(ValueNode):
 
 
 class ConstListValueNode(ListValueNode):
-
     values: Tuple[ConstValueNode, ...]
 
 
@@ -572,7 +569,6 @@ class ObjectValueNode(ValueNode):
 
 
 class ConstObjectValueNode(ObjectValueNode):
-
     fields: Tuple[ConstObjectFieldNode, ...]
 
 
@@ -584,7 +580,6 @@ class ObjectFieldNode(Node):
 
 
 class ConstObjectFieldNode(ObjectFieldNode):
-
     value: ConstValueNode
 
 
@@ -611,7 +606,6 @@ class DirectiveNode(Node):
 
 
 class ConstDirectiveNode(DirectiveNode):
-
     arguments: Tuple[ConstArgumentNode, ...]
 
 
diff --git a/src/graphql/language/visitor.py b/src/graphql/language/visitor.py
@@ -364,7 +364,6 @@ def leave(node: Node, *args: Any) -> Optional[VisitorAction]:
                     return None
 
             else:
-
                 enter = leave = None
 
             enter_leave = EnterLeaveVisitor(enter, leave)
diff --git a/src/graphql/type/definition.py b/src/graphql/type/definition.py
@@ -652,7 +652,6 @@ def is_required_argument(arg: GraphQLArgument) -> bool:
 
 
 class GraphQLObjectTypeKwargs(GraphQLNamedTypeKwargs, total=False):
-
     fields: GraphQLFieldMap
     interfaces: Tuple[GraphQLInterfaceType, ...]
     is_type_of: Optional[GraphQLIsTypeOfFn]
@@ -1128,7 +1127,6 @@ class GraphQLEnumValueKwargs(TypedDict, total=False):
 
 
 class GraphQLEnumValue:
-
     value: Any
     description: Optional[str]
     deprecation_reason: Optional[str]
diff --git a/src/graphql/type/schema.py b/src/graphql/type/schema.py
@@ -47,7 +47,6 @@
 
 
 class InterfaceImplementations(NamedTuple):
-
     objects: List[GraphQLObjectType]
     interfaces: List[GraphQLInterfaceType]
 
diff --git a/src/graphql/type/validate.py b/src/graphql/type/validate.py
@@ -57,7 +57,6 @@ def validate_schema(schema: GraphQLSchema) -> List[GraphQLError]:
     # noinspection PyProtectedMember
     errors = schema._validation_errors
     if errors is None:
-
         # Validate the schema, producing a list of errors.
         context = SchemaValidationContext(schema)
         context.validate_root_types()
@@ -196,7 +195,6 @@ def validate_name(self, node: Any, name: Optional[str] = None) -> None:
     def validate_types(self) -> None:
         validate_input_object_circular_refs = InputObjectCircularRefsValidator(self)
         for type_ in self.schema.type_map.values():
-
             # Ensure all provided types are in fact GraphQL type.
             if not is_named_type(type_):
                 self.report_error(
@@ -247,7 +245,6 @@ def validate_fields(
             )
 
         for field_name, field in fields.items():
-
             # Ensure they are named correctly.
             self.validate_name(field, field_name)
 
@@ -463,7 +460,6 @@ def validate_input_fields(self, input_obj: GraphQLInputObjectType) -> None:
 
         # Ensure the arguments are valid
         for field_name, field in fields.items():
-
             # Ensure they are named correctly.
             self.validate_name(field, field_name)
 
diff --git a/src/graphql/utilities/find_breaking_changes.py b/src/graphql/utilities/find_breaking_changes.py
@@ -140,7 +140,7 @@ def find_directive_changes(
             )
         )
 
-    for (old_directive, new_directive) in directives_diff.persisted:
+    for old_directive, new_directive in directives_diff.persisted:
         args_diff = dict_diff(old_directive.args, new_directive.args)
 
         for arg_name, new_arg in args_diff.added.items():
@@ -506,7 +506,6 @@ def is_change_safe_for_input_object_field_or_field_arg(
     old_type: GraphQLType, new_type: GraphQLType
 ) -> bool:
     if is_list_type(old_type):
-
         return is_list_type(
             # if they're both lists, make sure underlying types are compatible
             new_type
diff --git a/src/graphql/validation/rules/provided_required_arguments.py b/src/graphql/validation/rules/provided_required_arguments.py
@@ -60,7 +60,6 @@ def leave_directive(self, directive_node: DirectiveNode, *_args: Any) -> None:
         directive_name = directive_node.name.value
         required_args = self.required_args_map.get(directive_name)
         if required_args:
-
             arg_nodes = directive_node.arguments or ()
             arg_node_set = {arg.name.value for arg in arg_nodes}
             for arg_name in required_args:
diff --git a/tests/execution/test_abstract.py b/tests/execution/test_abstract.py
@@ -81,13 +81,11 @@ async def type_error(*_args):
 
 
 class Dog(NamedTuple):
-
     name: str
     woofs: bool
 
 
 class Cat(NamedTuple):
-
     name: str
     meows: bool
 
@@ -412,7 +410,6 @@ async def resolve_type_can_throw(sync):
         )
 
     def describe_using_typename_on_source_object():
-
         expected = (
             {
                 "pets": [
@@ -483,7 +480,6 @@ class RootValueWithInheritance:
             assert False, f"Unknown access variant: {access}"  # pragma: no cover
 
         def describe_union_type():
-
             schema = build_schema(
                 """
                 type Query {
diff --git a/tests/execution/test_execution_result.py b/tests/execution/test_execution_result.py
@@ -5,7 +5,6 @@
 
 
 def describe_execution_result():
-
     data = {"foo": "Some data"}
     error = GraphQLError("Some error")
     errors = [error]
diff --git a/tests/execution/test_middleware.py b/tests/execution/test_middleware.py
@@ -141,7 +141,6 @@ def second(self, _info):
             )
 
             class ReverseMiddleware:
-
                 # noinspection PyMethodMayBeStatic
                 def resolve(self, next_, *args, **kwargs):
                     return next_(*args, **kwargs)[::-1]
@@ -185,7 +184,6 @@ def reverse_middleware(next_, *args, **kwargs):
                 return next_(*args, **kwargs)[::-1]
 
             class CaptitalizeMiddleware:
-
                 # noinspection PyMethodMayBeStatic
                 def resolve(self, next_, *args, **kwargs):
                     return next_(*args, **kwargs).capitalize()
@@ -219,7 +217,6 @@ async def reverse_middleware(next_, *args, **kwargs):
                 return (await next_(*args, **kwargs))[::-1]
 
             class CaptitalizeMiddleware:
-
                 # noinspection PyMethodMayBeStatic
                 async def resolve(self, next_, *args, **kwargs):
                     return (await next_(*args, **kwargs)).capitalize()
diff --git a/tests/execution/test_mutations.py b/tests/execution/test_mutations.py
@@ -16,7 +16,6 @@
 
 # noinspection PyPep8Naming
 class NumberHolder:
-
     theNumber: int
 
     def __init__(self, originalNumber: int):
@@ -25,7 +24,6 @@ def __init__(self, originalNumber: int):
 
 # noinspection PyPep8Naming
 class Root:
-
     numberHolder: NumberHolder
 
     def __init__(self, originalNumber: int):
diff --git a/tests/execution/test_nonnull.py b/tests/execution/test_nonnull.py
@@ -147,7 +147,6 @@ async def throws():
             )
 
     def describe_nulls_a_returned_object_that_contains_a_non_null_field():
-
         query = """
             {
               syncNest {
@@ -512,7 +511,6 @@ async def throws():
             )
 
     def describe_handles_non_null_argument():
-
         # noinspection PyPep8Naming
         schema_with_non_null_arg = GraphQLSchema(
             GraphQLObjectType(
diff --git a/tests/execution/test_schema.py b/tests/execution/test_schema.py
@@ -19,7 +19,6 @@
 def describe_execute_handles_execution_with_a_complex_schema():
     def executes_using_a_schema():
         class Article:
-
             # noinspection PyShadowingBuiltins
             def __init__(self, id: int):
                 self.id = id
diff --git a/tests/execution/test_subscribe.py b/tests/execution/test_subscribe.py
@@ -881,7 +881,7 @@ def resolve_message(message, _info):
         subscription = subscribe(schema, document)
         assert isinstance(subscription, MapAsyncIterator)
 
-        assert await (anext(subscription)) == ({"newMessage": "Hello"}, None)
+        assert await anext(subscription) == ({"newMessage": "Hello"}, None)
 
         with raises(RuntimeError) as exc_info:
             await anext(subscription)
diff --git a/tests/execution/test_union_interface.py b/tests/execution/test_union_interface.py
@@ -17,7 +17,6 @@
 
 
 class Dog:
-
     name: str
     barks: bool
     mother: Optional[Dog]
@@ -33,7 +32,6 @@ def __init__(self, name: str, barks: bool):
 
 
 class Cat:
-
     name: str
     meows: bool
     mother: Optional[Cat]
@@ -49,7 +47,6 @@ def __init__(self, name: str, meows: bool):
 
 
 class Person:
-
     name: str
     pets: Optional[List[Union[Dog, Cat]]]
     friends: Optional[List[Union[Dog, Cat, Person]]]
diff --git a/tests/type/test_predicate.py b/tests/type/test_predicate.py
@@ -543,7 +543,6 @@ def returns_false_for_custom_directive():
 
 
 def describe_schema_predicates():
-
     schema = GraphQLSchema()
 
     def describe_is_schema_and_assert_schema():
diff --git a/tests/utilities/test_introspection_from_schema.py b/tests/utilities/test_introspection_from_schema.py
@@ -22,7 +22,6 @@ def introspection_to_sdl(introspection: IntrospectionQuery) -> str:
 
 
 def describe_introspection_from_schema():
-
     schema = GraphQLSchema(
         GraphQLObjectType(
             "Simple",
diff --git a/tests/validation/test_overlapping_fields_can_be_merged.py b/tests/validation/test_overlapping_fields_can_be_merged.py
@@ -577,7 +577,6 @@ def ignores_unknown_fragments():
         )
 
     def describe_return_types_must_be_unambiguous():
-
         schema = build_schema(
             """
             interface SomeBox {
diff --git a/tox.ini b/tox.ini
@@ -15,7 +15,7 @@ python =
 
 [testenv:black]
 basepython = python3.10
-deps = black==22.10.0
+deps = black==23.1.0
 commands  =
     black src tests -t py310 --check
 
@@ -24,20 +24,20 @@ basepython = python3.10
 deps =
     flake8>=6,<7
     flake8-bandit>=4.1,<5
-    flake8-bugbear==22.12.6
+    flake8-bugbear==23.2.13
 commands =
     flake8 src tests
 
 [testenv:isort]
 basepython = python3.10
-deps = isort>=5.11,<6
+deps = isort>=5.12,<6
 commands =
     isort src tests --check-only
 
 [testenv:mypy]
 basepython = python3.10
 deps =
-    mypy==0.991
+    mypy==1.0.0
     pytest>=7.2,<8
 commands =
     mypy src tests
@@ -58,7 +58,7 @@ deps =
     pytest-cov>=4,<5
     pytest-describe>=2,<3
     pytest-timeout>=2.1,<3
-    py37,py38,py39,pypy39: typing-extensions>=4.4,<5
+    py37,py38,py39,pypy39: typing-extensions>=4.5,<5
 commands =
     # to also run the time-consuming tests: tox -e py310 -- --run-slow
     # to run the benchmarks: tox -e py310 -- -k benchmarks --benchmark-enable

Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ def find_directive_changes(`
`140`	`140`	`)`
`141`	`141`	`)`
`142`	`142`
`143`		`- for (old_directive, new_directive) in directives_diff.persisted:`
	`143`	`+ for old_directive, new_directive in directives_diff.persisted:`
`144`	`144`	`args_diff = dict_diff(old_directive.args, new_directive.args)`
`145`	`145`
`146`	`146`	`for arg_name, new_arg in args_diff.added.items():`
`@@ -506,7 +506,6 @@ def is_change_safe_for_input_object_field_or_field_arg(`
`506`	`506`	`old_type: GraphQLType, new_type: GraphQLType`
`507`	`507`	`) -> bool:`
`508`	`508`	`if is_list_type(old_type):`
`509`		`-`
`510`	`509`	`return is_list_type(`
`511`	`510`	`# if they're both lists, make sure underlying types are compatible`
`512`	`511`	`new_type`