aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBoris Bobrov <breton@cynicmansion.ru>2017-11-14 22:01:19 +0300
committerBoris Bobrov <breton@cynicmansion.ru>2017-11-14 22:01:19 +0300
commitb3429ec69c09a7c216bc0404a2953b1517000bec (patch)
treef0380737938183cfa4b3f14a922480adc8b2427b
parent152d03732323182edbfc9e739d83d5675d850d98 (diff)
downloadmediagoblin-b3429ec69c09a7c216bc0404a2953b1517000bec.tar.lz
mediagoblin-b3429ec69c09a7c216bc0404a2953b1517000bec.tar.xz
mediagoblin-b3429ec69c09a7c216bc0404a2953b1517000bec.zip
move alembic.ini to python app dir
-rw-r--r--MANIFEST.in3
-rw-r--r--mediagoblin/db/migration_tools.py5
-rw-r--r--mediagoblin/db/migrations/alembic.ini (renamed from alembic.ini)2
3 files changed, 5 insertions, 5 deletions
diff --git a/MANIFEST.in b/MANIFEST.in
index 11bc2713..fda93d65 100644
--- 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 f4273fa0..852f35ee 100644
--- 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
index 7ae94f9f..4f7fc115 100644
--- 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