fix alembic packaging (#122)

ecmwf-projects · Jul 31, 2024 · aaa38c2 · aaa38c2
1 parent 43d9e61
commit aaa38c2
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 6 deletions.
diff --git a/alembic.ini → cacholote/alembic.ini b/alembic.ini → cacholote/alembic.ini
diff --git a/alembic/README → cacholote/alembic/README b/alembic/README → cacholote/alembic/README
diff --git a/alembic/env.py → cacholote/alembic/env.py b/alembic/env.py → cacholote/alembic/env.py
@@ -1,8 +1,8 @@
 """module for entry points."""
 
+import alembic.context
 import sqlalchemy as sa
 
-import alembic.context
 import cacholote
 
 config = alembic.context.config

diff --git a/alembic/script.py.mako → cacholote/alembic/script.py.mako b/alembic/script.py.mako → cacholote/alembic/script.py.mako
diff --git a/...5_add_created_at_and_rename_timestamp_.py → ...5_add_created_at_and_rename_timestamp_.py b/...5_add_created_at_and_rename_timestamp_.py → ...5_add_created_at_and_rename_timestamp_.py
@@ -9,9 +9,9 @@
 from typing import Sequence, Union
 
 import sqlalchemy as sa
+from alembic import op
 
 import cacholote
-from alembic import op
 
 # revision identifiers, used by Alembic.
 revision: str = "a38663d192e5"

diff --git a/cacholote/database.py b/cacholote/database.py
@@ -22,13 +22,12 @@
 import warnings
 from typing import Any
 
+import alembic.command
+import alembic.config
 import sqlalchemy as sa
 import sqlalchemy.orm
 import sqlalchemy_utils
 
-import alembic.command
-import alembic.config
-
 from . import utils
 
 _DATETIME_MAX = datetime.datetime(
@@ -129,7 +128,7 @@ def init_database(connection_string: str, force: bool = False) -> sa.engine.Engi
     :param force: if True, drop the database structure and build again from scratch
     """
     engine = sa.create_engine(connection_string)
-    migration_directory = os.path.abspath(os.path.join(__file__, "..", ".."))
+    migration_directory = os.path.abspath(os.path.join(__file__, ".."))
     os.chdir(migration_directory)
     alembic_config_path = os.path.join(migration_directory, "alembic.ini")
     alembic_cfg = alembic.config.Config(alembic_config_path)