Skip to content

Commit fc25e04

Browse files
[pre-commit.ci] pre-commit autoupdate (#3553)
* [pre-commit.ci] pre-commit autoupdate updates: - [github.com/astral-sh/ruff-pre-commit: v0.4.10 → v0.6.3](astral-sh/ruff-pre-commit@v0.4.10...v0.6.3) - [github.com/adamchainz/blacken-docs: 1.16.0 → 1.18.0](adamchainz/blacken-docs@1.16.0...1.18.0) * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Apply fixes * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Fix method * Snapshots --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Patrick Arminio <[email protected]>
1 parent 824e534 commit fc25e04

19 files changed

+33
-53
lines changed

.pre-commit-config.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/astral-sh/ruff-pre-commit
3-
rev: v0.4.10
3+
rev: v0.6.3
44
hooks:
55
- id: ruff-format
66
exclude: ^tests/\w+/snapshots/
@@ -31,7 +31,7 @@ repos:
3131
args: ["--branch", "main"]
3232

3333
- repo: https://github.com/adamchainz/blacken-docs
34-
rev: 1.16.0
34+
rev: 1.18.0
3535
hooks:
3636
- id: blacken-docs
3737
args: [--skip-errors]

pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ exclude = [
219219
"dist",
220220
"node_modules",
221221
"venv",
222-
"tests/codegen/snapshots"
222+
"tests/*/snapshots"
223223
]
224224
src = ["strawberry", "tests"]
225225

strawberry/dataloader.py

+2-5
Original file line numberDiff line numberDiff line change
@@ -208,14 +208,11 @@ def prime_many(self, data: Mapping[K, T], force: bool = False) -> None:
208208

209209

210210
def should_create_new_batch(loader: DataLoader, batch: Batch) -> bool:
211-
if (
211+
return bool(
212212
batch.dispatched
213213
or loader.max_batch_size
214214
and len(batch) >= loader.max_batch_size
215-
):
216-
return True
217-
218-
return False
215+
)
219216

220217

221218
def get_current_batch(loader: DataLoader) -> Batch:

strawberry/types/union.py

+1-4
Original file line numberDiff line numberDiff line change
@@ -235,10 +235,7 @@ def is_valid_union_type(type_: object) -> bool:
235235
if isinstance(type_, StrawberryUnion):
236236
return True
237237

238-
if get_origin(type_) is Annotated:
239-
return True
240-
241-
return False
238+
return get_origin(type_) is Annotated
242239

243240

244241
def union(

strawberry/utils/typing.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ def is_list(annotation: object) -> bool:
8484
"""Returns True if annotation is a List."""
8585
annotation_origin = getattr(annotation, "__origin__", None)
8686

87-
return annotation_origin == list
87+
return annotation_origin is list
8888

8989

9090
def is_union(annotation: object) -> bool:
@@ -313,7 +313,7 @@ def _get_namespace_from_ast(
313313
# can properly resolve it later
314314
type_name = args[0].strip(" '\"\n")
315315
for arg in args[1:]:
316-
evaled_arg = eval(arg, globalns, localns) # noqa: PGH001, S307
316+
evaled_arg = eval(arg, globalns, localns) # noqa: S307
317317
if isinstance(evaled_arg, StrawberryLazyReference):
318318
extra[type_name] = evaled_arg.resolve_forward_ref(ForwardRef(type_name))
319319

tests/experimental/pydantic/schema/test_defaults.py

-8
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,6 @@ class User: ...
6464
class Query:
6565
a: User = strawberry.field()
6666

67-
@strawberry.field
68-
def a(self) -> User:
69-
return User()
70-
7167
schema = strawberry.Schema(Query)
7268

7369
expected = """
@@ -95,10 +91,6 @@ class User: ...
9591
class Query:
9692
a: User = strawberry.field()
9793

98-
@strawberry.field
99-
def a(self) -> User:
100-
return User()
101-
10294
schema = strawberry.Schema(Query)
10395

10496
expected = """

tests/experimental/pydantic/test_conversion.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ class User:
228228
assert len(definition.fields) == 1
229229
assert definition.fields[0].python_name == "age"
230230
assert definition.fields[0].graphql_name is None
231-
assert definition.fields[0].type == int
231+
assert definition.fields[0].type is int
232232

233233

234234
def test_can_convert_pydantic_type_with_nested_data_to_strawberry():

tests/fields/test_arguments.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@ def name(
421421

422422
assert argument.python_name == "argument"
423423
assert argument.graphql_name is None
424-
assert argument.type == str
424+
assert argument.type is str
425425
assert argument.description == "This is a description"
426426
assert argument.type is str
427427

tests/fields/test_resolvers.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class Query:
3535

3636
assert definition.fields[0].python_name == "name"
3737
assert definition.fields[0].graphql_name is None
38-
assert definition.fields[0].type == str
38+
assert definition.fields[0].type is str
3939
assert definition.fields[0].base_resolver.wrapped_func == get_name
4040

4141

@@ -53,7 +53,7 @@ def name(self) -> str:
5353

5454
assert definition.fields[0].python_name == "name"
5555
assert definition.fields[0].graphql_name is None
56-
assert definition.fields[0].type == str
56+
assert definition.fields[0].type is str
5757
assert definition.fields[0].base_resolver(None) == Query().name()
5858

5959

@@ -72,7 +72,7 @@ def name() -> str:
7272

7373
assert definition.fields[0].python_name == "name"
7474
assert definition.fields[0].graphql_name is None
75-
assert definition.fields[0].type == str
75+
assert definition.fields[0].type is str
7676
assert definition.fields[0].base_resolver() == Query.name()
7777

7878
assert Query.name() == "Name"
@@ -96,7 +96,7 @@ def val(cls) -> str:
9696

9797
assert definition.fields[0].python_name == "val"
9898
assert definition.fields[0].graphql_name is None
99-
assert definition.fields[0].type == str
99+
assert definition.fields[0].type is str
100100
assert definition.fields[0].base_resolver() == Query.val()
101101

102102
assert Query.val() == "thingy"
@@ -310,13 +310,13 @@ class Query:
310310
assert definition.fields[0].python_name == "name"
311311
assert definition.fields[0].graphql_name is None
312312
assert definition.fields[0].python_name == "name"
313-
assert definition.fields[0].type == str
313+
assert definition.fields[0].type is str
314314
assert definition.fields[0].base_resolver.wrapped_func == get_name
315315

316316
assert definition.fields[1].python_name == "name_2"
317317
assert definition.fields[1].graphql_name is None
318318
assert definition.fields[1].python_name == "name_2"
319-
assert definition.fields[1].type == str
319+
assert definition.fields[1].type is str
320320
assert definition.fields[1].base_resolver.wrapped_func == get_name
321321

322322

tests/http/clients/base.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -290,9 +290,8 @@ async def __aiter__(self) -> AsyncGenerator[Message, None]:
290290

291291

292292
class DebuggableGraphQLTransportWSMixin:
293-
@staticmethod
294293
def on_init(self) -> None:
295-
"""This method can be patched by unittests to get the instance of the
294+
"""This method can be patched by unit tests to get the instance of the
296295
transport handler when it is initialized.
297296
"""
298297

tests/objects/test_interfaces.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class User(Node):
3838

3939
assert definition.fields[1].python_name == "name"
4040
assert definition.fields[1].graphql_name is None
41-
assert definition.fields[1].type == str
41+
assert definition.fields[1].type is str
4242

4343
assert definition.is_interface is False
4444
assert definition.interfaces == [Node.__strawberry_definition__]
@@ -68,7 +68,7 @@ class Person(Node):
6868

6969
assert definition.fields[1].python_name == "name"
7070
assert definition.fields[1].graphql_name is None
71-
assert definition.fields[1].type == str
71+
assert definition.fields[1].type is str
7272

7373
assert definition.is_interface is False
7474
assert definition.interfaces == [Node.__strawberry_definition__]
@@ -84,7 +84,7 @@ class Person(Node):
8484

8585
assert definition.fields[1].python_name == "name"
8686
assert definition.fields[1].graphql_name is None
87-
assert definition.fields[1].type == str
87+
assert definition.fields[1].type is str
8888

8989
assert definition.is_interface is False
9090
assert definition.interfaces == [Node.__strawberry_definition__]

tests/schema/extensions/test_mask_errors.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,7 @@ def hidden_error(self) -> str:
4545

4646
def should_mask_error(error: GraphQLError) -> bool:
4747
original_error = error.original_error
48-
if original_error and isinstance(original_error, VisibleError):
49-
return False
50-
return True
48+
return not (original_error and isinstance(original_error, VisibleError))
5149

5250
schema = strawberry.Schema(
5351
query=Query, extensions=[MaskErrors(should_mask_error=should_mask_error)]

tests/schema/test_info.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ def field(self, info: strawberry.Info) -> return_type:
320320

321321
def test_return_type_from_field():
322322
def resolver(info):
323-
assert info.return_type == int
323+
assert info.return_type is int
324324
return 0
325325

326326
@strawberry.type

tests/schema/test_permission.py

+1-4
Original file line numberDiff line numberDiff line change
@@ -568,10 +568,7 @@ class IsAuthorized(BasePermission):
568568
def has_permission(
569569
self, source, info, **kwargs: typing.Any
570570
) -> bool: # pragma: no cover
571-
if kwargs["a_key"] == "secret":
572-
return True
573-
574-
return False
571+
return kwargs["a_key"] == "secret"
575572

576573
@strawberry.type
577574
class Query:

tests/schema/test_private_field.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class Query:
2222

2323
assert definition.fields[0].python_name == "name"
2424
assert definition.fields[0].graphql_name is None
25-
assert definition.fields[0].type == str
25+
assert definition.fields[0].type is str
2626

2727
instance = Query(name="Luke", age=22)
2828
assert instance.name == "Luke"

tests/tools/test_create_type.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def name() -> str:
2525

2626
assert definition.fields[0].python_name == "name"
2727
assert definition.fields[0].graphql_name is None
28-
assert definition.fields[0].type == str
28+
assert definition.fields[0].type is str
2929

3030

3131
def test_create_type_extend_and_directives():
@@ -52,7 +52,7 @@ def name() -> str:
5252

5353
assert definition.fields[0].python_name == "name"
5454
assert definition.fields[0].graphql_name is None
55-
assert definition.fields[0].type == str
55+
assert definition.fields[0].type is str
5656

5757

5858
def test_create_input_type():
@@ -73,7 +73,7 @@ def test_create_input_type():
7373

7474
assert definition.fields[0].python_name == "name"
7575
assert definition.fields[0].graphql_name is None
76-
assert definition.fields[0].type == str
76+
assert definition.fields[0].type is str
7777

7878

7979
def test_create_interface_type():
@@ -95,7 +95,7 @@ def test_create_interface_type():
9595

9696
assert definition.fields[0].python_name == "name"
9797
assert definition.fields[0].graphql_name is None
98-
assert definition.fields[0].type == str
98+
assert definition.fields[0].type is str
9999

100100

101101
def test_create_variable_type():
@@ -111,7 +111,7 @@ def get_name() -> str:
111111

112112
assert definition.fields[0].python_name == "get_name"
113113
assert definition.fields[0].graphql_name == "name"
114-
assert definition.fields[0].type == str
114+
assert definition.fields[0].type is str
115115

116116

117117
def test_create_type_empty_list():

tests/types/test_annotation.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,12 @@ def __eq__(self, other):
6464

6565

6666
def test_eq_on_non_annotation():
67-
assert StrawberryAnnotation(int) != int
67+
assert StrawberryAnnotation(int) is not int
6868
assert StrawberryAnnotation(int) != 123
6969

7070

7171
def test_set_anntation():
7272
annotation = StrawberryAnnotation(int)
7373
annotation.annotation = str
7474

75-
assert annotation.annotation == str
75+
assert annotation.annotation is str

tests/types/test_argument_types.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ def get_name(id_: int) -> str:
6060
return "Lord Buckethead"
6161

6262
argument = get_name.arguments[0]
63-
assert argument.type == int
63+
assert argument.type is int
6464

6565

6666
def test_object():

tests/types/test_object_types.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class Fabric:
6363

6464
field: StrawberryField = get_object_definition(Fabric).fields[0]
6565

66-
assert field.type == str
66+
assert field.type is str
6767

6868

6969
def test_object():

0 commit comments

Comments
 (0)