enable ConcurrentModelAdmin.check only on django>=1.11

Author: saxix

src/concurrency/admin.py

@@ -21,6 +21,7 @@
 
 from concurrency import core, forms
 from concurrency.api import get_revision_of_object
+from concurrency.compat import DJANGO_11
 from concurrency.config import CONCURRENCY_LIST_EDITABLE_POLICY_ABORT_ALL, conf
 from concurrency.exceptions import RecordModifiedError
 from concurrency.forms import ConcurrentForm, VersionWidget
@@ -254,30 +255,31 @@ class ConcurrentModelAdmin(ConcurrencyActionMixin,
     form = ConcurrentForm
     formfield_overrides = {forms.VersionField: {'widget': VersionWidget}}
 
-    def check(self, **kwargs):
-        errors = []
-        if self.fields:
-            version_field = self.model._concurrencymeta.field
-            if version_field.name not in self.fields:
-                errors.append(
-                    Error(
-                        'Missed version field in {} fields definition'.format(self),
-                        hint="Please add '{}' to the 'fields' attribute".format(version_field.name),
-                        obj=None,
-                        id='concurrency.A001',
+    if DJANGO_11:
+        def check(self, **kwargs):
+            errors = []
+            if self.fields:
+                version_field = self.model._concurrencymeta.field
+                if version_field.name not in self.fields:
+                    errors.append(
+                        Error(
+                            'Missed version field in {} fields definition'.format(self),
+                            hint="Please add '{}' to the 'fields' attribute".format(version_field.name),
+                            obj=None,
+                            id='concurrency.A001',
+                        )
                     )
-                )
-        if self.fieldsets:
-            version_field = self.model._concurrencymeta.field
-            fields = flatten([v['fields'] for k, v in self.fieldsets])
-
-            if version_field.name not in fields:
-                errors.append(
-                    Error(
-                        'Missed version field in {} fieldsets definition'.format(self),
-                        hint="Please add '{}' to the 'fieldsets' attribute".format(version_field.name),
-                        obj=None,
-                        id='concurrency.A002',
+            if self.fieldsets:
+                version_field = self.model._concurrencymeta.field
+                fields = flatten([v['fields'] for k, v in self.fieldsets])
+
+                if version_field.name not in fields:
+                    errors.append(
+                        Error(
+                            'Missed version field in {} fieldsets definition'.format(self),
+                            hint="Please add '{}' to the 'fieldsets' attribute".format(version_field.name),
+                            obj=None,
+                            id='concurrency.A002',
+                        )
                     )
-                )
-        return errors
+            return errors

src/concurrency/compat.py

@@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import, print_function, unicode_literals
 
+import django
+
 try:
     from django.template.base import TemplateDoesNotExist
 except ImportError:
@@ -16,3 +18,5 @@
     from django.urls.utils import get_callable
 except ImportError:
     from django.core.urlresolvers import get_callable  # noqa
+
+DJANGO_11 = django.VERSION[:2] == (1,11)

tests/conftest.py

@@ -15,8 +15,8 @@
 
 skippypy = pytest.mark.skipif(PYPY, reason='skip on pypy')
 
-# skipIfDjangoVersion = lambda v: pytest.mark.skipif("django.VERSION[:2]>={}".format(v),
-#                                                    reason="Skip if django>={}".format(v))
+skipIfDjangoVersion = lambda v: pytest.mark.skipif("django.VERSION[:2]{}".format(v),
+                                                   reason="Skip if django{}".format(v))
 
 
 def pytest_configure():

tests/test_issues.py

@@ -14,6 +14,7 @@
 from django.utils.encoding import force_text
 
 from concurrency.exceptions import RecordModifiedError
+from conftest import skipIfDjangoVersion
 from demo.admin import ActionsModelAdmin, admin_register
 from demo.base import AdminTestCase
 from demo.models import ListEditableConcurrentModel, ReversionConcurrentModel, SimpleConcurrentModel
@@ -115,6 +116,7 @@ def test_issue_54():
             m2.save()
 
 
+@skipIfDjangoVersion("<(1,11)")
 @pytest.mark.django_db()
 def test_issue_81a(monkeypatch):
     monkeypatch.setattr('demo.admin.ActionsModelAdmin.fields', ('id',))
@@ -123,6 +125,7 @@ def test_issue_81a(monkeypatch):
     assert 'concurrency.A001' in e.value.message
 
 
+@skipIfDjangoVersion("<(1,11)")
 @pytest.mark.django_db()
 def test_issue_81b(monkeypatch):
     fieldsets = (