Format code and sort imports

Author: davenquinn

cli/macrostrat/cli/_dev/utils.py

@@ -1,12 +1,12 @@
 from urllib.parse import quote
 
-from macrostrat.utils import get_logger
 from rich.console import Console
 from sqlalchemy.engine import Engine
 from sqlalchemy.engine.url import URL
 from sqlalchemy_utils import create_database, database_exists, drop_database
 
 from macrostrat.core.exc import MacrostratError
+from macrostrat.utils import get_logger
 
 console = Console()
 

cli/macrostrat/cli/database/__init__.py

@@ -2,22 +2,23 @@
 from typing import Any, Callable
 
 import typer
-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.migrations import run_migrations
+from macrostrat.utils import get_logger
+from macrostrat.utils.shell import run
+
+from .._dev.utils import raw_database_url
 from ._legacy import get_db
 
 # First, register all migrations
 # NOTE: right now, this is quite implicit.
 from .migrations import *
 from .utils import engine_for_db_name
-from .._dev.utils import raw_database_url
 
 log = get_logger(__name__)
 

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/v1_entrypoint.py

@@ -27,7 +27,6 @@
 
 import click
 
-
 # CLI with unprocessed arguments
 
 

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
 
 

core/macrostrat/core/main.py

@@ -4,11 +4,12 @@
 
 import toml
 from dynaconf import Dynaconf
+from rich.console import Console
+from typer import get_app_dir
+
 from macrostrat.app_frame import Application, Subsystem, SubsystemManager
 from macrostrat.app_frame.control_command import CommandBase
 from macrostrat.utils import get_logger
-from rich.console import Console
-from typer import get_app_dir
 
 from .console import console_theme
 from .exc import MacrostratError