From 24ee08947cd011d80e136951f82cad686a5fbdc2 Mon Sep 17 00:00:00 2001
From: Dinika Saxena <dinika.saxena@cern.ch>
Date: Mon, 19 Feb 2018 15:54:05 +0100
Subject: [PATCH 1/2] global: correctly import EncryptedType

---
 .../alembic/97bbc733896c_create_oauthclient_tables.py         | 4 ++--
 invenio_oauthclient/models.py                                 | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/invenio_oauthclient/alembic/97bbc733896c_create_oauthclient_tables.py b/invenio_oauthclient/alembic/97bbc733896c_create_oauthclient_tables.py
index 56e2a184..340d665e 100644
--- 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
index 7871a7fe..565c1bf9 100644
--- 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():

From 9e368170666df100a414c5f70bf8effa93adb7fd Mon Sep 17 00:00:00 2001
From: Lars Holm Nielsen <lars.holm.nielsen@cern.ch>
Date: Wed, 21 Feb 2018 15:06:57 +0100
Subject: [PATCH 2/2] release: v1.0.0b5

---
 CHANGES.rst                    | 7 +------
 RELEASE-NOTES.rst              | 6 +++---
 invenio_oauthclient/version.py | 2 +-
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 203a4778..f1a76b80 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -24,16 +24,11 @@
 Changes
 =======
 
-Version 1.0.0b4 (released 2018-01-22)
+Version 1.0.0b5 (released 2018-02-21)
 -------------------------------------
 
 - Initial public release
 
-Version 1.0.0a13 (released 2017-05-05)
---------------------------------------
-
-- Refactoring for Invenio 3.
-
 Version 0.1.1 (released 2015-08-25)
 -----------------------------------
 
diff --git a/RELEASE-NOTES.rst b/RELEASE-NOTES.rst
index 40a221fe..81a4488b 100644
--- a/RELEASE-NOTES.rst
+++ b/RELEASE-NOTES.rst
@@ -1,8 +1,8 @@
 ==============================
- Invenio-OAuthClient v1.0.0b4
+ Invenio-OAuthClient v1.0.0b5
 ==============================
 
-Invenio-OAuthClient v1.0.0b4 was released on January 22, 2018.
+Invenio-OAuthClient v1.0.0b5 was released on February 21, 2018.
 
 About
 -----
@@ -17,7 +17,7 @@ What's new
 Installation
 ------------
 
-   $ pip install invenio-oauthclient==1.0.0b4
+   $ pip install invenio-oauthclient==1.0.0b5
 
 Documentation
 -------------
diff --git a/invenio_oauthclient/version.py b/invenio_oauthclient/version.py
index 65a11d8d..64f3c3c1 100644
--- a/invenio_oauthclient/version.py
+++ b/invenio_oauthclient/version.py
@@ -30,4 +30,4 @@
 
 from __future__ import absolute_import, print_function
 
-__version__ = '1.0.0b4'
+__version__ = '1.0.0b5'