diff --git a/setup.py b/setup.py index 9aebe9a..89083c9 100644 --- a/setup.py +++ b/setup.py @@ -65,11 +65,11 @@ ] install_requires = [ - 'invenio-accounts>=1.0.0b9', - 'invenio-db>=1.0.0b3,<1.1.0', - 'invenio-rest>=1.0.0a10', - 'invenio-access>=1.0.0a11', - 'invenio-oauth2server>=1.0.0a12' + 'invenio-accounts>=1.0.0', + 'invenio-db>=1.0.0,<1.1.0', + 'invenio-rest>=1.0.0', + 'invenio-access>=1.0.0', + 'invenio-oauth2server>=1.0.0', ] packages = find_packages() diff --git a/tests/conftest.py b/tests/conftest.py index d9c6228..8368c8b 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -44,8 +44,8 @@ from invenio_access.permissions import superuser_access from invenio_accounts import InvenioAccounts from invenio_accounts.models import Role, User -from invenio_db import db as db_ from invenio_db import InvenioDB +from invenio_db import db as db_ from invenio_oauth2server import InvenioOAuth2Server, \ InvenioOAuth2ServerREST, current_oauth2server from invenio_oauth2server.models import Token diff --git a/tests/test_example_app.py b/tests/test_example_app.py index 20861d6..434c0d0 100644 --- a/tests/test_example_app.py +++ b/tests/test_example_app.py @@ -26,18 +26,16 @@ """Test example app.""" import os -import signal -import subprocess -import sys -import time +from os.path import abspath, dirname, join def setup_module(module): """Set up before all tests.""" - # switch to examples/app.py - exampleappdir = os.path.join(os.path.split(sys.path[0])[0], - 'examples') - os.chdir(exampleappdir) + + # Go to example directory + project_dir = dirname(dirname(abspath(__file__))) + exampleapp_dir = join(project_dir, 'examples') + os.chdir(exampleapp_dir) def teardown_module(module):