Skip to content

Commit

Permalink
Merge 298caae into 91dae48
Browse files Browse the repository at this point in the history
  • Loading branch information
dinosk committed Mar 12, 2018
2 parents 91dae48 + 298caae commit 8f24bf3
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
tests_require = [
'check-manifest>=0.25',
'coverage>=4.0',
'cryptography>=1.5',
'cryptography>=2.1.4',
'isort>=4.2.2',
'mock>=1.3.0',
'pydocstyle>=1.0.0',
Expand Down
2 changes: 1 addition & 1 deletion tests/test_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
import sqlalchemy as sa
from mock import patch
from sqlalchemy_continuum import remove_versioning
from sqlalchemy_utils.types.encrypted import EncryptedType
from sqlalchemy_utils.types import EncryptedType
from test_db import _mock_entry_points

from invenio_db import InvenioDB
Expand Down

0 comments on commit 8f24bf3

Please sign in to comment.