Update ruff and adapt code style

pyproject.toml

@@ -75,7 +75,7 @@ tox = [
 optional = true
 
 [tool.poetry.group.lint.dependencies]
-ruff = ">=0.5.7,<0.6"
+ruff = ">=0.6.4,<0.7"
 mypy = [
     { version = "^1.11", python = ">=3.8" },
     { version = "~1.4", python = "<3.8" }

src/graphql/execution/execute.py

@@ -96,7 +96,7 @@
     anext  # noqa: B018
 except NameError:  # pragma: no cover (Python < 3.10)
     # noinspection PyShadowingBuiltins
-    async def anext(iterator: AsyncIterator) -> Any:  # noqa: A001
+    async def anext(iterator: AsyncIterator) -> Any:
         """Return the next item from an async iterator."""
         return await iterator.__anext__()
 

src/graphql/pyutils/suggestion_list.py

@@ -99,8 +99,7 @@ def measure(self, option: str, threshold: int) -> int | None:
                     double_diagonal_cell = rows[(i - 2) % 3][j - 2]
                     current_cell = min(current_cell, double_diagonal_cell + 1)
 
-                if current_cell < smallest_cell:
-                    smallest_cell = current_cell
+                smallest_cell = min(current_cell, smallest_cell)
 
                 current_row[j] = current_cell
 

tests/execution/test_abstract.py

@@ -3,6 +3,7 @@
 from typing import Any, NamedTuple
 
 import pytest
+
 from graphql.execution import ExecutionResult, execute, execute_sync
 from graphql.language import parse
 from graphql.pyutils import is_awaitable

tests/execution/test_customize.py

@@ -1,6 +1,7 @@
 from inspect import isasyncgen
 
 import pytest
+
 from graphql.execution import ExecutionContext, execute, subscribe
 from graphql.language import parse
 from graphql.type import GraphQLField, GraphQLObjectType, GraphQLSchema, GraphQLString
@@ -9,7 +10,7 @@
     anext  # noqa: B018
 except NameError:  # pragma: no cover (Python < 3.10)
     # noinspection PyShadowingBuiltins
-    async def anext(iterator):  # noqa: A001
+    async def anext(iterator):
         """Return the next item from an async iterator."""
         return await iterator.__anext__()
 
@@ -62,7 +63,7 @@ def execute_field(
 
 
 def describe_customize_subscription():
-    @pytest.mark.asyncio()
+    @pytest.mark.asyncio
     async def uses_a_custom_subscribe_field_resolver():
         schema = GraphQLSchema(
             query=GraphQLObjectType("Query", {"foo": GraphQLField(GraphQLString)}),
@@ -91,7 +92,7 @@ async def custom_foo():
 
         await subscription.aclose()
 
-    @pytest.mark.asyncio()
+    @pytest.mark.asyncio
     async def uses_a_custom_execution_context_class():
         class TestExecutionContext(ExecutionContext):
             def build_resolve_info(self, *args, **kwargs):

tests/execution/test_defer.py

@@ -4,6 +4,7 @@
 from typing import Any, AsyncGenerator, NamedTuple
 
 import pytest
+
 from graphql.error import GraphQLError
 from graphql.execution import (
     ExecutionResult,
@@ -333,7 +334,7 @@ def can_print_deferred_fragment_record():
             "path=['bar'], label='foo', parent_context, data)"
         )
 
-    @pytest.mark.asyncio()
+    @pytest.mark.asyncio
     async def can_defer_fragments_containing_scalar_types():
         document = parse(
             """
@@ -358,7 +359,7 @@ async def can_defer_fragments_containing_scalar_types():
             },
         ]
 
-    @pytest.mark.asyncio()
+    @pytest.mark.asyncio
     async def can_disable_defer_using_if_argument():
         document = parse(
             """
@@ -384,7 +385,7 @@ async def can_disable_defer_using_if_argument():
             },
         }
 
-    @pytest.mark.asyncio()
+    @pytest.mark.asyncio
     async def does_not_disable_defer_with_null_if_argument():
         document = parse(
             """
@@ -409,7 +410,7 @@ async def does_not_disable_defer_with_null_if_argument():
             },
         ]
 
-    @pytest.mark.asyncio()
+    @pytest.mark.asyncio
     async def throws_an_error_for_defer_directive_with_non_string_label():
         document = parse(
             """
@@ -430,7 +431,7 @@ async def throws_an_error_for_defer_directive_with_non_string_label():
             ],
         }
 
-    @pytest.mark.asyncio()
+    @pytest.mark.asyncio
     async def can_defer_fragments_on_the_top_level_query_field():
         document = parse(
             """
@@ -456,7 +457,7 @@ async def can_defer_fragments_on_the_top_level_query_field():
             },
         ]
 
-    @pytest.mark.asyncio()
+    @pytest.mark.asyncio
     async def can_defer_fragments_with_errors_on_the_top_level_query_field():
         document = parse(
             """
@@ -493,7 +494,7 @@ async def can_defer_fragments_with_errors_on_the_top_level_query_field():
             },
         ]
 
-    @pytest.mark.asyncio()
+    @pytest.mark.asyncio
     async def can_defer_a_fragment_within_an_already_deferred_fragment():
         document = parse(
             """
@@ -540,7 +541,7 @@ async def can_defer_a_fragment_within_an_already_deferred_fragment():
             },
         ]
 
-    @pytest.mark.asyncio()
+    @pytest.mark.asyncio
     async def can_defer_a_fragment_that_is_also_not_deferred_with_deferred_first():
         document = parse(
             """
@@ -571,7 +572,7 @@ async def can_defer_a_fragment_that_is_also_not_deferred_with_deferred_first():
             },
         ]
 
-    @pytest.mark.asyncio()
+    @pytest.mark.asyncio
     async def can_defer_a_fragment_that_is_also_not_deferred_with_non_deferred_first():
         document = parse(
             """
@@ -602,7 +603,7 @@ async def can_defer_a_fragment_that_is_also_not_deferred_with_non_deferred_first
             },
         ]
 
-    @pytest.mark.asyncio()
+    @pytest.mark.asyncio
     async def can_defer_an_inline_fragment():
         document = parse(
             """
@@ -632,7 +633,7 @@ async def can_defer_an_inline_fragment():
             },
         ]
 
-    @pytest.mark.asyncio()
+    @pytest.mark.asyncio
     async def handles_errors_thrown_in_deferred_fragments():
         document = parse(
             """
@@ -669,7 +670,7 @@ async def handles_errors_thrown_in_deferred_fragments():
             },
         ]
 
-    @pytest.mark.asyncio()
+    @pytest.mark.asyncio
     async def handles_non_nullable_errors_thrown_in_deferred_fragments():
         document = parse(
             """
@@ -709,7 +710,7 @@ async def handles_non_nullable_errors_thrown_in_deferred_fragments():
             },
         ]
 
-    @pytest.mark.asyncio()
+    @pytest.mark.asyncio
     async def handles_non_nullable_errors_thrown_outside_deferred_fragments():
         document = parse(
             """
@@ -740,7 +741,7 @@ async def handles_non_nullable_errors_thrown_outside_deferred_fragments():
             ],
         }
 
-    @pytest.mark.asyncio()
+    @pytest.mark.asyncio
     async def handles_async_non_nullable_errors_thrown_in_deferred_fragments():
         document = parse(
             """
@@ -780,7 +781,7 @@ async def handles_async_non_nullable_errors_thrown_in_deferred_fragments():
             },
         ]
 
-    @pytest.mark.asyncio()
+    @pytest.mark.asyncio
     async def returns_payloads_in_correct_order():
         document = parse(
             """
@@ -833,7 +834,7 @@ async def returns_payloads_in_correct_order():
             },
         ]
 
-    @pytest.mark.asyncio()
+    @pytest.mark.asyncio
     async def returns_payloads_from_synchronous_data_in_correct_order():
         document = parse(
             """
@@ -886,7 +887,7 @@ async def returns_payloads_from_synchronous_data_in_correct_order():
             },
         ]
 
-    @pytest.mark.asyncio()
+    @pytest.mark.asyncio
     async def filters_deferred_payloads_when_list_item_from_async_iterable_nulled():
         document = parse(
             """
@@ -920,7 +921,7 @@ async def filters_deferred_payloads_when_list_item_from_async_iterable_nulled():
             ],
         }
 
-    @pytest.mark.asyncio()
+    @pytest.mark.asyncio
     async def original_execute_function_throws_error_if_deferred_and_all_is_sync():
         document = parse(
             """
@@ -938,7 +939,7 @@ async def original_execute_function_throws_error_if_deferred_and_all_is_sync():
             " multiple payloads (due to @defer or @stream directive)"
         )
 
-    @pytest.mark.asyncio()
+    @pytest.mark.asyncio
     async def original_execute_function_throws_error_if_deferred_and_not_all_is_sync():
         document = parse(
             """

tests/execution/test_execution_result.py

@@ -1,4 +1,5 @@
 import pytest
+
 from graphql.error import GraphQLError
 from graphql.execution import ExecutionResult
 

tests/execution/test_executor.py

@@ -4,6 +4,7 @@
 from typing import Any, Awaitable, cast
 
 import pytest
+
 from graphql.error import GraphQLError
 from graphql.execution import execute, execute_sync
 from graphql.language import FieldNode, OperationDefinitionNode, parse
@@ -41,7 +42,7 @@ def accepts_positional_arguments():
 
         assert result == ({"a": "rootValue"}, None)
 
-    @pytest.mark.asyncio()
+    @pytest.mark.asyncio
     async def executes_arbitrary_code():
         # noinspection PyMethodMayBeStatic,PyMethodMayBeStatic
         class Data:
@@ -375,7 +376,7 @@ def resolve(_obj, _info, **args):
         assert len(resolved_args) == 1
         assert resolved_args[0] == {"numArg": 123, "stringArg": "foo"}
 
-    @pytest.mark.asyncio()
+    @pytest.mark.asyncio
     async def nulls_out_error_subtrees():
         document = parse(
             """
@@ -868,7 +869,7 @@ def resolves_to_an_error_if_schema_does_not_support_operation():
             ],
         )
 
-    @pytest.mark.asyncio()
+    @pytest.mark.asyncio
     async def correct_field_ordering_despite_execution_order():
         schema = GraphQLSchema(
             GraphQLObjectType(
@@ -984,7 +985,7 @@ def does_not_include_arguments_that_were_not_set():
             None,
         )
 
-    @pytest.mark.asyncio()
+    @pytest.mark.asyncio
     async def fails_when_is_type_of_check_is_not_met():
         class Special:
             value: str