Skip to content
This repository has been archived by the owner on Feb 11, 2018. It is now read-only.

Commit

Permalink
Merge da2b1be into d8b3826
Browse files Browse the repository at this point in the history
  • Loading branch information
rakanalh committed Aug 5, 2017
2 parents d8b3826 + da2b1be commit d18dfa6
Show file tree
Hide file tree
Showing 15 changed files with 562 additions and 371 deletions.
6 changes: 5 additions & 1 deletion .travis.yml
Expand Up @@ -2,11 +2,15 @@ language: python

python:
- 2.7
- 3.4
- 3.5
- 3.6

env:
- DJANGO=1.7.11
- DJANGO=1.8.9
- DJANGO=1.9.2
- DJANGO=1.10.7
- DJANGO=1.11.4

install:
- pip install -q Django==$DJANGO
Expand Down
3 changes: 2 additions & 1 deletion pushy/admin.py
@@ -1,7 +1,8 @@
import json
from django.contrib import admin
from django import forms
from models import PushNotification, Device

from .models import PushNotification, Device


class PushNotificationForm(forms.ModelForm):
Expand Down
11 changes: 5 additions & 6 deletions pushy/contrib/rest_api/urls.py
@@ -1,13 +1,12 @@
from django.conf.urls import patterns, url
from django.conf.urls import url

import views
from .views import DeviceViewSet

urlpatterns = patterns(
'',
urlpatterns = [
url(r'^pushy/device/$',
views.DeviceViewSet.as_view({
DeviceViewSet.as_view({
'post': 'create',
'delete': 'destroy'
}),
name='pushy-devices'),
)
]
3 changes: 2 additions & 1 deletion pushy/contrib/rest_api/views.py
Expand Up @@ -2,9 +2,10 @@
from rest_framework import status
from rest_framework.response import Response
from rest_framework.settings import api_settings

from pushy.models import Device

from serializers import DeviceSerializer
from .serializers import DeviceSerializer


class DeviceViewSet(viewsets.ViewSet):
Expand Down

0 comments on commit d18dfa6

Please sign in to comment.