Skip to content

Commit 42a40b4

Browse files
tcleonardThomas Leonard
tcleonard
and
Thomas Leonard
authored
chore: update dev dependencies (#1345)
Co-authored-by: Thomas Leonard <thomas@loftorbital.com>
1 parent 8ae5763 commit 42a40b4

File tree

13 files changed

+72
-50
lines changed

13 files changed

+72
-50
lines changed

‎Makefile‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,21 @@
1+
.PHONY: help
2+
help:
3+
@echo "Please use \`make <target>' where <target> is one of"
4+
@grep -E '^\.PHONY: [a-zA-Z_-]+ .*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = "(: |##)"}; {printf "\033[36m%-30s\033[0m %s\n", $$2, $$3}'
5+
16
.PHONY: dev-setup ## Install development dependencies
27
dev-setup:
38
pip install -e ".[dev]"
49

5-
.PHONY: install-dev
6-
install-dev: dev-setup # Alias install-dev -> dev-setup
7-
8-
.PHONY: tests
10+
.PHONY: tests ## Run unit tests
911
tests:
1012
py.test graphene_django --cov=graphene_django -vv
1113

12-
.PHONY: test
13-
test: tests # Alias test -> tests
14-
15-
.PHONY: format
14+
.PHONY: format ## Format code
1615
format:
1716
black --exclude "/migrations/" graphene_django examples setup.py
1817

19-
.PHONY: lint
18+
.PHONY: lint ## Lint code
2019
lint:
2120
flake8 graphene_django examples
2221

‎graphene_django/fields.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,10 @@ def wrap_resolve(self, parent_resolver):
6969
_type = _type.of_type
7070
django_object_type = _type.of_type.of_type
7171
return partial(
72-
self.list_resolver, django_object_type, resolver, self.get_manager(),
72+
self.list_resolver,
73+
django_object_type,
74+
resolver,
75+
self.get_manager(),
7376
)
7477

7578

‎graphene_django/filter/filters/global_id_filter.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class GlobalIDFilter(Filter):
1313
field_class = GlobalIDFormField
1414

1515
def filter(self, qs, value):
16-
""" Convert the filter value to a primary key before filtering """
16+
"""Convert the filter value to a primary key before filtering"""
1717
_id = None
1818
if value is not None:
1919
_, _id = from_global_id(value)

‎graphene_django/filter/filterset.py‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919

2020
class GrapheneFilterSetMixin(BaseFilterSet):
21-
""" A django_filters.filterset.BaseFilterSet with default filter overrides
22-
to handle global IDs """
21+
"""A django_filters.filterset.BaseFilterSet with default filter overrides
22+
to handle global IDs"""
2323

2424
FILTER_DEFAULTS = dict(
2525
itertools.chain(
@@ -29,8 +29,7 @@ class GrapheneFilterSetMixin(BaseFilterSet):
2929

3030

3131
def setup_filterset(filterset_class):
32-
""" Wrap a provided filterset in Graphene-specific functionality
33-
"""
32+
"""Wrap a provided filterset in Graphene-specific functionality"""
3433
return type(
3534
"Graphene{}".format(filterset_class.__name__),
3635
(filterset_class, GrapheneFilterSetMixin),
@@ -39,8 +38,7 @@ def setup_filterset(filterset_class):
3938

4039

4140
def custom_filterset_factory(model, filterset_base_class=FilterSet, **meta):
42-
""" Create a filterset for the given model using the provided meta data
43-
"""
41+
"""Create a filterset for the given model using the provided meta data"""
4442
meta.update({"model": model})
4543
meta_class = type(str("Meta"), (object,), meta)
4644
filterset = type(

‎graphene_django/filter/tests/conftest.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,10 @@ class Query(graphene.ObjectType):
8989
def resolve_events(self, info, **kwargs):
9090

9191
events = [
92-
Event(name="Live Show", tags=["concert", "music", "rock"],),
93-
Event(name="Musical", tags=["movie", "music"],),
94-
Event(name="Ballet", tags=["concert", "dance"],),
95-
Event(name="Speech", tags=[],),
92+
Event(name="Live Show", tags=["concert", "music", "rock"]),
93+
Event(name="Musical", tags=["movie", "music"]),
94+
Event(name="Ballet", tags=["concert", "dance"]),
95+
Event(name="Speech", tags=[]),
9696
]
9797

9898
STORE["events"] = events

‎graphene_django/filter/tests/test_enum_filtering.py‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,13 @@ def reporter_article_data():
5454
first_name="Jane", last_name="Doe", email="janedoe@example.com", a_choice=2
5555
)
5656
Article.objects.create(
57-
headline="Article Node 1", reporter=john, editor=john, lang="es",
57+
headline="Article Node 1", reporter=john, editor=john, lang="es"
5858
)
5959
Article.objects.create(
60-
headline="Article Node 2", reporter=john, editor=john, lang="en",
60+
headline="Article Node 2", reporter=john, editor=john, lang="en"
6161
)
6262
Article.objects.create(
63-
headline="Article Node 3", reporter=jane, editor=jane, lang="en",
63+
headline="Article Node 3", reporter=jane, editor=jane, lang="en"
6464
)
6565

6666

@@ -80,7 +80,13 @@ def test_filter_enum_on_connection(schema, reporter_article_data):
8080
}
8181
"""
8282

83-
expected = {"allArticles": {"edges": [{"node": {"headline": "Article Node 1"}},]}}
83+
expected = {
84+
"allArticles": {
85+
"edges": [
86+
{"node": {"headline": "Article Node 1"}},
87+
]
88+
}
89+
}
8490

8591
result = schema.execute(query)
8692
assert not result.errors

‎graphene_django/filter/tests/test_fields.py‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1224,7 +1224,7 @@ class Query(ObjectType):
12241224
}
12251225
}
12261226

1227-
result = schema.execute(query, variable_values={"email": reporter_1.email},)
1227+
result = schema.execute(query, variable_values={"email": reporter_1.email})
12281228

12291229
assert not result.errors
12301230
assert result.data == expected
@@ -1265,13 +1265,23 @@ class Query(ObjectType):
12651265
result = schema.execute(query, variables={"filter": "Ja"})
12661266
assert not result.errors
12671267
assert result.data == {
1268-
"people": {"edges": [{"node": {"name": "Jack"}}, {"node": {"name": "Jane"}},]}
1268+
"people": {
1269+
"edges": [
1270+
{"node": {"name": "Jack"}},
1271+
{"node": {"name": "Jane"}},
1272+
]
1273+
}
12691274
}
12701275

12711276
result = schema.execute(query, variables={"filter": "o"})
12721277
assert not result.errors
12731278
assert result.data == {
1274-
"people": {"edges": [{"node": {"name": "Joe"}}, {"node": {"name": "Bob"}},]}
1279+
"people": {
1280+
"edges": [
1281+
{"node": {"name": "Joe"}},
1282+
{"node": {"name": "Bob"}},
1283+
]
1284+
}
12751285
}
12761286

12771287

‎graphene_django/filter/tests/test_typed_filter.py‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -103,15 +103,9 @@ def test_typed_filter_schema(schema):
103103

104104
def test_typed_filters_work(schema):
105105
reporter = Reporter.objects.create(first_name="John", last_name="Doe", email="")
106-
Article.objects.create(
107-
headline="A", reporter=reporter, editor=reporter, lang="es",
108-
)
109-
Article.objects.create(
110-
headline="B", reporter=reporter, editor=reporter, lang="es",
111-
)
112-
Article.objects.create(
113-
headline="C", reporter=reporter, editor=reporter, lang="en",
114-
)
106+
Article.objects.create(headline="A", reporter=reporter, editor=reporter, lang="es")
107+
Article.objects.create(headline="B", reporter=reporter, editor=reporter, lang="es")
108+
Article.objects.create(headline="C", reporter=reporter, editor=reporter, lang="en")
115109

116110
query = "query { articles (lang_In: [ES]) { edges { node { headline } } } }"
117111

‎graphene_django/filter/utils.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,9 @@ def get_filtering_args_from_filterset(filterset_class, type):
9494
field_type = graphene.List(field_type)
9595

9696
args[name] = graphene.Argument(
97-
field_type, description=filter_field.label, required=required,
97+
field_type,
98+
description=filter_field.label,
99+
required=required,
98100
)
99101

100102
return args

‎graphene_django/tests/test_query.py‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1480,7 +1480,11 @@ class Query(graphene.ObjectType):
14801480
result = schema.execute(query)
14811481
assert not result.errors
14821482
expected = {
1483-
"allReporters": {"edges": [{"node": {"firstName": "Some", "lastName": "Guy"}},]}
1483+
"allReporters": {
1484+
"edges": [
1485+
{"node": {"firstName": "Some", "lastName": "Guy"}},
1486+
]
1487+
}
14841488
}
14851489
assert result.data == expected
14861490

@@ -1521,7 +1525,9 @@ class Query(graphene.ObjectType):
15211525
assert not result.errors
15221526
expected = {
15231527
"allReporters": {
1524-
"edges": [{"node": {"firstName": "Some", "lastName": "Lady"}},]
1528+
"edges": [
1529+
{"node": {"firstName": "Some", "lastName": "Lady"}},
1530+
]
15251531
}
15261532
}
15271533
assert result.data == expected
@@ -1590,7 +1596,11 @@ class Query(graphene.ObjectType):
15901596
result = schema.execute(query, variable_values=dict(after=after))
15911597
assert not result.errors
15921598
expected = {
1593-
"allReporters": {"edges": [{"node": {"firstName": "Jane", "lastName": "Roe"}},]}
1599+
"allReporters": {
1600+
"edges": [
1601+
{"node": {"firstName": "Jane", "lastName": "Roe"}},
1602+
]
1603+
}
15941604
}
15951605
assert result.data == expected
15961606

0 commit comments

Comments
 (0)