Skip to content

Commit

Permalink
Fix broken requirements
Browse files Browse the repository at this point in the history
  • Loading branch information
frankh committed Mar 8, 2017
1 parent a12c872 commit cea9176
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 7 deletions.
2 changes: 1 addition & 1 deletion bin/build-app
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/sh
set -e
python manage.py syncdb --noinput
python manage.py migrate
python manage.py collectstatic --noinput
# python manage.py compress
4 changes: 3 additions & 1 deletion cabot/cabotapp/alert.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import logging

from django.db import models
from polymorphic import PolymorphicModel


from polymorphic.models import PolymorphicModel

logger = logging.getLogger(__name__)

Expand Down
4 changes: 3 additions & 1 deletion cabot/cabotapp/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@
from django.db import models
from django.db.models.signals import post_save
from django.utils import timezone
from polymorphic import PolymorphicModel


from polymorphic.models import PolymorphicModel

from .alert import (
send_alert,
Expand Down
5 changes: 3 additions & 2 deletions cabot/rest_urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,16 @@
from django.conf import settings
from django.conf.urls import url, include
from django.contrib.auth import models as django_models
from polymorphic import PolymorphicModel

from polymorphic.models import PolymorphicModel
from cabot.cabotapp import models, alert
from rest_framework import routers, serializers, viewsets, mixins
import logging

logger = logging.getLogger(__name__)

router = routers.DefaultRouter()


def create_viewset(arg_model, arg_fields, arg_read_only_fields=(), no_create=False):
arg_read_only_fields = ('id',) + arg_read_only_fields
for field in arg_read_only_fields:
Expand Down
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ django-compressor==2.1.1
django-filter==0.13
django-jsonify==0.3.0
django-mptt==0.6.0
django-polymorphic==0.7.2
django-polymorphic==1.1
Django>=1.9,<1.10
djangorestframework==2.4.8
djangorestframework>=3.4,<3.5
freezegun==0.3.8
gevent==1.0.1
gunicorn==19.6.0
Expand Down

0 comments on commit cea9176

Please sign in to comment.