Merge branch 'master' of github.com:viewflow/django-fsm

Author: kmmbvnr

README.rst

@@ -157,7 +157,7 @@ on a model instance with a protected FSMField will cause an exception.
 
 You can use ``*`` for ``source`` to allow switching to ``target`` from any state. 
 
-You can use ``+`` for ``source`` to allow switching to ``target`` from any state exluding ``target`` state.
+You can use ``+`` for ``source`` to allow switching to ``target`` from any state excluding ``target`` state.
 
 ``target`` state
 ~~~~~~~~~~~~~~~~
@@ -405,7 +405,7 @@ Drawing transitions
 
 Renders a graphical overview of your models states transitions
 
-You need ``pip install graphviz>=0.4`` library and add ``django_fsm`` to
+You need ``pip install "graphviz>=0.4"`` library and add ``django_fsm`` to
 your ``INSTALLED_APPS``:
 
 .. code:: python

django_fsm/__init__.py

@@ -556,7 +556,7 @@ def _do_update(self, base_qs, using, pk_val, values, update_fields, forced_updat
         # INSERT if UPDATE fails.
         # Thus, we need to make sure we only catch the case when the object *is* in the DB, but with changed state; and
         # mimic standard _do_update behavior otherwise. Django will pick it up and execute _do_insert.
-        if not updated and base_qs.filter(pk=pk_val).exists():
+        if not updated and base_qs.filter(pk=pk_val).using(using).exists():
             raise ConcurrentTransition("Cannot save object! The state has been changed since fetched from the database!")
 
         return updated

django_fsm/management/commands/graph_transitions.py

@@ -6,8 +6,11 @@
 from django.core.management.base import BaseCommand
 try:
     from django.utils.encoding import force_text
+    _requires_system_checks = True
 except ImportError:  # Django >= 4.0
     from django.utils.encoding import force_str as force_text
+    from django.core.management.base import ALL_CHECKS
+    _requires_system_checks = ALL_CHECKS
 
 from django_fsm import FSMFieldMixin, GET_STATE, RETURN_VALUE
 
@@ -135,7 +138,7 @@ def get_graphviz_layouts():
 
 
 class Command(BaseCommand):
-    requires_system_checks = True
+    requires_system_checks = _requires_system_checks
 
     if not HAS_ARGPARSE:
         option_list = BaseCommand.option_list + (

setup.py

@@ -35,6 +35,8 @@
         "Framework :: Django :: 2.2",
         "Framework :: Django :: 3.1",
         "Framework :: Django :: 3.2",
+        "Framework :: Django :: 4.0",
+        "Framework :: Django :: 4.1",
         'Programming Language :: Python',
         'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',