Skip to content
This repository was archived by the owner on Apr 16, 2019. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
sudo: false
language: python
python:
- "2.7"
addons:
apt:
packages:
- libevent-dev
install:
- "sudo apt-get install libevent-dev"
- "pip install -r requirements.txt"
- "pip install -e ."
- "psql -c 'create database fluff_test' -U postgres"
- "pip install coverage coveralls"
Expand Down
8 changes: 4 additions & 4 deletions fluff/signals.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from django.conf import settings
from itertools import chain
from django.db.models import signals
from pillowtop.utils import get_pillow_class
from pillowtop.utils import get_pillow_class, get_all_pillow_configs
from alembic.migration import MigrationContext
from alembic.autogenerate import compare_metadata
from fluff.util import metadata as fluff_metadata
Expand All @@ -29,9 +29,9 @@ def catch_signal(sender, **kwargs):

from fluff import FluffPillow
table_pillow_map = {}
pillows = list(chain.from_iterable(settings.PILLOWTOPS.values()))
for pillow_string in pillows:
pillow_class = get_pillow_class(pillow_string)
pillow_configs = get_all_pillow_configs()
for pillow_config in pillow_configs:
pillow_class = pillow_config.get_class()
if issubclass(pillow_class, FluffPillow):
doc = pillow_class.indicator_class()
if doc.save_direct_to_sql:
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Django==1.7.10
jsonobject-couchdbkit==0.7.0.1
pytz==2013b
six==1.3.0
six>=1.5.0
SQLAlchemy==0.8.2
alembic==0.6.4
unittest2==0.5.1
Expand Down