Format code and sort imports

Author: davenquinn

cli/macrostrat/cli/database/__init__.py

@@ -4,20 +4,22 @@
 from typing import Any, Callable, Iterable
 
 import typer
+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.migrations import run_migrations
 from macrostrat.database import Database
-from macrostrat.database.transfer import pg_restore_from_file, pg_dump_to_file
+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 ._legacy import get_db
+
 # First, register all migrations
 # NOTE: right now, this is quite implicit.
 from .migrations import load_migrations

cli/macrostrat/cli/database/migrations/maps_ingest_state_custom_type/__init__.py

@@ -1,4 +1,4 @@
-from macrostrat.core.migrations import Migration, custom_type_exists, _not
+from macrostrat.core.migrations import Migration, _not, custom_type_exists
 from macrostrat.database import Database
 
 

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 .subsystems.macrostrat_api import MacrostratAPISubsystem
 from .subsystems.paleogeography import load_paleogeography_subsystem

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

@@ -6,8 +6,8 @@
 from pathlib import Path
 
 from macrostrat.app_frame import compose
-
 from macrostrat.core import MacrostratSubsystem
+
 from ...database import SubsystemSchemaDefinition, get_db
 from ...database.utils import grant_schema_usage
 

core/macrostrat/core/config.py

@@ -2,11 +2,12 @@
 from pathlib import Path
 
 from dynaconf import Dynaconf, Validator
-from macrostrat.app_frame.control_command import BackendType
 from sqlalchemy.engine import make_url
 from sqlalchemy.engine.url import URL
 from toml import load as load_toml
 
+from macrostrat.app_frame.control_command import BackendType
+
 from .utils import find_macrostrat_config
 
 
@@ -33,7 +34,6 @@ def __init__(self, *args, **kwargs):
         if cfg is not None:
             self.config_file = Path(cfg)
 
-
     def all_environments(self):
         # Parse out top-level headers from TOML file
         with open(self.config_file, "r") as f:

core/macrostrat/core/migrations/__init__.py

@@ -4,9 +4,10 @@
 from pathlib import Path
 from typing import Callable
 
-from macrostrat.database import Database
 from rich import print
 
+from macrostrat.database import Database
+
 from ..database import get_database, refresh_database
 
 """ Higher-order functions that return a function that evaluates whether a condition is met on the database """