Merge "Bump to sqlalchemy-migrate 0.8.2"

heat/db/sqlalchemy/migration.py

@@ -12,13 +12,13 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import distutils.version as dist_version
 import os
 import sys
 
+from migrate import exceptions as versioning_exceptions
+from migrate.versioning import api as versioning_api
+from migrate.versioning.repository import Repository
 import sqlalchemy
-import migrate
-from migrate.versioning import util as migrate_util
 
 from heat.common import exception
 from heat.openstack.common.db.sqlalchemy.session import get_engine
@@ -34,43 +34,6 @@ def get_backend():
     return sys.modules[__name__]
 
 
-@migrate_util.decorator
-def patched_with_engine(f, *a, **kw):
-    url = a[0]
-    engine = migrate_util.construct_engine(url, **kw)
-    try:
-        kw['engine'] = engine
-        return f(*a, **kw)
-    finally:
-        if isinstance(engine, migrate_util.Engine) and engine is not url:
-            migrate_util.log.debug(_('Disposing SQLAlchemy engine %s') %
-                                   engine)
-            engine.dispose()
-
-
-# TODO(jkoelker) When migrate 0.7.3 is released and nova depends
-#                on that version or higher, this can be removed
-MIN_PKG_VERSION = dist_version.StrictVersion('0.7.3')
-if (not hasattr(migrate, '__version__') or
-        dist_version.StrictVersion(migrate.__version__) < MIN_PKG_VERSION):
-        migrate_util.with_engine = patched_with_engine
-
-
-# NOTE(jkoelker) Delay importing migrate until we are patched
-from migrate.versioning import api as versioning_api
-from migrate.versioning.repository import Repository
-
-try:
-    from migrate.versioning import exceptions as versioning_exceptions
-except ImportError:
-    try:
-        from migrate import exceptions as versioning_exceptions
-    except ImportError:
-        sys.exit(_("python-migrate is not installed. Exiting."))
-
-#_REPOSITORY = None
-
-
 def db_sync(version=None):
     if version is not None:
         try: