Update Django and Python support

Author: pfouque

.pre-commit-config.yaml

@@ -1,9 +1,9 @@
 default_language_version:
-  python: python3.11
+  python: python3.12
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v5.0.0
     hooks:
       - id: check-added-large-files
         args: ["--maxkb=700"]
@@ -18,14 +18,14 @@ repos:
       - id: trailing-whitespace
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.16.0
+    rev: v3.20.0
     hooks:
       - id: pyupgrade
         args:
           - "--py38-plus"
 
   - repo: https://github.com/adamchainz/django-upgrade
-    rev: 1.18.0
+    rev: 1.25.0
     hooks:
       - id: django-upgrade
         args: [--target-version, "4.2"]
@@ -44,7 +44,7 @@ repos:
       - id: poetry-export
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.4.8
+    rev: v0.11.12
     hooks:
       - id: ruff-format
-      - id: ruff
+      - id: ruff-check

README.md

@@ -9,11 +9,11 @@
 django-fsm adds simple declarative state management for django models.
 
 > [!IMPORTANT]
-> Django FSM-2 started as a fork of [Django FSM](https://github.com/viewflow/django-fsm).
+> Django FSM-2 is a maintained fork of [Django FSM](https://github.com/viewflow/django-fsm).
 >
 > Big thanks to Mikhail Podgurskiy for starting this awesome project and maintaining it for so many years.
 >
-> Unfortunately, development has stalled for almost 2 years and it was officially announced there will be no new releases. [Viewflow](https://github.com/viewflow/viewflow) is presented as an alternative but the transition is not that easy.
+> Unfortunately, after 2 years without any releases, the project was brutally archived. [Viewflow](https://github.com/viewflow/viewflow) is presented as an alternative but the transition is not that easy.
 >
 > If what you need is just a simple state machine, tailor-made for Django, Django FSM-2 is the successor of Django FSM, with dependencies updates, typing (planned)
 
@@ -39,6 +39,16 @@ Or, for the latest git version
 $ pip install -e git://github.com/django-commons/django-fsm-2.git#egg=django-fsm
 ```
 
+## Migration from django-fsm
+
+django-fsm-2 is a drop-in replacement, it's actually the same project but from a different source.
+So all you need to do is to replace `django-fsm` dependency with `django-fsm-2`. And voila!
+
+``` bash
+$ pip install django-fsm-2
+```
+
+
 ## Usage
 
 Add FSMState field to your model

django_fsm/management/commands/graph_transitions.py

@@ -126,7 +126,7 @@ def add_arguments(self, parser):
             "-o",
             action="store",
             dest="outputfile",
-            help=("Render output file. Type of output dependent on file extensions. " "Use png or jpg to render graph to image."),
+            help=("Render output file. Type of output dependent on file extensions. Use png or jpg to render graph to image."),
         )
         parser.add_argument(
             "--layout",

django_fsm/tests/test_protected_fields.py

@@ -1,8 +1,5 @@
 from __future__ import annotations
 
-import unittest
-
-import django
 from django.db import models
 from django.test import TestCase
 
@@ -40,7 +37,6 @@ def try_change():
         instance.save()
         self.assertEqual(instance.status, "published")
 
-    @unittest.skipIf(django.VERSION < (1, 8), "Django introduced refresh_from_db in 1.8")
     def test_refresh_from_db(self):
         instance = RefreshableModel()
         instance.save()

pyproject.toml

@@ -20,13 +20,15 @@ classifiers = [
     "Framework :: Django :: 4.2",
     "Framework :: Django :: 5.0",
     "Framework :: Django :: 5.1",
+    "Framework :: Django :: 5.2",
     'Programming Language :: Python',
     'Programming Language :: Python :: 3',
     'Programming Language :: Python :: 3.8',
     'Programming Language :: Python :: 3.9',
     'Programming Language :: Python :: 3.10',
     'Programming Language :: Python :: 3.11',
     'Programming Language :: Python :: 3.12',
+    'Programming Language :: Python :: 3.13',
     'Topic :: Software Development :: Libraries :: Python Modules',
 ]
 packages = [{ include = "django_fsm" }]

tox.ini

@@ -3,13 +3,15 @@ envlist =
     py{38,39,310,311}-dj42
     py{310,311,312}-dj50
     py{310,311,312}-dj51
+    py{310,311,312,313}-dj52
 skipsdist = True
 
 [testenv]
 deps =
     dj42: Django==4.2
     dj50: Django==5.0
-    dj51: Django==5.1b1
+    dj51: Django==5.1
+    dj52: Django==5.2
 
     django-guardian
     graphviz
@@ -28,3 +30,4 @@ python =
     3.10: py310
     3.11: py311
     3.12: py312
+    3.13: py313