#223: Fix linting issues

ral-facilities · May 11, 2021 · 4a79940 · 4a79940
1 parent d21bd67
commit 4a79940
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/datagateway_api/common/database/filters.py b/datagateway_api/common/database/filters.py
@@ -2,7 +2,6 @@
 
 from sqlalchemy import asc, desc
 
-from datagateway_api.common.database import models
 from datagateway_api.common.exceptions import FilterError, MultipleIncludeError
 from datagateway_api.common.filters import (
     DistinctFieldFilter,

diff --git a/datagateway_api/common/database/helpers.py b/datagateway_api/common/database/helpers.py
@@ -1,5 +1,4 @@
 from abc import ABC, abstractmethod
-from datagateway_api.common.helpers import map_distinct_attributes_to_results
 import datetime
 from functools import wraps
 import logging
@@ -26,6 +25,7 @@
     MissingRecordError,
 )
 from datagateway_api.common.filter_order_handler import FilterOrderHandler
+from datagateway_api.common.helpers import map_distinct_attributes_to_results
 
 
 log = logging.getLogger()

diff --git a/datagateway_api/common/helpers.py b/datagateway_api/common/helpers.py
@@ -1,4 +1,3 @@
-from datagateway_api.common.date_handler import DateHandler
 from datetime import datetime
 from functools import wraps
 import json
@@ -9,6 +8,7 @@
 from sqlalchemy.exc import IntegrityError
 
 from datagateway_api.common.database import models
+from datagateway_api.common.date_handler import DateHandler
 from datagateway_api.common.exceptions import (
     ApiError,
     AuthenticationError,

diff --git a/datagateway_api/common/icat/query.py b/datagateway_api/common/icat/query.py
@@ -1,4 +1,3 @@
-from datagateway_api.common.helpers import map_distinct_attributes_to_results
 from datetime import datetime
 import logging
 
@@ -8,6 +7,7 @@
 
 from datagateway_api.common.date_handler import DateHandler
 from datagateway_api.common.exceptions import PythonICATError
+from datagateway_api.common.helpers import map_distinct_attributes_to_results
 
 
 log = logging.getLogger()

diff --git a/test/icat/test_query.py b/test/icat/test_query.py
@@ -1,4 +1,4 @@
-from datetime import datetime, timezone
+from datetime import datetime
 
 from icat.entity import Entity
 import pytest

diff --git a/test/test_map_distinct_attrs.py b/test/test_map_distinct_attrs.py
@@ -1,8 +1,9 @@
-from datagateway_api.common.helpers import map_distinct_attributes_to_results
 from datetime import datetime, timezone
 
 import pytest
 
+from datagateway_api.common.helpers import map_distinct_attributes_to_results
+
 
 class TestMapDistinctAttrs:
     @pytest.mark.parametrize(