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,7 +5,8 @@
 from typer import Typer
 
 from macrostrat.cli.database import get_db
-from .match import match_sgp_data_cmd, log_matches
+
+from .match import log_matches, match_sgp_data_cmd
 from .migrations import *
 from .paleogeography import compute_paleo_positions
 from .utils import get_sgp_db

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

@@ -8,7 +8,6 @@
 
 from geoalchemy2 import Geometry, WKBElement
 from geopandas import GeoDataFrame, sjoin
-from macrostrat.database import Database
 from pandas import DataFrame, isna, read_sql
 from pydantic import BaseModel
 from rich.live import Live
@@ -19,14 +18,16 @@
 
 from macrostrat.cli.database import get_db
 from macrostrat.core.console import err_console as console
+from macrostrat.database import Database
+
+from ..utils import get_sgp_db, get_sgp_samples, stored_procedure, write_to_file
 from .clean_strat_name import (
     StratNameTextMatch,
     StratRank,
     clean_strat_name,
     clean_strat_name_text,
     format_name,
 )
-from ..utils import get_sgp_samples, stored_procedure, write_to_file, get_sgp_db
 
 here = Path(__file__).parent
 

cli/macrostrat/cli/subsystems/sgp/paleogeography.py

@@ -4,7 +4,8 @@
 from sqlalchemy.sql import text
 
 from macrostrat.cli.database import get_db
-from .utils import get_sgp_samples, write_to_file, get_sgp_db
+
+from .utils import get_sgp_db, get_sgp_samples, write_to_file
 
 
 def compute_paleo_positions(out_file: Path = None, sample: int = None):

cli/macrostrat/cli/subsystems/sgp/utils.py

@@ -1,11 +1,11 @@
 from pathlib import Path
 
 from geopandas import GeoDataFrame
-from macrostrat.database import Database
 from pandas import DataFrame
 from sqlalchemy.sql import text
 
 from macrostrat.cli.database import get_db
+from macrostrat.database import Database
 
 _query_cache = {}
 

cli/tests/test_sgp_match.py

@@ -1,7 +1,7 @@
 from pytest import mark
 
 from macrostrat.cli.subsystems.sgp import get_sgp_db
-from macrostrat.cli.subsystems.sgp.match import match_sgp_data, DatabaseConfig
+from macrostrat.cli.subsystems.sgp.match import DatabaseConfig, match_sgp_data
 
 
 # Note: these tests have to be outside the macrostrat.cli package

conftest.py

@@ -4,11 +4,12 @@
 from pathlib import Path
 
 import docker
+from pytest import fixture, mark, skip
+from typer.testing import CliRunner
+
 from macrostrat.database import Database
 from macrostrat.dinosaur.upgrade_cluster import database_cluster
 from macrostrat.utils import get_logger, override_environment
-from pytest import fixture, skip, mark
-from typer.testing import CliRunner
 
 runner = CliRunner()
 

core/macrostrat/core/config.py

@@ -3,12 +3,13 @@
 
 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 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 .resolvers import cast_sources, setup_source_roots_environment
 from .utils import convert_to_string, find_macrostrat_config, path_list_resolver
 

py-modules/tileserver-stats/tileserver_stats/__init__.py

@@ -3,12 +3,13 @@
 from pathlib import Path
 
 from dotenv import load_dotenv
-from macrostrat.database import Database
-from macrostrat.utils import relative_path
 from rich import print
 from sqlalchemy.sql import text
 from typer import Typer
 
+from macrostrat.database import Database
+from macrostrat.utils import relative_path
+
 load_dotenv()
 
 app = Typer(no_args_is_help=True)