Skip to content

Commit

Permalink
installation: fix invenio_base imports
Browse files Browse the repository at this point in the history
* FIX Adds missing `invenio_base` dependency.

Signed-off-by: Sami Hiltunen <sami.mikael.hiltunen@cern.ch>
  • Loading branch information
SamiHiltunen committed Sep 14, 2015
1 parent ff63d11 commit e134f3a
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 6 deletions.
2 changes: 1 addition & 1 deletion invenio_classifier/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

from flask import current_app

from invenio.base.globals import cfg
from invenio_base.globals import cfg
from invenio.utils.filedownload import download_url

from .engine import (
Expand Down
2 changes: 1 addition & 1 deletion invenio_classifier/engine.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

import os

from invenio.base.globals import cfg
from invenio_base.globals import cfg
from invenio.utils.text import encode_for_xml

from six import iteritems
Expand Down
2 changes: 1 addition & 1 deletion invenio_classifier/keyworder.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

from flask import current_app

from invenio.base.globals import cfg
from invenio_base.globals import cfg

from .errors import OntologyError

Expand Down
2 changes: 1 addition & 1 deletion invenio_classifier/manage.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ def extract(filepath, taxonomy, output, limit,

def main():
"""Run manager."""
from invenio.base.factory import create_app
from invenio_base.factory import create_app
app = create_app()
manager.app = app
manager.run()
2 changes: 1 addition & 1 deletion invenio_classifier/reader.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@

from flask import current_app

from invenio.base.globals import cfg
from invenio_base.globals import cfg
from invenio.utils.url import make_invenio_opener

import rdflib
Expand Down
2 changes: 2 additions & 0 deletions requirements-devel.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,5 @@
#
# -e git+git://github.com/mitsuhiko/werkzeug.git#egg=Werkzeug
# -e git+git://github.com/mitsuhiko/jinja2.git#egg=Jinja2

-e git+git://github.com/inveniosoftware/invenio-base.git#egg=invenio-base
2 changes: 2 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
requirements = [
'Flask>=0.10.1',
'six>=1.7.2',
'invenio-base>=0.2.1',
# FIXME 'Invenio>=2.0.3',
]

Expand All @@ -50,6 +51,7 @@


class PyTest(TestCommand):

"""PyTest Test."""

user_options = [('pytest-args=', 'a', "Arguments to pass to py.test")]
Expand Down
2 changes: 1 addition & 1 deletion tests/test_classifier.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class ClassifierTestCase(InvenioTestCase):

@property
def config(self):
from invenio.base.config import PACKAGES
from invenio_base.config import PACKAGES
default_config = super(ClassifierTestCase, self).config
default_config["PACKAGES"] = PACKAGES + ["invenio_classifier"]
return default_config
Expand Down

0 comments on commit e134f3a

Please sign in to comment.