Skip to content

Commit

Permalink
Merge b817a4a into 0df0a20
Browse files Browse the repository at this point in the history
  • Loading branch information
Leats committed Feb 5, 2019
2 parents 0df0a20 + b817a4a commit 44d6ce9
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 10 deletions.
19 changes: 10 additions & 9 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
tests_require = [
'check-manifest>=0.25',
'coverage>=4.0',
'invenio-accounts>=1.0.0b9',
'isort>=4.2.2',
'invenio-accounts>=1.0.0',
'isort>=4.3',
'pydocstyle>=1.0.0',
'pytest-cache>=1.0',
'pytest-cov>=1.8.0',
Expand Down Expand Up @@ -63,13 +63,14 @@
'Flask-BabelEx>=0.9.3',
'Flask-CeleryExt>=0.3.0',
'alembic>=0.9.3',
'invenio-admin>=1.0.0b4',
'invenio-access>=1.0.0b1',
'invenio-db>=1.0.0b8',
'invenio-files-rest>=1.0.0a19',
'invenio-oauth2server>=1.0.0b1',
'invenio-rest[cors]>=1.0.0b1',
'invenio-sipstore>=1.0.0a7'
'invenio-admin>=1.0.0',
'invenio-access>=1.0.1',
'invenio-db>=1.0.0',
'invenio-files-rest>=1.0.0a23',
'invenio-oauth2server>=1.0.3',
'invenio-rest[cors]>=1.0.0',
'invenio-sipstore>=1.0.0a7',
'webargs==4.4.1', # TODO to be removed, see https://github.com/inveniosoftware/invenio-files-rest/pull/185#issue-246063980
]

packages = find_packages()
Expand Down
2 changes: 1 addition & 1 deletion tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
from flask_breadcrumbs import Breadcrumbs
from invenio_access import InvenioAccess
from invenio_accounts import InvenioAccounts
from invenio_db import db as db_
from invenio_db import InvenioDB
from invenio_db import db as db_
from invenio_files_rest import InvenioFilesREST
from invenio_files_rest.models import Location
from invenio_oauth2server import InvenioOAuth2Server, InvenioOAuth2ServerREST
Expand Down

0 comments on commit 44d6ce9

Please sign in to comment.