Fix linting errors

lib/galaxy/model/database_utils.py

@@ -1,11 +1,10 @@
 import sqlite3
+from contextlib import contextmanager
 
 from sqlalchemy import create_engine
-from sqlalchemy.sql.expression import text
-from sqlalchemy.sql.compiler import IdentifierPreparer
 from sqlalchemy.engine.url import make_url
-
-from contextlib import contextmanager
+from sqlalchemy.sql.compiler import IdentifierPreparer
+from sqlalchemy.sql.expression import text
 
 from galaxy.exceptions import ConfigurationError
 

lib/galaxy/model/view/__init__.py

@@ -5,8 +5,8 @@ from sqlalchemy import Integer
 from sqlalchemy.orm import mapper
 from sqlalchemy.sql import column, text
 
-from .utils import View
 from galaxy.model.view.utils import create_view
+from .utils import View
 
 AGGREGATE_STATE_QUERY = """
 SELECT
@@ -60,4 +60,3 @@ class HistoryDatasetCollectionJobStateSummary(View):
 
 
 mapper(HistoryDatasetCollectionJobStateSummary, HistoryDatasetCollectionJobStateSummary.__table__)
-

lib/galaxy/model/view/utils.py

@@ -5,12 +5,12 @@ from inspect import getmembers
 
 from sqlalchemy import (
     Column,
+    event,
     MetaData,
     Table,
-    event
 )
-from sqlalchemy.schema import DDLElement
 from sqlalchemy.ext import compiler
+from sqlalchemy.schema import DDLElement
 
 
 class View:
@@ -72,4 +72,3 @@ def create_view(name, selectable, pkey):
     event.listen(metadata, 'before_drop', DropView(name))
 
     return table
-

test/unit/data/test_galaxy_mapping.py

@@ -8,8 +8,8 @@ from sqlalchemy import inspect
 
 import galaxy.datatypes.registry
 import galaxy.model
-from galaxy.model.database_utils import create_database
 import galaxy.model.mapping as mapping
+from galaxy.model.database_utils import create_database
 from galaxy.model.security import GalaxyRBACAgent
 
 datatypes_registry = galaxy.datatypes.registry.Registry()

test/unit/model/test_database_utils.py

@@ -1,9 +1,13 @@
 import os
-import pytest
 import tempfile
 import uuid
 
-from galaxy.model.database_utils import database_exists, create_database
+import pytest
+
+from galaxy.model.database_utils import (
+    create_database,
+    database_exists,
+)
 from ..unittest_utils.database_helpers import drop_database
 
 
@@ -82,4 +86,3 @@ def test_sqlite_create_exists_drop_in_memory_database(database_name, sqlite_memo
 def _make_sqlite_url(tmp_dir, database_name):
     path = os.path.join(tmp_dir, database_name)
     return f'sqlite:///{path}?isolation_level=IMMEDIATE'
-

test/unit/unittest_utils/database_helpers.py

@@ -1,7 +1,7 @@
 import os
 
-from sqlalchemy.sql.compiler import IdentifierPreparer
 from sqlalchemy.engine.url import make_url
+from sqlalchemy.sql.compiler import IdentifierPreparer
 
 from galaxy.model.database_utils import sqlalchemy_engine
 
@@ -21,4 +21,3 @@ def drop_database(db_url, database):
     else:
         url = make_url(db_url)
         os.remove(url.database)
-