updates

Author: saxix

CHANGES

@@ -1,3 +1,10 @@
+Release 2.5
+-----------
+* removes deprecatd MANUAL_TRIGGERS
+* drop support Django 2.x
+* drop support python 3.8
+
+
 Release 2.4
 -----------
 * add support Django 4

src/concurrency/admin.py

@@ -14,6 +14,7 @@
 from django.utils.encoding import force_str
 from django.utils.safestring import mark_safe
 from django.utils.translation import ngettext
+from django.db import transaction
 
 from concurrency import core, forms
 from concurrency.api import get_revision_of_object
@@ -197,6 +198,7 @@ def _get_conflicts(self, request):
         else:
             return []
 
+    @transaction.atomic()
     def save_model(self, request, obj, form, change):
         try:
             if change:

src/concurrency/config.py

@@ -7,8 +7,8 @@
 from .compat import get_callable
 
 # List Editable Policy
-# 0 do not save updated records, save others, show message to the user
-# 1 abort whole transaction
+# 1 do not save updated records, save others, show message to the user
+# 2 abort whole transaction
 CONCURRENCY_LIST_EDITABLE_POLICY_SILENT = 1
 CONCURRENCY_LIST_EDITABLE_POLICY_ABORT_ALL = 2
 CONCURRENCY_POLICY_RAISE = 4
@@ -21,7 +21,6 @@ class AppSettings:
     defaults = {
         'ENABLED': True,
         'AUTO_CREATE_TRIGGERS': True,
-        'MANUAL_TRIGGERS': False,  # deprecated: use AUTO_CREATE_TRIGGERS
         'FIELD_SIGNER': 'concurrency.forms.VersionFieldSigner',
         'POLICY': CONCURRENCY_LIST_EDITABLE_POLICY_SILENT,
         'CALLBACK': 'concurrency.views.callback',
@@ -67,10 +66,6 @@ def _set_attr(self, prefix_name, value):
                     "{} is not a valid value for `CALLBACK`. It must be a callable or a fullpath to callable. ".format(
                         value))
             self._callback = func
-        elif name == "MANUAL_TRIGGERS":
-            warnings.warn("MANUAL_TRIGGERS is deprecated and will be removed in 2.5. Use AUTO_CREATE_TRIGGERS",
-                          category=DeprecationWarning)
-            self.AUTO_CREATE_TRIGGERS = not value
         elif name == "TRIGGERS_FACTORY":
             original = dict(value)
             for k, v in original.items():

tests/conftest.py

@@ -20,7 +20,6 @@ def pytest_configure():
 
     settings.SILENCED_SYSTEM_CHECKS = ['concurrency.W001']
     settings.CONCURRENCY_VERSION_FIELD_REQUIRED = False
-    settings.CONCURRENCY_MANUAL_TRIGGERS = False
     settings.CONCURRENCY_AUTO_CREATE_TRIGGERS = True
 
 

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = d{22,32,40,41}-py{38,39,310}-{pg,sqlite,mysql}
+envlist = d{32,42}-py{39,311}-{pg,sqlite,mysql}
 
 
 [pytest]
@@ -36,6 +36,7 @@ whitelist_externals =
                     /usr/bin/psql
 changedir={toxinidir}
 setenv =
+    PYTHONPATH =
     DBNAME = concurrency
     pg: DBENGINE = pg
     mysql: DBENGINE = mysql
@@ -56,10 +57,8 @@ deps =
     pypy-pg: psycopg2cffi
     mysql: mysqlclient
     docs: -rdocs/requirements.pip
-    d22: django==2.2.*
     d32: django==3.2.*
-    d40: django==4.0.*
-    d41: django==4.1.*
+    d41: django==4.3.*
 
 
 commands =