style: reorder import statements to satisfy flake8

ral-facilities · Nov 12, 2021 · c0acd33 · c0acd33
1 parent 4be29a5
commit c0acd33
Show file tree

Hide file tree

Showing 25 changed files with 53 additions and 55 deletions.
diff --git a/.flake8 b/.flake8
@@ -10,7 +10,7 @@ per-file-ignores =
   test/*: S101
   util/icat_db_generator.py: S311
   datagateway_api/wsgi.py:E402,F401
-  datagateway_api/common/datagateway_api/database/models.py: N815,A003
-  datagateway_api/common/datagateway_api/icat/filters.py: C901
-  datagateway_api/common/search_api/models.py: B950
+  datagateway_api/src/datagateway_api/database/models.py: N815,A003
+  datagateway_api/src/datagateway_api/icat/filters.py: C901
+  datagateway_api/src/search_api/models.py: B950
 enable-extensions=G
diff --git a/datagateway_api/src/common/helpers.py b/datagateway_api/src/common/helpers.py
@@ -8,8 +8,6 @@
 from flask_restful import reqparse
 from sqlalchemy.exc import IntegrityError
 
-from datagateway_api.src.datagateway_api.database import models
-from datagateway_api.src.datagateway_api.query_filter_factory import QueryFilterFactory
 from datagateway_api.src.common.date_handler import DateHandler
 from datagateway_api.src.common.exceptions import (
     ApiError,
@@ -18,6 +16,8 @@
     FilterError,
     MissingCredentialsError,
 )
+from datagateway_api.src.datagateway_api.database import models
+from datagateway_api.src.datagateway_api.query_filter_factory import QueryFilterFactory
 from datagateway_api.src.resources.entities.entity_endpoint_dict import endpoints
 
 log = logging.getLogger()

diff --git a/datagateway_api/src/datagateway_api/database/backend.py b/datagateway_api/src/datagateway_api/database/backend.py
@@ -6,6 +6,11 @@
 from sqlalchemy.exc import SQLAlchemyError
 
 from datagateway_api.src.common.constants import Constants
+from datagateway_api.src.common.exceptions import AuthenticationError, DatabaseError
+from datagateway_api.src.common.helpers import (
+    get_entity_object_from_name,
+    queries_records,
+)
 from datagateway_api.src.datagateway_api.backend import Backend
 from datagateway_api.src.datagateway_api.database.helpers import (
     create_rows_from_json,
@@ -25,11 +30,6 @@
     update_row_from_id,
 )
 from datagateway_api.src.datagateway_api.database.models import SESSION
-from datagateway_api.src.common.exceptions import AuthenticationError, DatabaseError
-from datagateway_api.src.common.helpers import (
-    get_entity_object_from_name,
-    queries_records,
-)
 
 
 log = logging.getLogger()

diff --git a/datagateway_api/src/datagateway_api/database/helpers.py b/datagateway_api/src/datagateway_api/database/helpers.py
@@ -6,6 +6,12 @@
 from flask_sqlalchemy import SQLAlchemy
 from sqlalchemy.orm import aliased
 
+from datagateway_api.src.common.exceptions import (
+    AuthenticationError,
+    BadRequestError,
+    MissingRecordError,
+)
+from datagateway_api.src.common.helpers import map_distinct_attributes_to_results
 from datagateway_api.src.datagateway_api.database.filters import (
     DatabaseDistinctFieldFilter,
     DatabaseIncludeFilter as IncludeFilter,
@@ -20,12 +26,6 @@
     SESSION,
 )
 from datagateway_api.src.datagateway_api.filter_order_handler import FilterOrderHandler
-from datagateway_api.src.common.exceptions import (
-    AuthenticationError,
-    BadRequestError,
-    MissingRecordError,
-)
-from datagateway_api.src.common.helpers import map_distinct_attributes_to_results
 
 
 log = logging.getLogger()

diff --git a/datagateway_api/src/datagateway_api/icat/backend.py b/datagateway_api/src/datagateway_api/icat/backend.py
@@ -3,6 +3,8 @@
 from icat.exception import ICATError, ICATSessionError
 
 from datagateway_api.src.common.constants import Constants
+from datagateway_api.src.common.exceptions import AuthenticationError, PythonICATError
+from datagateway_api.src.common.helpers import queries_records
 from datagateway_api.src.datagateway_api.backend import Backend
 from datagateway_api.src.datagateway_api.icat.helpers import (
     create_entities,
@@ -23,8 +25,6 @@
     update_entities,
     update_entity_by_id,
 )
-from datagateway_api.src.common.exceptions import AuthenticationError, PythonICATError
-from datagateway_api.src.common.helpers import queries_records
 
 
 log = logging.getLogger()

diff --git a/datagateway_api/src/datagateway_api/icat/helpers.py b/datagateway_api/src/datagateway_api/icat/helpers.py
@@ -14,20 +14,20 @@
     ICATValidationError,
 )
 
-from datagateway_api.src.datagateway_api.filter_order_handler import FilterOrderHandler
-from datagateway_api.src.datagateway_api.icat.filters import (
-    PythonICATLimitFilter,
-    PythonICATWhereFilter,
-)
-from datagateway_api.src.datagateway_api.icat.lru_cache import ExtendedLRUCache
-from datagateway_api.src.datagateway_api.icat.query import ICATQuery
 from datagateway_api.src.common.date_handler import DateHandler
 from datagateway_api.src.common.exceptions import (
     AuthenticationError,
     BadRequestError,
     MissingRecordError,
     PythonICATError,
 )
+from datagateway_api.src.datagateway_api.filter_order_handler import FilterOrderHandler
+from datagateway_api.src.datagateway_api.icat.filters import (
+    PythonICATLimitFilter,
+    PythonICATWhereFilter,
+)
+from datagateway_api.src.datagateway_api.icat.lru_cache import ExtendedLRUCache
+from datagateway_api.src.datagateway_api.icat.query import ICATQuery
 
 log = logging.getLogger()
 

diff --git a/datagateway_api/src/main.py b/datagateway_api/src/main.py
@@ -2,14 +2,14 @@
 
 from flask import Flask
 
-from datagateway_api.src.common.config import APIConfigOptions, config
-from datagateway_api.src.common.logger_setup import setup_logger
 from datagateway_api.src.api_start_utils import (
     create_api_endpoints,
     create_app_infrastructure,
     create_openapi_endpoint,
     openapi_config,
 )
+from datagateway_api.src.common.config import APIConfigOptions, config
+from datagateway_api.src.common.logger_setup import setup_logger
 
 setup_logger()
 log = logging.getLogger()

diff --git a/test/conftest.py b/test/conftest.py
@@ -3,15 +3,15 @@
 from flask import Flask
 import pytest
 
+from datagateway_api.src.api_start_utils import (
+    create_api_endpoints,
+    create_app_infrastructure,
+)
 from datagateway_api.src.datagateway_api.database.helpers import (
     delete_row_by_id,
     insert_row_into_table,
 )
 from datagateway_api.src.datagateway_api.database.models import SESSION
-from datagateway_api.src.api_start_utils import (
-    create_api_endpoints,
-    create_app_infrastructure,
-)
 
 
 @pytest.fixture()

diff --git a/test/datagateway_api/db/endpoints/test_ping_db.py b/test/datagateway_api/db/endpoints/test_ping_db.py
@@ -4,8 +4,8 @@
 from sqlalchemy.exc import SQLAlchemyError
 
 from datagateway_api.src.common.constants import Constants
-from datagateway_api.src.datagateway_api.backends import create_backend
 from datagateway_api.src.common.exceptions import DatabaseError
+from datagateway_api.src.datagateway_api.backends import create_backend
 
 
 class TestICATPing:

diff --git a/test/datagateway_api/db/test_database_filter_utilities.py b/test/datagateway_api/db/test_database_filter_utilities.py
@@ -1,9 +1,9 @@
 import pytest
 
-from datagateway_api.src.datagateway_api.database.filters import DatabaseFilterUtilities
-from datagateway_api.src.datagateway_api.database.helpers import ReadQuery
 from datagateway_api.src.common.exceptions import FilterError
 from datagateway_api.src.common.helpers import get_entity_object_from_name
+from datagateway_api.src.datagateway_api.database.filters import DatabaseFilterUtilities
+from datagateway_api.src.datagateway_api.database.helpers import ReadQuery
 
 
 class TestDatabaseFilterUtilities:

diff --git a/test/datagateway_api/icat/conftest.py b/test/datagateway_api/icat/conftest.py
@@ -8,11 +8,11 @@
 from icat.query import Query
 import pytest
 
-from datagateway_api.src.common.config import APIConfigOptions, config
 from datagateway_api.src.api_start_utils import (
     create_api_endpoints,
     create_app_infrastructure,
 )
+from datagateway_api.src.common.config import APIConfigOptions, config
 from test.datagateway_api.icat.endpoints.test_create_icat import TestICATCreateData
 from test.datagateway_api.icat.test_query import prepare_icat_data_for_assertion
 

diff --git a/test/datagateway_api/icat/endpoints/test_ping_icat.py b/test/datagateway_api/icat/endpoints/test_ping_icat.py
@@ -4,9 +4,9 @@
 import pytest
 
 from datagateway_api.src.common.constants import Constants
+from datagateway_api.src.common.exceptions import PythonICATError
 from datagateway_api.src.datagateway_api.backends import create_backend
 from datagateway_api.src.datagateway_api.icat.icat_client_pool import create_client_pool
-from datagateway_api.src.common.exceptions import PythonICATError
 
 
 class TestICATPing:

diff --git a/test/datagateway_api/icat/filters/test_distinct_filter.py b/test/datagateway_api/icat/filters/test_distinct_filter.py
@@ -1,9 +1,9 @@
 import pytest
 
+from datagateway_api.src.common.exceptions import FilterError
 from datagateway_api.src.datagateway_api.icat.filters import (
     PythonICATDistinctFieldFilter,
 )
-from datagateway_api.src.common.exceptions import FilterError
 
 
 class TestICATDistinctFilter:

diff --git a/test/datagateway_api/icat/filters/test_include_filter.py b/test/datagateway_api/icat/filters/test_include_filter.py
@@ -1,7 +1,7 @@
 import pytest
 
-from datagateway_api.src.datagateway_api.icat.filters import PythonICATIncludeFilter
 from datagateway_api.src.common.exceptions import FilterError
+from datagateway_api.src.datagateway_api.icat.filters import PythonICATIncludeFilter
 
 
 class TestICATIncludeFilter:

diff --git a/test/datagateway_api/icat/filters/test_limit_filter.py b/test/datagateway_api/icat/filters/test_limit_filter.py
@@ -2,13 +2,13 @@
 
 import pytest
 
+from datagateway_api.src.common.exceptions import FilterError
 from datagateway_api.src.datagateway_api.filter_order_handler import FilterOrderHandler
 from datagateway_api.src.datagateway_api.icat.filters import (
     icat_set_limit,
     PythonICATLimitFilter,
     PythonICATSkipFilter,
 )
-from datagateway_api.src.common.exceptions import FilterError
 
 
 class TestICATLimitFilter:

diff --git a/test/datagateway_api/icat/filters/test_order_filter.py b/test/datagateway_api/icat/filters/test_order_filter.py
@@ -1,9 +1,9 @@
 import pytest
 from typing_extensions import OrderedDict
 
+from datagateway_api.src.common.exceptions import FilterError
 from datagateway_api.src.datagateway_api.filter_order_handler import FilterOrderHandler
 from datagateway_api.src.datagateway_api.icat.filters import PythonICATOrderFilter
-from datagateway_api.src.common.exceptions import FilterError
 
 
 class TestICATOrderFilter:

diff --git a/test/datagateway_api/icat/filters/test_skip_filter.py b/test/datagateway_api/icat/filters/test_skip_filter.py
@@ -1,8 +1,8 @@
 import pytest
 
 from datagateway_api.src.common.config import config
-from datagateway_api.src.datagateway_api.icat.filters import PythonICATSkipFilter
 from datagateway_api.src.common.exceptions import FilterError
+from datagateway_api.src.datagateway_api.icat.filters import PythonICATSkipFilter
 
 
 class TestICATSkipFilter:

diff --git a/test/datagateway_api/icat/filters/test_where_filter.py b/test/datagateway_api/icat/filters/test_where_filter.py
@@ -1,8 +1,8 @@
 import pytest
 
+from datagateway_api.src.common.exceptions import BadRequestError, FilterError
 from datagateway_api.src.datagateway_api.filter_order_handler import FilterOrderHandler
 from datagateway_api.src.datagateway_api.icat.filters import PythonICATWhereFilter
-from datagateway_api.src.common.exceptions import BadRequestError, FilterError
 
 
 class TestICATWhereFilter:

diff --git a/test/datagateway_api/icat/test_helpers.py b/test/datagateway_api/icat/test_helpers.py
@@ -3,11 +3,11 @@
 from icat.exception import ICATInternalError
 import pytest
 
+from datagateway_api.src.common.exceptions import BadRequestError, PythonICATError
 from datagateway_api.src.datagateway_api.icat.helpers import (
     get_icat_entity_name_as_camel_case,
     push_data_updates_to_icat,
 )
-from datagateway_api.src.common.exceptions import BadRequestError, PythonICATError
 
 
 class TestICATHelpers:

diff --git a/test/datagateway_api/icat/test_query.py b/test/datagateway_api/icat/test_query.py
@@ -3,13 +3,13 @@
 from icat.entity import Entity
 import pytest
 
+from datagateway_api.src.common.date_handler import DateHandler
+from datagateway_api.src.common.exceptions import PythonICATError
 from datagateway_api.src.datagateway_api.icat.filters import (
     PythonICATSkipFilter,
     PythonICATWhereFilter,
 )
 from datagateway_api.src.datagateway_api.icat.query import ICATQuery
-from datagateway_api.src.common.date_handler import DateHandler
-from datagateway_api.src.common.exceptions import PythonICATError
 
 
 def prepare_icat_data_for_assertion(data, remove_id=False, remove_visit_id=False):

diff --git a/test/datagateway_api/icat/test_session_handling.py b/test/datagateway_api/icat/test_session_handling.py
@@ -6,11 +6,11 @@
 import pytest
 
 from datagateway_api.src.common.config import APIConfigOptions, config
+from datagateway_api.src.common.date_handler import DateHandler
+from datagateway_api.src.common.exceptions import AuthenticationError
 from datagateway_api.src.datagateway_api.backends import create_backend
 from datagateway_api.src.datagateway_api.icat.filters import PythonICATWhereFilter
 from datagateway_api.src.datagateway_api.icat.icat_client_pool import create_client_pool
-from datagateway_api.src.common.date_handler import DateHandler
-from datagateway_api.src.common.exceptions import AuthenticationError
 
 
 class TestSessionHandling:

diff --git a/test/test_endpoint_rules.py b/test/test_endpoint_rules.py
@@ -1,8 +1,6 @@
 import pytest
 
-from datagateway_api.src.resources.entities.entity_endpoint_dict import (  # noqa: B950
-    endpoints,
-)
+from datagateway_api.src.resources.entities.entity_endpoint_dict import endpoints
 
 
 class TestEndpointRules:

diff --git a/test/test_get_entity_object.py b/test/test_get_entity_object.py
@@ -1,12 +1,12 @@
 import pytest
 
+from datagateway_api.src.common.exceptions import ApiError
+from datagateway_api.src.common.helpers import get_entity_object_from_name
 from datagateway_api.src.datagateway_api.database.models import (
     FACILITY,
     INVESTIGATION,
     JOB,
 )
-from datagateway_api.src.common.exceptions import ApiError
-from datagateway_api.src.common.helpers import get_entity_object_from_name
 
 
 class TestGetEntityObject:

diff --git a/test/test_get_filters_from_query.py b/test/test_get_filters_from_query.py
@@ -1,14 +1,14 @@
 import pytest
 
+from datagateway_api.src.common.exceptions import FilterError
+from datagateway_api.src.common.helpers import get_filters_from_query_string
 from datagateway_api.src.datagateway_api.database.filters import (
     DatabaseDistinctFieldFilter,
     DatabaseIncludeFilter,
     DatabaseLimitFilter,
     DatabaseOrderFilter,
     DatabaseSkipFilter,
 )
-from datagateway_api.src.common.exceptions import FilterError
-from datagateway_api.src.common.helpers import get_filters_from_query_string
 
 
 class TestGetFiltersFromQueryString:

diff --git a/test/test_query_filter.py b/test/test_query_filter.py
@@ -2,9 +2,9 @@
 
 import pytest
 
-from datagateway_api.src.datagateway_api.query_filter_factory import QueryFilterFactory
 from datagateway_api.src.common.exceptions import ApiError
 from datagateway_api.src.common.filters import QueryFilter
+from datagateway_api.src.datagateway_api.query_filter_factory import QueryFilterFactory
 
 
 class TestQueryFilter: