From 4a799407b5f43de4a0f4ac1fe533594d649efe95 Mon Sep 17 00:00:00 2001
From: Matthew Richards <matthew.richards@stfc.ac.uk>
Date: Tue, 11 May 2021 14:13:18 +0000
Subject: [PATCH]  #223: Fix linting issues

---
 datagateway_api/common/database/filters.py | 1 -
 datagateway_api/common/database/helpers.py | 2 +-
 datagateway_api/common/helpers.py          | 2 +-
 datagateway_api/common/icat/query.py       | 2 +-
 test/icat/test_query.py                    | 2 +-
 test/test_map_distinct_attrs.py            | 3 ++-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/datagateway_api/common/database/filters.py b/datagateway_api/common/database/filters.py
index ffce968f..c90c811e 100644
--- 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
index 1a4ed8ee..19cb31f9 100644
--- 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
index 607b9211..452be102 100644
--- 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
index 791714b5..c690c258 100644
--- 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
index de399a18..47df71f6 100644
--- 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
index c151f9b6..626345ab 100644
--- 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(