move alembic.ini to python app dir

diff --git a/MANIFEST.in b/MANIFEST.in
index 11bc271372810171cd368879339c974686a5029d..fda93d651f542c0012ef813d55997b4168cc2c43 100644 (file)
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -3,8 +3,9 @@ recursive-include mediagoblin *.js *.css *.png *.svg *.ico
 recursive-include mediagoblin *.ini
 recursive-include mediagoblin *.html *.txt
 recursive-include docs *.rst *.html
-include mediagoblin.example.ini mediagoblin/config_spec.ini paste.ini alembic.ini
+include mediagoblin.example.ini mediagoblin/config_spec.ini paste.ini
 include mediagoblin/config_spec.ini
+include mediagoblin/db/migrations/alembic.ini
 graft extlib
 graft licenses
 graft devtools

diff --git a/mediagoblin/db/migration_tools.py b/mediagoblin/db/migration_tools.py
index f4273fa0e37ce30293288e1fd244a2380441fa48..852f35ee012974b939de756af0fe99ca380a0540 100644 (file)
--- a/mediagoblin/db/migration_tools.py
+++ b/mediagoblin/db/migration_tools.py
@@ -365,9 +365,8 @@ def build_alembic_config(global_config, cmd_options, session):
     configuration.  Initialize the database session appropriately
     as well.
     """
-    root_dir = os.path.abspath(os.path.dirname(os.path.dirname(
-        os.path.dirname(__file__))))
-    alembic_cfg_path = os.path.join(root_dir, 'alembic.ini')
+    alembic_dir = os.path.join(os.path.dirname(__file__), 'migrations')
+    alembic_cfg_path = os.path.join(alembic_dir, 'alembic.ini')
     cfg = Config(alembic_cfg_path,
                  cmd_opts=cmd_options)
     cfg.attributes["session"] = session

diff --git a/alembic.ini b/mediagoblin/db/migrations/alembic.ini
similarity index 95%
rename from alembic.ini
rename to mediagoblin/db/migrations/alembic.ini
index 7ae94f9fd01e999b01f2c6571cd68f7d6da3f385..4f7fc1155c42d789c08a22f3cce7a406022ca9b9 100644 (file)
--- a/alembic.ini
+++ b/mediagoblin/db/migrations/alembic.ini
@@ -2,7 +2,7 @@
 
 [alembic]
 # path to migration scripts
-script_location = %(here)s/mediagoblin/db/migrations
+script_location = %(here)s
 
 # template used to generate migration files
 # file_template = %%(rev)s_%%(slug)s