Skip to content

Commit

Permalink
style: fix linting issues #259
Browse files Browse the repository at this point in the history
  • Loading branch information
@MRichards99
MRichards99 committed Dec 6, 2021
1 parent 60cc5d1 commit b0a4c47
Show file tree
Hide file tree
Showing 4 changed files with 46 additions and 39 deletions.
2 changes: 1 addition & 1 deletion datagateway_api/src/common/base_query_filter_factory.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

class QueryFilterFactory(object):
@abstractstaticmethod
def get_query_filter(request_filter, entity_name=None):
def get_query_filter(request_filter, entity_name=None): # noqa: B902, N805
"""
Given a filter, return a matching Query filter object
Expand Down
10 changes: 7 additions & 3 deletions datagateway_api/src/search_api/filters.py
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
from icat.client import Client
from icat.query import Query

from datagateway_api.src.datagateway_api.icat.filters import (
PythonICATIncludeFilter,
PythonICATLimitFilter,
PythonICATSkipFilter,
PythonICATWhereFilter,
)
from icat.query import Query
from icat.client import Client

# TODO - Implement each of these filters for Search API, inheriting from the Python ICAT
# versions
Expand All @@ -32,7 +33,10 @@ def __str__(self):
return str_conds[0]

def __repr__(self):
return f"Field: '{self.field}', Value: '{self.value}', Operation: '{self.operation}'"
return (
f"Field: '{self.field}', Value: '{self.value}', Operation:"
f" '{self.operation}'"
)


class SearchAPISkipFilter(PythonICATSkipFilter):
Expand Down
5 changes: 4 additions & 1 deletion datagateway_api/src/search_api/nested_where_filters.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,7 @@ def __str__(self):
return f"({operator.join(conditions)})"

def __repr__(self):
return f"LHS: {repr(self.lhs)}, RHS: {repr(self.rhs)}, Operator: {repr(self.joining_operator)}"
return (
f"LHS: {repr(self.lhs)}, RHS: {repr(self.rhs)}, Operator:"
f" {repr(self.joining_operator)}"
)
68 changes: 34 additions & 34 deletions test/search_api/test_search_api_query_filter_factory.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1390,8 +1390,8 @@ def test_valid_include_filter(
NestedWhereFilters(
[
SearchAPIWhereFilter(
"documents.summary", "My Test Summary", "eq"
)
"documents.summary", "My Test Summary", "eq",
),
],
[SearchAPIWhereFilter("documents.title", "Test title", "eq")],
"and",
Expand Down Expand Up @@ -1425,8 +1425,8 @@ def test_valid_include_filter(
NestedWhereFilters(
[
SearchAPIWhereFilter(
"documents.summary", "My Test Summary", "eq"
)
"documents.summary", "My Test Summary", "eq",
),
],
[SearchAPIWhereFilter("documents.title", "Test title", "eq")],
"or",
Expand Down Expand Up @@ -1482,26 +1482,26 @@ def test_valid_include_filter(
NestedWhereFilters(
[
SearchAPIWhereFilter(
"documents.summary", "My Test Summary", "eq"
)
"documents.summary", "My Test Summary", "eq",
),
],
[
SearchAPIWhereFilter(
"documents.title", "Test title", "like"
)
"documents.title", "Test title", "like",
),
],
"and",
),
NestedWhereFilters(
[
SearchAPIWhereFilter(
"documents.pid", "Test pid", "eq"
)
"documents.pid", "Test pid", "eq",
),
],
[
SearchAPIWhereFilter(
"documents.type", "Test type", "eq"
)
"documents.type", "Test type", "eq",
),
],
"and",
),
Expand All @@ -1510,13 +1510,13 @@ def test_valid_include_filter(
NestedWhereFilters(
[
SearchAPIWhereFilter(
"documents.doi", "Test doi", "eq"
)
"documents.doi", "Test doi", "eq",
),
],
[
SearchAPIWhereFilter(
"documents.license", "Test license", "like"
)
"documents.license", "Test license", "like",
),
],
"or",
),
Expand Down Expand Up @@ -1574,26 +1574,26 @@ def test_valid_include_filter(
NestedWhereFilters(
[
SearchAPIWhereFilter(
"documents.summary", "My Test Summary", "eq"
)
"documents.summary", "My Test Summary", "eq",
),
],
[
SearchAPIWhereFilter(
"documents.title", "Test title", "like"
)
"documents.title", "Test title", "like",
),
],
"and",
),
NestedWhereFilters(
[
SearchAPIWhereFilter(
"documents.pid", "Test pid", "eq"
)
"documents.pid", "Test pid", "eq",
),
],
[
SearchAPIWhereFilter(
"documents.type", "Test type", "eq"
)
"documents.type", "Test type", "eq",
),
],
"and",
),
Expand All @@ -1602,13 +1602,13 @@ def test_valid_include_filter(
NestedWhereFilters(
[
SearchAPIWhereFilter(
"documents.doi", "Test doi", "eq"
)
"documents.doi", "Test doi", "eq",
),
],
[
SearchAPIWhereFilter(
"documents.license", "Test license", "like"
)
"documents.license", "Test license", "like",
),
],
"or",
),
Expand Down Expand Up @@ -1670,7 +1670,7 @@ def test_valid_include_filter(
[
SearchAPIWhereFilter("datasets.title", "Dataset 1", "eq"),
SearchAPIWhereFilter(
"datasets.instrument.name", "Instrument 1", "eq"
"datasets.instrument.name", "Instrument 1", "eq",
),
],
[],
Expand Down Expand Up @@ -1894,8 +1894,8 @@ def test_valid_skip_filter(
NestedWhereFilters(
[
SearchAPIWhereFilter(
"summary", "My Test Summary", "eq"
)
"summary", "My Test Summary", "eq",
),
],
[SearchAPIWhereFilter("title", "Test title", "like")],
"and",
Expand All @@ -1911,14 +1911,14 @@ def test_valid_skip_filter(
[SearchAPIWhereFilter("doi", "Test doi", "eq")],
[
SearchAPIWhereFilter(
"license", "Test license", "like"
)
"license", "Test license", "like",
),
],
"or",
),
],
"and",
)
),
],
[50],
[20],
Expand Down

0 comments on commit b0a4c47

Please sign in to comment.