From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Mon, 22 Sep 2014 19:05:36 +0000 (-0500)
Subject: Making alembic happen with python 3 only... for now.
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=c2059c4a7457fa8c752965e705b9d52e2b206610;p=mediagoblin.git

Making alembic happen with python 3 only... for now.

We want to make sure it works nicely first.
---

diff --git a/mediagoblin/gmg_commands/dbupdate.py b/mediagoblin/gmg_commands/dbupdate.py
index f5c20720..31827cd0 100644
--- a/mediagoblin/gmg_commands/dbupdate.py
+++ b/mediagoblin/gmg_commands/dbupdate.py
@@ -16,6 +16,7 @@
 
 import logging
 
+import six
 from sqlalchemy.orm import sessionmaker
 
 from mediagoblin.db.open import setup_connection_and_db_from_config
@@ -125,7 +126,11 @@ def run_dbupdate(app_config, global_config):
     db = setup_connection_and_db_from_config(app_config, migrations=True)
     # Run the migrations
     run_all_migrations(db, app_config, global_config)
-    run_alembic_migrations(db, app_config, global_config)
+
+    # TODO: Make this happen regardless of python 2 or 3 once ensured
+    # to be "safe"!
+    if six.PY3:
+        run_alembic_migrations(db, app_config, global_config)
 
 
 def run_all_migrations(db, app_config, global_config):