* Get ready for Django 2.0 migration. The Taggit manager has a PR in …

…their github that hopefully will fix the last remaining issues with 2.0

django_kala/auth/models.py

@@ -162,8 +162,8 @@ def __str__(self):  # pragma: no cover
 
 
 class Permissions(models.Model):
-    user = models.ForeignKey(settings.AUTH_USER_MODEL)
-    permission = models.ForeignKey(Permission)
+    user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE)
+    permission = models.ForeignKey(Permission, on_delete=models.DO_NOTHING)
     object_uuid = models.UUIDField()
 
     @classmethod

django_kala/documents/models.py

@@ -17,12 +17,12 @@
 
 
 class Document(models.Model):
-    project = models.ForeignKey('projects.Project')
+    project = models.ForeignKey('projects.Project', on_delete=models.CASCADE)
     name = models.CharField(max_length=255)
     date = models.DateTimeField(default=timezone.now)
     removed = models.DateField(null=True)
     mime = models.CharField(max_length=255, null=True)
-    category = models.ForeignKey('projects.Category', null=True, blank=True)
+    category = models.ForeignKey('projects.Category', null=True, blank=True, on_delete=models.DO_NOTHING)
     is_active = models.BooleanField(default=True)
     uuid = models.UUIDField(unique=True, db_index=True, default=uuid4, editable=False)
 
@@ -189,15 +189,15 @@ def __str__(self):
 
 class DocumentVersion(models.Model):
     uuid = models.UUIDField(primary_key=True, default=uuid4, editable=False)
-    document = models.ForeignKey('Document', null=True)
+    document = models.ForeignKey('Document', null=True, on_delete=models.CASCADE)
     file = models.FileField(null=True)
     url = models.URLField(max_length=3000)
     size = models.IntegerField(default=0)
     description = models.TextField(null=True)
     created = models.DateTimeField(default=timezone.now) # Update save method
     changed = models.DateTimeField(default=timezone.now) # Update save method
     mime = models.CharField(max_length=255, null=True)
-    user = models.ForeignKey(settings.AUTH_USER_MODEL, null=True, blank=True)
+    user = models.ForeignKey(settings.AUTH_USER_MODEL, null=True, blank=True, on_delete=models.DO_NOTHING)
     name = models.CharField(max_length=255)
 
     class Meta:

django_kala/projects/models.py

@@ -17,7 +17,7 @@ class Project(models.Model):
     description = models.TextField()
     tags = TaggableManager(blank=True)
 
-    organization = models.ForeignKey('organizations.Organization')
+    organization = models.ForeignKey('organizations.Organization', on_delete=models.CASCADE)
     clients = models.ManyToManyField(settings.AUTH_USER_MODEL, blank=True)
 
     created = models.DateTimeField(auto_now_add=True)
@@ -133,7 +133,7 @@ def has_create(self, user):
 
 class Category(models.Model):
     name = models.CharField(max_length=255)
-    project = models.ForeignKey(Project)
+    project = models.ForeignKey(Project, on_delete=models.CASCADE)
     type = models.CharField(max_length=20, db_index=True, blank=True)
 
     def __str__(self):

django_kala/tox.ini

@@ -1,12 +1,15 @@
 [tox]
-envlist = py{35}-django{111}
+envlist =
+    py35-django111
+    py35-django200
 toxworkdir = /tmp/kala/
 
-[testenv]
+[testenv:py35-django111]
+basepython = python3.5
 deps =
+    Django>=1.11,<2.0
     boto3
     dateparser
-    Django>=1.11,<2.0
     django-countries
     django-localflavor-us
     django-storages
@@ -25,5 +28,30 @@ deps =
     ipython
     six
     defusedxml
+commands = pytest --cov-report term-missing --cov=. --ds=django_kala.test_settings --ignore=.tox* -r w
 
+[testenv:py35-django200]
+basepython = python3.5
+deps =
+    Django>=2.0,<2.1
+    boto3
+    dateparser
+    django-countries
+    django-localflavor-us
+    django-storages
+    django-taggit
+    django-timezone-field
+    djangorestframework
+    faker
+    factory_boy
+    packaging
+    psycopg2
+    pyparsing
+    pytest
+    pytest-cov
+    pytest-django
+    pytz
+    ipython
+    six
+    defusedxml
 commands = pytest --cov-report term-missing --cov=. --ds=django_kala.test_settings --ignore=.tox* -r w