Merge branch 'storage-admin' of https://github.com/UW-Macrostrat/macrostrat into storage-admin

* 'storage-admin' of https://github.com/UW-Macrostrat/macrostrat:
  Format code and sort imports

Author: davenquinn

cli/macrostrat/cli/subsystems/storage.py

@@ -7,13 +7,14 @@
 from subprocess import run
 from typing import List, Optional
 
-from macrostrat.utils import get_logger
 from rich import print
 from typer import Argument, Option, Typer
 
 from macrostrat.core import app as app_
-from ..kubernetes import _kubectl, get_secret
+from macrostrat.utils import get_logger
+
 from ...core.exc import MacrostratError
+from ..kubernetes import _kubectl, get_secret
 
 settings = app_.settings
 
@@ -36,10 +37,11 @@ def storage_admin(args: List[str] = Argument(None)):
             """
             Run the Ceph Object Storage admin command.
             """
-            from htpheno.radosgw_admin_client.cli import main, UserError
             import sys
             from os import environ
 
+            from htpheno.radosgw_admin_client.cli import UserError, main
+
             environ["RADOSGW_ACCESS_KEY"] = access_key
             environ["RADOSGW_SECRET_KEY"] = secret_key
             environ["RADOSGW_HOST"] = re.sub("^https?://", "", host)

core/macrostrat/core/config.py

@@ -4,13 +4,14 @@
 
 from dotenv import load_dotenv
 from dynaconf import Dynaconf, Validator
-from macrostrat.app_frame.control_command import BackendType
-from macrostrat.utils import get_logger
 from pydantic import BaseModel
 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 macrostrat.utils import get_logger
+
 from .utils import find_macrostrat_config
 
 log = get_logger(__name__)