From db5889f71b144fc46f6450d500267b03de4dbe1d Mon Sep 17 00:00:00 2001
From: Sami Hiltunen <sami.mikael.hiltunen@cern.ch>
Date: Thu, 1 Oct 2015 13:03:34 +0200
Subject: [PATCH] installation: several additions to dependencies

* 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 #9)

Signed-off-by: Sami Hiltunen <sami.mikael.hiltunen@cern.ch>
---
 .travis.invenio.cfg       |  8 ++++----
 invenio_records/models.py | 13 ++++++++-----
 requirements-devel.txt    |  1 +
 setup.py                  |  6 ++++++
 4 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/.travis.invenio.cfg b/.travis.invenio.cfg
index 436b45ff..d6462c07 100644
--- a/.travis.invenio.cfg
+++ b/.travis.invenio.cfg
@@ -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',
 ]
diff --git a/invenio_records/models.py b/invenio_records/models.py
index 62150303..6d1021d2 100644
--- a/invenio_records/models.py
+++ b/invenio_records/models.py
@@ -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."""
diff --git a/requirements-devel.txt b/requirements-devel.txt
index 4054e890..367d4647 100644
--- a/requirements-devel.txt
+++ b/requirements-devel.txt
@@ -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
diff --git a/setup.py b/setup.py
index 2822072e..11be6b32 100644
--- a/setup.py
+++ b/setup.py
@@ -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 = [
@@ -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 = {