Format code and sort imports

Author: davenquinn

py-modules/cli/macrostrat/cli/commands/rebuild_scripts/lookup_strat_names.py

@@ -2,7 +2,7 @@
 
 from psycopg2.sql import Identifier
 from rich.console import Console
-from rich.progress import track, Progress
+from rich.progress import Progress, track
 
 from macrostrat.core.exc import MacrostratError
 

py-modules/cli/macrostrat/cli/commands/rebuild_scripts/lookup_unit_attrs_api.py

@@ -1,8 +1,9 @@
-from .lookup_units import copy_table_into_place
-from ..base import Base
+from pathlib import Path
 
 from macrostrat.core.database import get_database
-from pathlib import Path
+
+from ..base import Base
+from .lookup_units import copy_table_into_place
 
 here = Path(__file__).parent
 

py-modules/cli/macrostrat/cli/commands/rebuild_scripts/lookup_unit_intervals.py

@@ -1,9 +1,12 @@
-from ..base import Base
-from macrostrat.core.database import get_database
 from pathlib import Path
-from .lookup_units import update_intervals, copy_table_into_place
+
 from psycopg2.sql import Identifier
 
+from macrostrat.core.database import get_database
+
+from ..base import Base
+from .lookup_units import copy_table_into_place, update_intervals
+
 here = Path(__file__).parent
 
 

py-modules/cli/macrostrat/cli/commands/rebuild_scripts/lookup_units.py

@@ -1,8 +1,10 @@
-from ..base import Base
-from ...database import get_db
 from pathlib import Path
+
 from psycopg2.sql import Identifier
 
+from ...database import get_db
+from ..base import Base
+
 here = Path(__file__).parent
 
 

py-modules/cli/macrostrat/cli/database/__init__.py

@@ -4,10 +4,10 @@
 from typing import Any, Callable, Iterable
 
 import typer
+from psycopg2.sql import Identifier
 from pydantic import BaseModel
 from rich import print
 from sqlalchemy import make_url, text
-from psycopg2.sql import Identifier
 from typer import Argument, Option
 
 from macrostrat.core import MacrostratSubsystem, app
@@ -20,10 +20,10 @@
 from macrostrat.utils.shell import run
 
 from ._legacy import get_db
+from .sequences import reset_sequences
 
 # NOTE: right now, this is quite implicit.
 from .utils import engine_for_db_name, setup_postgrest_access
-from .sequences import reset_sequences
 
 log = get_logger(__name__)
 

py-modules/cli/macrostrat/cli/database/sequences.py

@@ -1,6 +1,8 @@
-from rich import print
-from psycopg2.sql import Identifier
 import re
+
+from psycopg2.sql import Identifier
+from rich import print
+
 from macrostrat.database import Database
 
 

py-modules/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 .schema_management import schema_app
 from .subsystems.dev import dev_app
@@ -274,6 +275,7 @@ def update_weaver(db):
 
 try:
     from macrostrat.column_ingestion import app as column_app
+
     main.add_typer(
         column_app,
         name="columns",

py-modules/column-ingestion/macrostrat/column_ingestion/__init__.py

@@ -1,23 +1,18 @@
 from pathlib import Path
 
-from typer import Typer, Argument
+from typer import Argument, Typer
 
 app = Typer(
     no_args_is_help=True,
     help="Column ingestion subsystem for Macrostrat",
 )
 
+
 @app.command(name="ingest")
-def ingest_columns(data_file: Path = Argument(..., help="Path to the data file to ingest")):
+def ingest_columns(
+    data_file: Path = Argument(..., help="Path to the data file to ingest")
+):
     """Ingest columns tabular data."""
     from .ingest import ingest_columns_from_file
 
     ingest_columns_from_file(data_file)
-
-
-
-
-
-
-
-

py-modules/column-ingestion/macrostrat/column_ingestion/columns.py

@@ -2,9 +2,10 @@
 from datetime import datetime
 
 import polars as pl
-from macrostrat.database import Database
 from sqlalchemy.dialects.postgresql import insert
 
+from macrostrat.database import Database
+
 from .database import get_macrostrat_table
 from .units import Unit
 

py-modules/column-ingestion/macrostrat/column_ingestion/database.py

@@ -1,9 +1,10 @@
 import re
 from typing import Optional
 
-from macrostrat.core.database import get_database
 from pydantic import BaseModel
 
+from macrostrat.core.database import get_database
+
 
 class ProjectIdentifier(BaseModel):
     id: Optional[int] = None