global: correctly import EncryptedType

inveniosoftware · Feb 21, 2018 · 48d6f3f · 48d6f3f
1 parent 2c877c1
commit 48d6f3f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/invenio_oauthclient/alembic/97bbc733896c_create_oauthclient_tables.py b/invenio_oauthclient/alembic/97bbc733896c_create_oauthclient_tables.py
@@ -45,7 +45,7 @@ def upgrade():
         sa.Column('client_id', sa.String(length=255), nullable=False),
         sa.Column(
             'extra_data',
-            sqlalchemy_utils.types.json.JSONType(),
+            sqlalchemy_utils.JSONType(),
             nullable=False),
         sa.ForeignKeyConstraint(['user_id'], [u'accounts_user.id'], ),
         sa.PrimaryKeyConstraint('id'),
@@ -69,7 +69,7 @@ def upgrade():
         sa.Column('token_type', sa.String(length=40), nullable=False),
         sa.Column(
             'access_token',
-            sqlalchemy_utils.types.encrypted.EncryptedType(),
+            sqlalchemy_utils.EncryptedType(),
             nullable=False),
         sa.Column('secret', sa.Text(), nullable=False),
         sa.ForeignKeyConstraint(

diff --git a/invenio_oauthclient/models.py b/invenio_oauthclient/models.py
@@ -29,8 +29,7 @@
 from invenio_db import db
 from sqlalchemy.ext.mutable import MutableDict
 from sqlalchemy.orm import backref
-from sqlalchemy_utils import JSONType
-from sqlalchemy_utils.types.encrypted import EncryptedType
+from sqlalchemy_utils import EncryptedType, JSONType
 
 
 def _secret_key():

diff --git a/setup.py b/setup.py
@@ -93,7 +93,7 @@
     'invenio-accounts>=1.0.0b7',
     'invenio-mail>=1.0.0b1',
     'six>=1.9',
-    'sqlalchemy-utils>=0.32.0',
+    'sqlalchemy-utils>=0.33.0',
     'uritools>=1.0.1',
 ]