Format code and sort imports

Author: davenquinn

cli/macrostrat/cli/database/__init__.py

@@ -4,19 +4,20 @@
 from typing import Any, Callable, Iterable
 
 import typer
-from macrostrat.database import Database
-from macrostrat.database.transfer import pg_dump_to_file, pg_restore_from_file
-from macrostrat.database.transfer.utils import raw_database_url
-from macrostrat.database.utils import get_sql_files
-from macrostrat.utils import get_logger
-from macrostrat.utils.shell import run
 from pydantic import BaseModel
 from rich import print
 from sqlalchemy import make_url, text
 from typer import Argument, Option
 
 from macrostrat.core import MacrostratSubsystem, app
 from macrostrat.core.database import get_database
+from macrostrat.database import Database
+from macrostrat.database.transfer import pg_dump_to_file, pg_restore_from_file
+from macrostrat.database.transfer.utils import raw_database_url
+from macrostrat.database.utils import get_sql_files
+from macrostrat.utils import get_logger
+from macrostrat.utils.shell import run
+
 from ._legacy import get_db
 
 # NOTE: right now, this is quite implicit.

cli/macrostrat/cli/entrypoint.py

@@ -2,15 +2,16 @@
 from pathlib import Path
 
 import typer
-from macrostrat.app_frame import CommandBase
-from macrostrat.utils.shell import run
 from rich import print
 from rich.traceback import install
 from typer import Argument, Typer
 
+from macrostrat.app_frame import CommandBase
 from macrostrat.core import app
 from macrostrat.core.exc import MacrostratError
 from macrostrat.core.main import env_text, set_app_state
+from macrostrat.utils.shell import run
+
 from .database import db_app, db_subsystem
 from .schema_management import schema_app
 from .subsystems.dev import dev_app

cli/macrostrat/cli/schema_management/__disabled__pgschema.py

@@ -4,17 +4,18 @@
 
 import docker
 import typer
-from macrostrat.database import Database
-from macrostrat.dinosaur.upgrade_cluster.utils import database_cluster
-from macrostrat.utils import get_logger, working_directory
-from macrostrat.utils.shell import run
 from rich import print
 from typer import Argument
 
 from macrostrat.core import app
 from macrostrat.core.config import settings
 from macrostrat.core.database import get_database
 from macrostrat.core.migrations import _run_migrations_in_database
+from macrostrat.database import Database
+from macrostrat.dinosaur.upgrade_cluster.utils import database_cluster
+from macrostrat.utils import get_logger, working_directory
+from macrostrat.utils.shell import run
+
 from ..database.utils import engine_for_db_name
 
 log = get_logger(__name__)

cli/macrostrat/cli/schema_management/__init__.py

@@ -5,35 +5,36 @@
 from typing import Callable
 
 import click
-from macrostrat.app_frame import CommandBase
-from macrostrat.database import Database
-from macrostrat.database.transfer import pg_dump_to_file
-from macrostrat.database.transfer.utils import raw_database_url
-from macrostrat.utils import get_logger
-from macrostrat.utils.shell import run
 from results import db as results_db
 from results.dbdiff import Migration
 from rich import print
-from typer import Argument
-from typer import Option
+from typer import Argument, Option
 
+from macrostrat.app_frame import CommandBase
 from macrostrat.core import app as macrostrat_app
 from macrostrat.core.config import settings
 from macrostrat.core.database import get_database
 from macrostrat.core.exc import MacrostratError
 from macrostrat.core.migrations import run_migrations
+from macrostrat.database import Database
+from macrostrat.database.transfer import pg_dump_to_file
+from macrostrat.database.transfer.utils import raw_database_url
+from macrostrat.utils import get_logger
+from macrostrat.utils.shell import run
+
+from ..database.utils import engine_for_db_name
 from .defs import (
-    get_inspector,
-    planning_database,
     StatementCounter,
-    is_unsafe_statement,
-    get_all_schemas,
     apply_schema_for_environment,
+    get_all_schemas,
+    get_inspector,
+    is_unsafe_statement,
+    planning_database,
 )
+
 # First, register all migrations
 # NOTE: right now, this is quite implicit.
 from .migration_system import load_migrations
-from ..database.utils import engine_for_db_name
 
 log = get_logger(__name__)
 

cli/macrostrat/cli/schema_management/defs.py

@@ -1,14 +1,14 @@
 from contextlib import contextmanager
 
 import docker
-from macrostrat.database import Database
-from macrostrat.dinosaur.upgrade_cluster.utils import database_cluster
 from results.dbdiff.statements import check_for_drop
 from results.schemainspect.pg import PostgreSQL
 from results.schemainspect.pg.obj import PROPS
 from rich import print
 
 from macrostrat.core.config import settings
+from macrostrat.database import Database
+from macrostrat.dinosaur.upgrade_cluster.utils import database_cluster
 
 
 def is_unsafe_statement(s: str) -> bool:

cli/macrostrat/cli/subsystems/macrostrat_api/__init__.py

@@ -6,9 +6,9 @@
 from pathlib import Path
 
 from macrostrat.app_frame import compose
-
 from macrostrat.core import MacrostratSubsystem
 from macrostrat.core.migrations import Migration, view_exists
+
 from ...database import SubsystemSchemaDefinition, get_db
 from ...database.utils import setup_postgrest_access
 

core/macrostrat/core/migrations/__init__.py

@@ -8,11 +8,12 @@
 from typing import Callable, Iterable, Optional, Union
 
 import docker
+from pydantic import BaseModel
+from rich import print
+
 from macrostrat.database import Database
 from macrostrat.database.utils import OutputMode
 from macrostrat.dinosaur.upgrade_cluster.utils import database_cluster
-from pydantic import BaseModel
-from rich import print
 
 from ..config import settings
 from ..database import get_database

schema/_migrations/measurement_class_custom_type/__init__.py

@@ -1,7 +1,7 @@
-from macrostrat.database import Database
 from psycopg2.sql import Identifier
 
 from macrostrat.core.migrations import Migration, _not, custom_type_exists
+from macrostrat.database import Database
 
 
 class MeasurementClassCustomTypeMigration(Migration):