Format code and sort imports

Author: davenquinn

cli/macrostrat/cli/entrypoint.py

@@ -2,17 +2,18 @@
 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.cli.database.rockd.cli import cli as rockd_cli
 from macrostrat.cli.database.rockd.db_subsystem import rockd_subsystem
 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.dev import dev_app
 from .subsystems.macrostrat_api import MacrostratAPISubsystem

cli/macrostrat/cli/subsystems/sgp/__init__.py

@@ -5,6 +5,7 @@
 from typer import Typer
 
 from macrostrat.cli.database import get_db
+
 from .match import log_matches, match_sgp_data_cmd
 from .migrations import *
 from .paleogeography import compute_paleo_positions

cli/macrostrat/cli/subsystems/sgp/match/__init__.py

@@ -6,7 +6,6 @@
 from pathlib import Path
 
 from geopandas import sjoin
-from macrostrat.database import Database
 from pandas import DataFrame, isna, read_sql
 from pydantic import BaseModel
 from rich.live import Live
@@ -17,15 +16,17 @@
 
 from macrostrat.cli.database import get_db
 from macrostrat.core.console import err_console as console
+from macrostrat.database import Database
 from macrostrat.match_utils import (
     MatchType,
+    create_ignore_list,
     format_names,
-    standardize_names,
     get_columns_data_frame,
     get_match_types,
     get_matched_unit,
-    create_ignore_list,
+    standardize_names,
 )
+
 from ..utils import get_sgp_db, get_sgp_samples, stored_procedure, write_to_file
 
 here = Path(__file__).parent

cli/macrostrat/cli/subsystems/test/__init__.py

@@ -5,11 +5,11 @@
 
 from pathlib import Path
 
-from macrostrat.utils import working_directory
 from pytest import main
 from typer import Context, Typer
 
 from macrostrat.core.config import settings
+from macrostrat.utils import working_directory
 
 cli = Typer(
     short_help="Macrostrat tests",

core/macrostrat/core/main.py

@@ -1,19 +1,20 @@
 from os import environ
 from pathlib import Path
-from sys import exit, argv
+from sys import argv, exit
 
 import toml
 from dynaconf import Dynaconf
+from rich.console import Console
+from typer import Context, Option, get_app_dir
+
 from macrostrat.app_frame import (
     Application,
+    ControlCommand,
     Subsystem,
     SubsystemManager,
-    ControlCommand,
 )
 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, Context, Option
 
 from .console import console_theme
 from .exc import MacrostratError

py-modules/match-utils/macrostrat/match_utils/__init__.py

@@ -1,17 +1,18 @@
 from contextvars import ContextVar
 
 from geopandas import GeoDataFrame
-from macrostrat.database import Database
 from pandas import isna, read_sql
 from pydantic import BaseModel
 from sqlalchemy.sql import text
 
-from .models import MatchType, MatchComparison, MatchResult
+from macrostrat.database import Database
+
+from .models import MatchComparison, MatchResult, MatchType
 from .strat_names import (
-    format_name,
     clean_strat_name,
     clean_strat_name_text,
     create_ignore_list,
+    format_name,
 )
 from .utils import stored_procedure
 

py-modules/match-utils/macrostrat/match_utils/test_clean_strat_name.py

@@ -1,6 +1,6 @@
 from pytest import fixture
 
-from .strat_names import clean_strat_name, StratRank, create_ignore_list
+from .strat_names import StratRank, clean_strat_name, create_ignore_list
 
 
 @fixture(scope="module", autouse=True)

py-modules/match-utils/macrostrat/match_utils/test_match_strat_names.py

@@ -9,16 +9,15 @@
 from pytest import mark
 
 from . import (
-    get_matched_unit,
-    standardize_names,
-    get_columns_for_location,
     ensure_single,
-    get_column_units,
     get_all_matched_units,
+    get_column_units,
+    get_columns_for_location,
+    get_matched_unit,
+    standardize_names,
 )
 from .models import MatchResult
 
-
 # xy == -109.905/35.951
 # strat name candidate Navajo
 # expected match Navajo Sandstone, unit_id 14999, col_id 490, strat_name_id 3361

py-modules/match-utils/macrostrat/match_utils/utils.py

@@ -1,4 +1,5 @@
 from pathlib import Path
+
 from sqlalchemy.sql import text
 
 _query_cache = {}

services/api-v3/api/app.py

@@ -2,19 +2,18 @@
 
 import dotenv
 import uvicorn
+from api.routes.dev_routes.convert import convert_router
 from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware
 
-from api.routes.dev_routes.convert import convert_router
-
 dotenv.load_dotenv()
 
 import api.routes.security
 from api.database import connect_engine, dispose_engine
+from api.match import router as match_router
 from api.routes.ingest import router as ingest_router
 from api.routes.object import router as object_router
 from api.routes.sources import router as sources_router
-from api.match import router as match_router
 
 
 @asynccontextmanager