In the API application, h.notification is included at pyramid boot time,
while h.accounts is not. This means that when the
h.notifications.Subscriptions model tries to query the database, it
explodes because there is no active session.

This change makes it possible to load h.notification and h.account in
either order.

h/app.py

@@ -80,6 +80,15 @@ def create_api(settings):
    if config.registry.feature('streamer'):
        config.include('.streamer')

    if config.registry.feature('notification'):
        config.include('pyramid_jinja2')
        config.add_jinja2_renderer('.txt')
        config.add_jinja2_renderer('.html')

        # FIXME: move subscribers into .notification.subscribers so we don't
        # have to include the whole package
        config.include('.notification')

    return config.make_wsgi_app()

h/notification/models.py

@@ -4,9 +4,11 @@
from sqlalchemy.ext.declarative import declared_attr
from sqlalchemy import func, and_

from pyramid_basemodel import Base
from hem.db import get_session
from hem.interfaces import IDBSession
from horus.models import BaseModel
from pyramid_basemodel import Base
from pyramid_basemodel import Session

log = logging.getLogger(__name__)

@@ -69,4 +71,9 @@ class Subscriptions(SubscriptionsMixin, Base):


def includeme(config):
    registry = config.registry

    if not registry.queryUtility(IDBSession):
        registry.registerUtility(Session, IDBSession)

    config.scan(__name__)