Made some migrations production-ready

Author: davenquinn

.idea/dataSources.xml

@@ -2,15 +2,14 @@
 from pathlib import Path
 
 import typer
-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 rich import print
+from rich.traceback import install
+from typer import Argument, Typer
 
 from .database import db_app, db_subsystem
 from .schema_management import schema_app
@@ -439,7 +438,6 @@ def state():
 
 # TODO: subsystem dependencies
 from .subsystems.core import core_schema
-from .subsystems.macrostrat_api import macrostrat_api
 
 # Add basic schema hunks
 from .subsystems.xdd import text_vector_schema, xdd_schema
@@ -448,7 +446,6 @@ def state():
 db_subsystem.schema_hunks.append(core_schema)
 db_subsystem.schema_hunks.append(xdd_schema)
 db_subsystem.schema_hunks.append(text_vector_schema)
-db_subsystem.schema_hunks.append(macrostrat_api)
 
 # Discover subsystems in third-party packages
 # https://packaging.python.org/en/latest/guides/creating-and-discovering-plugins/

.idea/macrostrat.iml

@@ -3,25 +3,16 @@
 primarily in Macrostrat's column-builder application and set of routes.
 """
 
+from macrostrat.app_frame import compose
 from pathlib import Path
 
-from macrostrat.app_frame import compose
 from macrostrat.core import MacrostratSubsystem
-from macrostrat.core.migrations import Migration, view_exists
-
-from ...database import SubsystemSchemaDefinition, get_db
+from ...database import get_db
 from ...database.utils import setup_postgrest_access
 
 __here__ = Path(__file__).parent
 fixtures_dir = __here__ / "schema"
 
-macrostrat_api = SubsystemSchemaDefinition(
-    name="macrostrat-api",
-    fixtures=[fixtures_dir, setup_postgrest_access("macrostrat_api")],
-)
-
-# TODO: align schema migrations/fixtures with subsystems
-
 
 class MacrostratAPISubsystem(MacrostratSubsystem):
     name = "macrostrat-api"
@@ -47,13 +38,3 @@ def on_schema_update(self):
         # fully reloaded the schema.
         if self.app.settings.get("compose_root", None) is not None:
             compose("kill -s SIGUSR1 postgrest")
-
-
-class MacrostratAPIMigration(Migration):
-    name = "macrostrat-api"
-    readiness_state = "ga"
-    postconditions = [view_exists("macrostrat_api", "projects")]
-
-    def apply(self, db):
-        db.run_fixtures(fixtures_dir)
-        setup_postgrest_access("macrostrat_api")(db)

py-modules/cli/macrostrat/cli/entrypoint.py

@@ -2,12 +2,11 @@
 Subsystem for SGP matching
 """
 
+from pathlib import Path
 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
 from .utils import get_sgp_db
 

py-modules/cli/macrostrat/cli/subsystems/macrostrat_api/__init__.py

@@ -14,5 +14,5 @@ class BaselineMigration(Migration):
     postconditions = [
         exists("storage", "object"),
         exists("maps_metadata", "ingest_process", "ingest_process_tag"),
-        exists("macrostrat_auth", "user", "group"),
+        exists("macrostrat_auth", "user", ),
     ]

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

@@ -1,6 +1,12 @@
 from pathlib import Path
 
-from macrostrat.core.migrations import Migration, _not, exists, has_columns
+from macrostrat.core.migrations import (
+    Migration,
+    _not,
+    exists,
+    has_columns,
+    ReadinessState,
+)
 
 
 def check_slug_not_nullable(db):
@@ -34,6 +40,7 @@ class CompositeProjects(Migration):
     description = "Composite projects support"
     preconditions = [_not(a) for a in success]
     postconditions = success
+    readiness_state = ReadinessState.GA
     fixtures = [
         here / "projects-evolution.sql",
     ]
@@ -44,6 +51,7 @@ class CompositeProjectFunctions(Migration):
     subsystem = "columns"
     description = "Composite projects functions"
     depends_on = ["composite-projects"]
+    readiness_state = ReadinessState.GA
     always_apply = True
     fixtures = [
         here / "project-functions.sql",

py-modules/cli/macrostrat/cli/subsystems/sgp/migrations.py

@@ -11,6 +11,7 @@ class IngestPreprocessUpdates(Migration):
     subsystem = "maps"
     description = "Align maps_metadata.ingest_process table across envs."
     depends_on = ["ingest-state-type"]
+    readiness_state = "ga"
 
     preconditions = [
         has_columns("maps_metadata", "ingest_process", "id"),

schema/_migrations/api_v3/__init__.py

@@ -1,6 +1,12 @@
-from macrostrat.core.migrations import Migration, _not, custom_type_exists
 from macrostrat.database import Database, Identifier
 
+from macrostrat.core.migrations import (
+    Migration,
+    _not,
+    custom_type_exists,
+    ReadinessState,
+)
+
 
 def ingest_type_exists_in_wrong_schema(db: Database) -> bool:
     schemas = ["macrostrat_backup", "macrostrat", "public"]
@@ -18,8 +24,7 @@ class MapsIngestStateCustomTypeMigration(Migration):
     - Relocate custom types that drives the map ingestion process.
     - Remove duplicate custom types from the public schema.
     """
-
-    depends_on = ["baseline", "macrostrat-mariadb"]
+    readiness_state = ReadinessState.GA
 
     postconditions = [
         custom_type_exists("maps", "ingest_state"),