tests: Enable django-polymorphic tests with django 3.0

Author: fdintino

nested_admin/tests/conftest.py

@@ -14,3 +14,6 @@ def suppress_warnings():
         "ignore",
         "name used for saved screenshot does not match file type",
         UserWarning)
+    # These deprecation warnings were thrown in django-polymorphic as of 2.1.2
+    warnings.filterwarnings("ignore", "django.utils.translation.ugettext", Warning)
+    warnings.filterwarnings("ignore", "force_text", Warning)

nested_admin/tests/nested_polymorphic/base.py

@@ -12,8 +12,8 @@
 try:
     from polymorphic.models import PolymorphicModel
 except:
-    # Temporary until django-polymorphic supports django 3.0
-    if django.VERSION < (3, 0):
+    # Temporary until django-polymorphic supports django 3.1
+    if django.VERSION < (3, 1):
         raise
     else:
         class PolymorphicModel(object):
@@ -24,9 +24,9 @@ class BaseNestedPolymorphicTestCase(BaseNestedAdminTestCase):
 
     @classmethod
     def setUpClass(cls):
-        if django.VERSION >= (3, 0):
+        if django.VERSION >= (3, 1):
             raise SkipTest(
-                'django-polymorphic not yet compatible with Django 3.0')
+                'django-polymorphic not yet compatible with Django 3.1')
         super(BaseNestedPolymorphicTestCase, cls).setUpClass()
 
     def get_inline_model_names(self):

nested_admin/tests/nested_polymorphic/test_polymorphic_add_filtering/models.py

@@ -5,8 +5,8 @@
 try:
     from polymorphic.models import PolymorphicModel
 except:
-    # Temporary until django-polymorphic supports django 3.0
-    if django.VERSION < (3, 0):
+    # Temporary until django-polymorphic supports django 3.1
+    if django.VERSION < (3, 1):
         raise
     else:
         PolymorphicModel = models.Model

nested_admin/tests/nested_polymorphic/test_polymorphic_std/models.py

@@ -10,8 +10,8 @@
 try:
     from polymorphic.models import PolymorphicModel
 except:
-    # Temporary until django-polymorphic supports django 3.0
-    if django.VERSION < (3, 0):
+    # Temporary until django-polymorphic supports django 3.1
+    if django.VERSION < (3, 1):
         raise
     else:
         PolymorphicModel = models.Model

nested_admin/tests/settings.py

@@ -36,7 +36,7 @@
 
 polymorphic = None
 
-if django.VERSION < (3, 0):
+if django.VERSION < (3, 1):
     try:
         import polymorphic
     except ImportError: