diff --git a/.travis.yml b/.travis.yml index be9732d..7074b05 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,7 @@ env: - DJANGO_VERSION="1.9" - DJANGO_VERSION="1.10" - DJANGO_VERSION="1.11" + - DJANGO_VERSION="2.0" install: - pip install -r devrequirements_${DJANGO_VERSION}.txt @@ -33,6 +34,8 @@ matrix: env: DJANGO_VERSION="1.10" - python: "3.3" env: DJANGO_VERSION="1.11" + - python: "3.3" + env: DJANGO_VERSION="2.0" - python: "3.6" env: DJANGO_VERSION="1.4" - python: "3.6" @@ -41,6 +44,8 @@ matrix: env: DJANGO_VERSION="1.6" - python: "3.6" env: DJANGO_VERSION="1.7" + - python: "2.7" + env: DJANGO_VERSION="2.0" before_deploy: - pip install wheel diff --git a/README.md b/README.md index 74c14ff..aeee30a 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,7 @@ python runtests.py ### Requirements * Python 2 or 3 (tested on 2.7, 3.3, 3.4, 3.6) -* Django 1.4+ (tested on 1.5, 1.6, 1.7, 1.8, 1.9, 1.10, 1.11) +* Django 1.4+ (tested on 1.5, 1.6, 1.7, 1.8, 1.9, 1.10, 1.11, 2.0) ### Installing & Configuring @@ -96,7 +96,7 @@ class Book(models.Model): # which is specific to users. If you want a Hook to # be triggered for all users, add '+' to built-in Hooks # or pass user_override=False for custom_hook events - user = models.ForeignKey('auth.User') + user = models.ForeignKey('auth.User', on_delete=models.CASCADE) # maybe user is off a related object, so try... # user = property(lambda self: self.intermediary.user) diff --git a/devrequirements_2.0.txt b/devrequirements_2.0.txt new file mode 100644 index 0000000..9d5d5b1 --- /dev/null +++ b/devrequirements_2.0.txt @@ -0,0 +1,3 @@ +-r devrequirements.txt +django-contrib-comments>=1.8.0 +Django>=2.0,<2.1 diff --git a/rest_hooks/migrations/0001_initial.py b/rest_hooks/migrations/0001_initial.py index 1e7db23..761c4f9 100644 --- a/rest_hooks/migrations/0001_initial.py +++ b/rest_hooks/migrations/0001_initial.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals +import django.db.models.deletion from django.db import models, migrations from django.conf import settings @@ -20,7 +21,7 @@ class Migration(migrations.Migration): ('updated', models.DateTimeField(auto_now=True)), ('event', models.CharField(max_length=64, verbose_name='Event', db_index=True)), ('target', models.URLField(max_length=255, verbose_name='Target URL')), - ('user', models.ForeignKey(related_name='hooks', to=settings.AUTH_USER_MODEL)), + ('user', models.ForeignKey(related_name='hooks', to=settings.AUTH_USER_MODEL, on_delete=django.db.models.deletion.CASCADE)), ], options={ }, diff --git a/rest_hooks/models.py b/rest_hooks/models.py index dca900c..c461b60 100644 --- a/rest_hooks/models.py +++ b/rest_hooks/models.py @@ -40,7 +40,7 @@ class AbstractHook(models.Model): created = models.DateTimeField(auto_now_add=True) updated = models.DateTimeField(auto_now=True) - user = models.ForeignKey(AUTH_USER_MODEL, related_name='%(class)ss') + user = models.ForeignKey(AUTH_USER_MODEL, related_name='%(class)ss', on_delete=models.CASCADE) event = models.CharField('Event', max_length=64, db_index=True) target = models.URLField('Target URL', max_length=255)