7 files changed, 18 insertions(+), 6 deletions(-)

M docs/release_notes.rst
M setup.py
M src/wiki/models/article.py
M src/wiki/models/pluginbase.py
M src/wiki/models/urlpath.py
M src/wiki/plugins/attachments/models.py
M tox.ini

@@ 12,6 12,12 @@ The next series **0.4** will support Django 1.11 and Django 2.x and be for
 Python 3.4+.
 
 
+django-wiki 0.3.1
+-----------------
+
+* Fix error messages of missing migrations due to inconsistent change of ``on_delete`` on some model fields :url-issue:`776`
+
+
 django-wiki 0.3
 ---------------
 

@@ 37,7 37,7 @@ requirements = [
     "Django>=1.8,<2.0",
     "bleach>=1.5,<2",
     "Pillow",
-    "django-nyt>=1.0b1,<1.1",
+    "django-nyt>=1.0,<1.1",
     "django-mptt>=0.8.6,<0.9",
     "django-sekizai>=0.10",
     "sorl-thumbnail>=12,<13",

@@ 28,7 28,7 @@ class Article(models.Model):
     current_revision = models.OneToOneField(
         'ArticleRevision', verbose_name=_('current revision'),
         blank=True, null=True, related_name='current_set',
-        on_delete=models.SET_NULL,
+        on_delete=models.CASCADE,
         help_text=_(
             'The revision being displayed for this article. If you need to do a roll-back, simply change the value of this field.'),)
 

@@ 161,7 161,7 @@ class RevisionPlugin(ArticlePlugin):
         verbose_name=_('current revision'),
         blank=True,
         null=True,
-        on_delete=models.SET_NULL,
+        on_delete=models.CASCADE,
         related_name='plugin_set',
         help_text=_(
             'The revision being displayed for this plugin. '

@@ 71,7 71,7 @@ class URLPath(MPTTModel):
         'self',
         null=True,
         blank=True,
-        on_delete=models.SET_NULL,
+        on_delete=models.CASCADE,
         related_name='children',
         help_text=_("Position of URL path in the tree.")
     )

@@ 31,7 31,7 @@ class Attachment(ReusablePlugin):
     current_revision = models.OneToOneField(
         'AttachmentRevision', verbose_name=_('current revision'),
         blank=True, null=True, related_name='current_set',
-        on_delete=models.SET_NULL,
+        on_delete=models.CASCADE,
         help_text=_(
             'The revision of this attachment currently in use (on all articles using the attachment)'),)
 

@@ 21,11 21,17 @@ LINT =
 
 [testenv]
 
+whitelist_externals=
+  sh
+
 passenv =
   INCLUDE_SELENIUM_TESTS
   SELENIUM_SHOW_BROWSER
 
 commands =
+  # Test that there are no migrations needed -- on Django 1.11, we can
+  # use --check and remove the '!' which likely doesn't work on Windows
+  sh -c '! testproject/manage.py makemigrations --dry-run --exit --noinput'
   {toxinidir}/runtests.py --basetemp={envtmpdir} --ds=tests.settings --cov=src/wiki --cov-config .coveragerc {posargs}
 
 usedevelop = true


@@ 40,7 46,7 @@ deps =
   django-classy-tags==0.4
   mock>=2.0
   Markdown==2.6.7
-  django_nyt==1.0b1
+  django_nyt==1.0
   bleach==1.5.0
   django18: Django==1.8.2
   django19: Django==1.9