Remove sqlalchemy-migrate imports from the codebase. Do not touch tests yet.

diff --git a/mediagoblin/db/migrations.py b/mediagoblin/db/migrations.py
index dd96c3f32671098a4d8ebbde0b8286e40ecd5416..b3cea871f19f966d2dad596ffccb72a9f91e8ec4 100644 (file)
--- a/mediagoblin/db/migrations.py
+++ b/mediagoblin/db/migrations.py
@@ -25,7 +25,7 @@ from sqlalchemy import (MetaData, Table, Column, Boolean, SmallInteger,
 from sqlalchemy.exc import ProgrammingError
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.sql import and_
-from migrate.changeset.constraint import UniqueConstraint
+from sqlalchemy.schema import UniqueConstraint
 
 
 from mediagoblin.db.extratypes import JSONEncoded, MutationDict

diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py
index 4b2fb632be93386b39b9176fe0864c96a0300257..d3d1ec4b228821e05b6ee126193706fc0d7a8d97 100644 (file)
--- a/mediagoblin/db/models.py
+++ b/mediagoblin/db/models.py
@@ -42,17 +42,9 @@ from mediagoblin.tools.common import import_component
 
 import six
 
-# It's actually kind of annoying how sqlalchemy-migrate does this, if
-# I understand it right, but whatever.  Anyway, don't remove this :P
-#
-# We could do migration calls more manually instead of relying on
-# this import-based meddling...
-from migrate import changeset
-
 _log = logging.getLogger(__name__)
 
 
-
 class User(Base, UserMixin):
     """
     TODO: We should consider moving some rarely used fields

diff --git a/mediagoblin/plugins/oauth/models.py b/mediagoblin/plugins/oauth/models.py
index 439424d369a3f1dbf2fd6d39ad20bb1415da171e..3fe562a22075cd9b4068503cf594035165f68d32 100644 (file)
--- a/mediagoblin/plugins/oauth/models.py
+++ b/mediagoblin/plugins/oauth/models.py
@@ -26,10 +26,6 @@ from mediagoblin.db.models import User
 from mediagoblin.plugins.oauth.tools import generate_identifier, \
     generate_secret, generate_token, generate_code, generate_refresh_token
 
-# Don't remove this, I *think* it applies sqlalchemy-migrate functionality onto
-# the models.
-from migrate import changeset
-
 
 class OAuthClient(Base):
     __tablename__ = 'oauth__client'