Skip to content

Commit

Permalink
update requirements (#12)
Browse files Browse the repository at this point in the history
* Change order of imports in conftest.py

isort showed an error that the imports were not sorted
correctly. This commit changes the sorting so that
isort does not throw an error anymore.

* change requirements of isort

Starting with isort 4.3 some imports are sorted differently.
Raising the required version of isort makes sure that imports
are always sorted correctly. (changed to the same version
invenio requires).

* change requirement of invenio-oauth2server

Raised requirement of invenio-oauth2server to the
most recent one (1.0.3) to take care of a version
conflict with oauthlib.

* change requirement of invenio-accounts

Lowest requirements were raising a version conflict since
invenio-oauth2server needs >=1.0.0. Requirement was raised
to the same version.

* update invenio dependencies to released versions where possible

* added webargs==4.4.1 requirement temporarily

tests were failing because webargs 5 requires simplejson to be
installed on Python 2. This is currently not happening in
invenio-files-rest. Can be removed once invenio-files-rest is updated.
  • Loading branch information
Leats authored and ntarocco committed Feb 5, 2019
1 parent 0df0a20 commit df8ae4b
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 df8ae4b

Please sign in to comment.