Remove sqlalchemy-migrate imports from the codebase. Do not touch tests yet.
This commit is contained in:
parent
e6aab20dc7
commit
e2cb0f86fe
@ -25,7 +25,7 @@ from sqlalchemy import (MetaData, Table, Column, Boolean, SmallInteger,
|
|||||||
from sqlalchemy.exc import ProgrammingError
|
from sqlalchemy.exc import ProgrammingError
|
||||||
from sqlalchemy.ext.declarative import declarative_base
|
from sqlalchemy.ext.declarative import declarative_base
|
||||||
from sqlalchemy.sql import and_
|
from sqlalchemy.sql import and_
|
||||||
from migrate.changeset.constraint import UniqueConstraint
|
from sqlalchemy.schema import UniqueConstraint
|
||||||
|
|
||||||
|
|
||||||
from mediagoblin.db.extratypes import JSONEncoded, MutationDict
|
from mediagoblin.db.extratypes import JSONEncoded, MutationDict
|
||||||
|
@ -42,17 +42,9 @@ from mediagoblin.tools.common import import_component
|
|||||||
|
|
||||||
import six
|
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__)
|
_log = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
class User(Base, UserMixin):
|
class User(Base, UserMixin):
|
||||||
"""
|
"""
|
||||||
TODO: We should consider moving some rarely used fields
|
TODO: We should consider moving some rarely used fields
|
||||||
|
@ -26,10 +26,6 @@ from mediagoblin.db.models import User
|
|||||||
from mediagoblin.plugins.oauth.tools import generate_identifier, \
|
from mediagoblin.plugins.oauth.tools import generate_identifier, \
|
||||||
generate_secret, generate_token, generate_code, generate_refresh_token
|
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):
|
class OAuthClient(Base):
|
||||||
__tablename__ = 'oauth__client'
|
__tablename__ = 'oauth__client'
|
||||||
|
Loading…
x
Reference in New Issue
Block a user