Skip to content

Commit

Permalink
Merge f70b1ae into a40a602
Browse files Browse the repository at this point in the history
  • Loading branch information
kpsherva committed Nov 26, 2018
2 parents a40a602 + f70b1ae commit 9143a7f
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 14 deletions.
10 changes: 5 additions & 5 deletions setup.py
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion tests/conftest.py
Expand Up @@ -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
Expand Down
14 changes: 6 additions & 8 deletions tests/test_example_app.py
Expand Up @@ -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):
Expand Down

0 comments on commit 9143a7f

Please sign in to comment.