Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

import EncryptedType correctly from sqlalchemy_utils #159

Merged
merged 2 commits into from
Feb 21, 2018
Merged

import EncryptedType correctly from sqlalchemy_utils #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24ee089
global: correctly import EncryptedType
Feb 19, 2018
9e36817
release: v1.0.0b5
lnielsen Feb 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions CHANGES.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
-----------------------------------

Expand Down
6 changes: 3 additions & 3 deletions RELEASE-NOTES.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
-----
Expand All @@ -17,7 +17,7 @@ What's new
Installation
------------

$ pip install invenio-oauthclient==1.0.0b4
$ pip install invenio-oauthclient==1.0.0b5

Documentation
-------------
Expand Down
4 changes: 2 additions & 2 deletions invenio_oauthclient/alembic/97bbc733896c_create_oauthclient_tables.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
Expand All @@ -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(
Expand Down
3 changes: 1 addition & 2 deletions invenio_oauthclient/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down
2 changes: 1 addition & 1 deletion invenio_oauthclient/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@

from __future__ import absolute_import, print_function

__version__ = '1.0.0b4'
__version__ = '1.0.0b5'