Skip to content

Commit

Permalink
installation: several additions to dependencies
Browse files Browse the repository at this point in the history
* FIX Adds missing dependencies to mock>=1.0.0, intbitset>=2.0,
  invenio-ext>=0.2.1, SQLAlchemy>=1.0, invenio-documents>=0.1.0,
  blinker>=1.4, dojson>=0.1.1.

* Updates PACKAGES in .travis.invenio.cfg to include all used
  Invenio modules. (closes inspirehep#9)

Signed-off-by: Sami Hiltunen <[email protected]>
  • Loading branch information
SamiHiltunen committed Oct 2, 2015
1 parent e057017 commit db5889f
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 9 deletions.
8 changes: 4 additions & 4 deletions .travis.invenio.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ SECRET_KEY = 'MY_SECRET'
ASSETS_AUTO_BUILD = False

PACKAGES = [
'invenio_records',
'invenio_collections',
'invenio_search',
'invenio_knowledge',
'invenio_access',
'invenio_accounts',
'invenio_pidstore',
'invenio_formatter',
'invenio_search',
'invenio_upgrader',
'invenio_accounts',
'invenio_documents',
'invenio_base',
]
13 changes: 8 additions & 5 deletions invenio_records/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,20 @@
"""Record models."""

from flask import current_app

from intbitset import intbitset
from sqlalchemy.event import listen
from sqlalchemy.ext.declarative import declared_attr
from sqlalchemy.schema import Index
from werkzeug import cached_property

from invenio_collections.models import Collection
from invenio_ext.sqlalchemy import db, utils

from invenio_ext.sqlalchemy import db

from sqlalchemy.event import listen

from werkzeug import cached_property

from .receivers import new_collection


class Record(db.Model):

"""Represent a record object inside the SQL database."""
Expand Down
1 change: 1 addition & 0 deletions requirements-devel.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
-e git+git://github.com/inveniosoftware/invenio-base.git#egg=invenio-base
-e git+git://github.com/inveniosoftware/invenio-collections.git#egg=invenio-collections
-e git+git://github.com/inveniosoftware/invenio-documents.git#egg=invenio-documents
-e git+git://github.com/inveniosoftware/invenio-ext.git#egg=invenio-ext
-e git+git://github.com/inveniosoftware/invenio-formatter.git#egg=invenio-formatter
-e git+git://github.com/inveniosoftware/invenio-pidstore.git#egg=invenio-pidstore
-e git+git://github.com/inveniosoftware/invenio-search.git#egg=invenio-search
Expand Down
6 changes: 6 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,19 +34,24 @@
history = open('CHANGES.rst').read()

requirements = [
'blinker>=1.4',
'dojson>=0.1.1',
'Flask>=0.10.1',
'six>=1.7.2',
'jsonpatch>=1.11',
'jsonschema>=2.5.1',
'dojson>=0.1.1',
'intbitset>=2.0',
'invenio-access>=0.1.0',
'invenio-base>=0.3.0',
'invenio-collections>=0.1.2',
'invenio-ext>=0.2.1',
'invenio-formatter>=0.2.1',
'invenio-pidstore>=0.1.1', # TODO consider making it optional
'invenio-search>=0.1.3',
'invenio-upgrader>=0.1.0',
'invenio-celery>=0.1.0',
'SQLAlchemy>=1.0',
]

test_requirements = [
Expand All @@ -60,6 +65,7 @@
'invenio-accounts>=0.1.2',
'invenio-documents>=0.1.0',
'invenio-testing>=0.1.0',
'mock>=1.0.0',
]

extras_require = {
Expand Down

0 comments on commit db5889f

Please sign in to comment.