dj4

Author: domdinicola

.github/workflows/tests.yaml

@@ -27,7 +27,7 @@ jobs:
             fail-fast: false
             matrix:
                 python-version: [ "3.8", "3.9", "3.10"]
-                django-version: [ "2.2", "3.2", ]
+                django-version: [ "2.2", "3.2", "4.0"]
                 db-engine: ["pg", "mysql"]
         env:
             PY_VER: ${{ matrix.python-version}}

Makefile

@@ -28,8 +28,6 @@ test:
 
 lint:
 	pre-commit run --all-files
-	pipenv run isort -rc src/ --check-only
-	pipenv run check-manifest
 
 travis:
 	docker run --privileged --name travis-debug -it -u travis travisci/ci-amethyst:packer-1512508255-986baf0 /bin/bash -l
@@ -48,6 +46,7 @@ fullclean:
 
 docs: .mkbuilddir
 	mkdir -p ${BUILDDIR}/docs
+	rm -fr ${BUILDDIR}/docs/*
 	sphinx-build -aE docs/ ${BUILDDIR}/docs
 ifdef BROWSE
 	firefox ${BUILDDIR}/docs/index.html

docs/_ext/version.py

@@ -2,10 +2,10 @@
 
 from docutils.parsers.rst import Directive, directives
 from sphinx import addnodes, roles
+from sphinx.errors import ExtensionError
 from sphinx.util.console import bold
 # RE for option descriptions without a '--' prefix
 from sphinx.writers.html import HTMLTranslator
-from sphinx.errors import ExtensionError
 
 simple_option_desc_re = re.compile(
     r'([-_a-zA-Z0-9]+)(\s*.*?)(?=,\s+(?:/|-|--)|$)')

docs/settings.rst

@@ -173,6 +173,3 @@ Default::
 
 
 dict to customise :ref:`TriggerFactory`. Use this to customise the SQL clause to create triggers.
-
-
-

setup.cfg

@@ -1,17 +1,15 @@
 [isort]
-line_length=120
 combine_as_imports = true
-multi_line_output = 5
-default_section = FIRSTPARTY
-indent='    '
-
-known_future_library=
-known_standard_library=six
-known_third_party=django
-known_first_party=demo
-
-known_concurrency=concurrency
-sections=FUTURE,STDLIB,THIRDPARTY,FIRSTPARTY,CONCURRENCY,LOCALFOLDER
+default_section = THIRDPARTY
+include_trailing_comma = true
+line_length = 80
+known_future_library = future,pies
+known_standard_library =
+known_third_party = django
+known_first_party = sos
+multi_line_output = 0
+balanced_wrapping = true
+sections = FUTURE,STDLIB,THIRDPARTY,FIRSTPARTY,LOCALFOLDER
 
 [flake8]
 max-complexity = 12

setup.py

@@ -28,9 +28,10 @@ def finalize_options(self):
 
     def run_tests(self):
         # import here, cause outside the eggs aren't loaded
-        import pytest
         import sys
 
+        import pytest
+
         sys.path.insert(0, os.path.join(ROOT, 'tests', 'demoapp'))
         errno = pytest.main(self.test_args)
         sys.exit(errno)

src/concurrency/admin.py

@@ -1,21 +1,24 @@
+import operator
+import re
+from functools import reduce
+
+import django
 from django.contrib import admin, messages
 from django.contrib.admin import helpers
 from django.core.checks import Error
 from django.core.exceptions import ImproperlyConfigured, ValidationError
 from django.db.models import Q
-from django.forms.formsets import INITIAL_FORM_COUNT, MAX_NUM_FORM_COUNT, TOTAL_FORM_COUNT, ManagementForm
+from django.forms.formsets import (INITIAL_FORM_COUNT, MAX_NUM_FORM_COUNT,
+                                   TOTAL_FORM_COUNT, ManagementForm,)
 from django.forms.models import BaseModelFormSet
 from django.http import HttpResponse, HttpResponseRedirect
 from django.utils.encoding import force_str
 from django.utils.safestring import mark_safe
 from django.utils.translation import ngettext
 
-import operator
-import re
-from functools import reduce
-
 from concurrency import core, forms
 from concurrency.api import get_revision_of_object
+from concurrency.compat import concurrency_param_name
 from concurrency.config import CONCURRENCY_LIST_EDITABLE_POLICY_ABORT_ALL, conf
 from concurrency.exceptions import RecordModifiedError
 from concurrency.forms import ConcurrentForm, VersionWidget
@@ -132,12 +135,27 @@ def __init__(self, *args, **kwargs):
         self._versions = kwargs.pop('versions', [])
         super().__init__(*args, **kwargs)
 
-    def _html_output(self, normal_row, error_row, row_ender, help_text_html, errors_on_separate_row):
-        ret = super()._html_output(normal_row, error_row, row_ender, help_text_html, errors_on_separate_row)
+    def _get_concurrency_fields(self):
         v = []
         for pk, version in self._versions:
-            v.append('<input type="hidden" name="_concurrency_version_{0}" value="{1}">'.format(pk, version))
-        return mark_safe("{0}{1}".format(ret, "".join(v)))
+            v.append(f'<input type="hidden" name="{concurrency_param_name}_{pk}" value="{version}">')
+        return mark_safe("".join(v))
+
+    def render(self, template_name=None, context=None, renderer=None):
+        out = super().render(template_name, context, renderer)
+        return out + self._get_concurrency_fields()
+
+    def __str__(self):
+        if django.VERSION[:2] >= (4, 0):
+            return self.render()
+        else:
+            return super().__str__()
+
+    __html__ = __str__
+
+    def _html_output(self, normal_row, error_row, row_ender, help_text_html, errors_on_separate_row):
+        ret = super()._html_output(normal_row, error_row, row_ender, help_text_html, errors_on_separate_row)
+        return mark_safe("{0}{1}".format(ret, self._get_concurrency_fields()))
 
 
 class ConcurrentBaseModelFormSet(BaseModelFormSet):
@@ -183,7 +201,7 @@ def _get_conflicts(self, request):
     def save_model(self, request, obj, form, change):
         try:
             if change:
-                version = request.POST.get('_concurrency_version_{0.pk}'.format(obj), None)
+                version = request.POST.get(f'{concurrency_param_name}_{obj.pk}', None)
                 if version:
                     core._set_version(obj, version)
             super().save_model(request, obj, form, change)

src/concurrency/api.py

@@ -1,7 +1,7 @@
-from django.db.models import Model
-
 import logging
 
+from django.db.models import Model
+
 from concurrency.config import conf
 from concurrency.core import get_version_fieldname  # _wrap_model_save
 from concurrency.exceptions import RecordModifiedError

src/concurrency/compat.py

@@ -1,2 +1,8 @@
+import django
 from django.template.exceptions import TemplateDoesNotExist  # noqa
 from django.urls.utils import get_callable  # noqa
+
+if django.VERSION[:2] >= (4, 0):
+    concurrency_param_name = 'form-_concurrency_version'
+else:
+    concurrency_param_name = '_concurrency_version'

src/concurrency/config.py

@@ -1,9 +1,9 @@
+import warnings
+
 from django.core.exceptions import ImproperlyConfigured
 from django.test.signals import setting_changed
 from django.utils.module_loading import import_string
 
-import warnings
-
 from .compat import get_callable
 
 # List Editable Policy

src/concurrency/fields.py

@@ -1,10 +1,3 @@
-from django.db import models
-from django.db.models import signals
-from django.db.models.fields import Field
-from django.db.models.signals import class_prepared, post_migrate
-from django.utils.encoding import force_str
-from django.utils.translation import gettext_lazy as _
-
 import copy
 import functools
 import hashlib
@@ -13,6 +6,13 @@
 from collections import OrderedDict
 from functools import update_wrapper
 
+from django.db import models
+from django.db.models import signals
+from django.db.models.fields import Field
+from django.db.models.signals import class_prepared, post_migrate
+from django.utils.encoding import force_str
+from django.utils.translation import gettext_lazy as _
+
 from concurrency import forms
 from concurrency.api import get_revision_of_object
 from concurrency.config import conf
@@ -134,7 +134,6 @@ def _wrap_do_update(self, func):
         def _do_update(model_instance, base_qs, using, pk_val, values, update_fields, forced_update):
             version_field = model_instance._concurrencymeta.field
             old_version = get_revision_of_object(model_instance)
-
             if not version_field.model._meta.abstract:
                 if version_field.model is not base_qs.model:
                     return func(model_instance, base_qs, using, pk_val, values, update_fields, forced_update)

src/concurrency/forms.py

@@ -1,12 +1,13 @@
+from importlib import import_module
+
 from django import forms
-from django.core.exceptions import NON_FIELD_ERRORS, ImproperlyConfigured, ValidationError
+from django.core.exceptions import (NON_FIELD_ERRORS, ImproperlyConfigured,
+                                    ValidationError,)
 from django.core.signing import BadSignature, Signer
 from django.forms import HiddenInput, ModelForm
 from django.utils.safestring import mark_safe
 from django.utils.translation import gettext as _
 
-from importlib import import_module
-
 from concurrency.config import conf
 from concurrency.core import _select_lock
 from concurrency.exceptions import RecordModifiedError, VersionError

src/concurrency/management/commands/triggers.py

@@ -1,11 +1,11 @@
+from functools import partial
+
 import django
 from django.core.exceptions import ImproperlyConfigured
 from django.core.management.base import BaseCommand
 from django.db import connections
 from django.db.transaction import atomic
 
-from functools import partial
-
 from concurrency.triggers import create_triggers, drop_triggers, get_triggers
 
 

src/concurrency/triggers.py

@@ -1,9 +1,9 @@
+from collections import defaultdict
+
 from django.apps import apps
 from django.db import connections, router
 from django.db.utils import DatabaseError
 
-from collections import defaultdict
-
 # from .fields import _TRIGGERS  # noqa
 
 

tests/conftest.py

@@ -1,8 +1,9 @@
 import os
 import platform
-import pytest
 import sys
 
+import pytest
+
 py_impl = getattr(platform, 'python_implementation', lambda: None)
 PYPY = py_impl() == 'PyPy'
 PURE_PYTHON = os.environ.get('PURE_PYTHON', False)

tests/demoapp/demo/admin.py

@@ -1,11 +1,9 @@
+from demo.models import (InheritedModel, ListEditableConcurrentModel,
+                         NoActionsConcurrentModel, ProxyModel,
+                         ReversionConcurrentModel, SimpleConcurrentModel,)
 from django.contrib import admin
 from django.contrib.admin.sites import NotRegistered
 
-from demo.models import (
-    InheritedModel, ListEditableConcurrentModel, NoActionsConcurrentModel, ProxyModel, ReversionConcurrentModel,
-    SimpleConcurrentModel
-)
-
 from concurrency.admin import ConcurrentModelAdmin
 from concurrency.api import disable_concurrency
 

tests/demoapp/demo/base.py

@@ -1,8 +1,7 @@
+from demo.admin import admin_register_models
 from django.contrib.auth.models import Group, User
 from django.test import TransactionTestCase
 from django.utils import timezone
-
-from demo.admin import admin_register_models
 from django_webtest import WebTestMixin
 
 from concurrency.api import apply_concurrency_check

tests/demoapp/demo/models.py

@@ -1,7 +1,8 @@
 from django.contrib.auth.models import Group, User
 from django.db import models
 
-from concurrency.fields import AutoIncVersionField, ConditionalVersionField, IntegerVersionField, TriggerVersionField
+from concurrency.fields import (AutoIncVersionField, ConditionalVersionField,
+                                IntegerVersionField, TriggerVersionField,)
 
 __all__ = ['SimpleConcurrentModel', 'AutoIncConcurrentModel',
            'ProxyModel', 'InheritedModel', 'CustomSaveModel',

tests/demoapp/demo/settings.py

@@ -116,8 +116,8 @@
         'default': {
             'ENGINE': 'django.db.backends.postgresql_psycopg2',
             'NAME': dbname,
-            'HOST': '127.0.0.1',
-            'PORT': '5432',
+            'HOST': os.environ.get('PGHOST', '127.0.0.1'),
+            'PORT': os.environ.get('PGPORT', '5432'),
             'USER': 'postgres',
             'PASSWORD': 'postgres'}}
 elif db == 'mysql':

tests/demoapp/demo/urls.py

@@ -1,9 +1,8 @@
+from demo.models import SimpleConcurrentModel
 from django.contrib import admin
 from django.urls import re_path
 from django.views.generic.edit import UpdateView
 
-from demo.models import SimpleConcurrentModel
-
 admin.autodiscover()
 
 urlpatterns = (re_path(r'cm/(?P<pk>\d+)/',

tests/demoapp/demo/util.py

@@ -1,15 +1,14 @@
-from django import db
-
 import itertools
-import pytest
 from contextlib import contextmanager
-from demo.models import (
-    AutoIncConcurrentModel, ConcreteModel, CustomSaveModel, InheritedModel, ProxyModel, SimpleConcurrentModel,
-    TriggerConcurrentModel
-)
 from functools import partial, update_wrapper
 from itertools import count
 
+import pytest
+from demo.models import (AutoIncConcurrentModel, ConcreteModel,
+                         CustomSaveModel, InheritedModel, ProxyModel,
+                         SimpleConcurrentModel, TriggerConcurrentModel,)
+from django import db
+
 from concurrency.config import conf
 
 

tests/test_admin_actions.py

@@ -1,9 +1,8 @@
-from django.urls import reverse
-
 import pytest
 from demo.base import SENTINEL, AdminTestCase
 from demo.models import SimpleConcurrentModel
 from demo.util import unique_id
+from django.urls import reverse
 
 
 class TestAdminActions(AdminTestCase):

tests/test_admin_edit.py

@@ -1,10 +1,9 @@
-from django.urls import reverse
-from django.utils.translation import gettext as _
-
 import pytest
 from demo.base import SENTINEL, AdminTestCase
 from demo.models import SimpleConcurrentModel
 from demo.util import nextname
+from django.urls import reverse
+from django.utils.translation import gettext as _
 
 from concurrency.forms import VersionFieldSigner