Merge pull request #63 from mcosti/django4-support

Django 4.1 support

Author: craigds

.github/workflows/tests.yml

@@ -6,11 +6,13 @@ jobs:
     strategy:
       matrix:
         python-version:
-          - "3.6"
+          - "3.8"
           - "3.9"
         django-version:
           - "3.1"
           - "3.2"
+          - "4.0"
+          - "4.1"
 
     steps:
       - uses: actions/checkout@v2

setup.py

@@ -26,6 +26,8 @@ def read_relative_file(filename):
         "Framework :: Django",
         "Framework :: Django :: 3.1",
         "Framework :: Django :: 3.2",
+        "Framework :: Django :: 4.0",
+        "Framework :: Django :: 4.1",
         "Intended Audience :: Developers",
         "License :: OSI Approved :: BSD License",
         "Operating System :: OS Independent",

tox.ini

@@ -2,6 +2,8 @@
 [tox]
 envlist = {py36,py39}-{dj31}
           {py36,py39}-{dj32}
+          {py38,py310}-{dj40}
+          {py38,py310}-{dj41}
 
 toxworkdir = {homedir}/.tox-django-typed-models
 
@@ -23,3 +25,5 @@ deps =
     pytest-sugar
     dj31: Django~=3.1.3
     dj32: Django~=3.2.0
+    dj40: Django~=4.0.0
+    dj41: Django~=4.1.0

typedmodels/models.py

@@ -1,3 +1,4 @@
+import inspect
 from functools import partial
 import types
 
@@ -436,9 +437,9 @@ def save(self, *args, **kwargs):
             raise RuntimeError("Untyped %s cannot be saved." % self.__class__.__name__)
         return super(TypedModel, self).save(*args, **kwargs)
 
-    def _get_unique_checks(self, exclude=None):
+    def _get_unique_checks(self, exclude=None, **kwargs):
         unique_checks, date_checks = super(TypedModel, self)._get_unique_checks(
-            exclude=exclude
+            exclude=exclude, **kwargs
         )
 
         for i, (model_class, field_names) in reversed(list(enumerate(unique_checks))):

typedmodels/tests.py

@@ -370,6 +370,20 @@ def test_uniqueness_check_on_child(db):
     child2.validate_unique()
 
 
+def test_uniqueness_check_include_meta_constraints(db):
+    """Django 4.1 introduces a new required kwarg
+    django/forms/models.py in validate_unique at line 809
+    for form in valid_forms:
+    exclude = form._get_validation_exclusions()
+    unique_checks, date_checks = form.instance._get_unique_checks(
+        exclude=exclude,
+        include_meta_constraints=True,
+    )
+    """
+    child2 = Child2.objects.create(a="a")
+    child2._get_unique_checks()
+
+
 def test_non_nullable_subclass_field_error():
     with pytest.raises(FieldError):