Merge branch 'jazzband_master' into history-manager-customization

.github/workflows/test.yml

@@ -11,20 +11,26 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12-dev']
-        django-version: ['3.2', '4.1', '4.2', 'main']
+        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13-dev']
+        django-version: ['3.2', '4.2', '5.0', 'main']
 
         exclude:
+          # Exclude py3.8 and py3.9 for Django main and 5.0
+          - python-version: '3.8'
+            django-version: '5.0'
+          - python-version: '3.9'
+            django-version: '5.0'
           - python-version: '3.8'
             django-version: 'main'
-
           - python-version: '3.9'
             django-version: 'main'
 
+          # Exclude py3.11, py3.12 and py3.13 for Django 3.2
           - python-version: '3.11'
             django-version: '3.2'
-
-          - python-version: '3.12-dev'
+          - python-version: '3.12'
+            django-version: '3.2'
+          - python-version: '3.13-dev'
             django-version: '3.2'
 
     services:
@@ -115,7 +121,7 @@ jobs:
           # Install this project in editable mode, so that its package metadata can be queried
           pip install -e .
           # Install the latest minor version of Django we support
-          pip install Django==4.2
+          pip install Django==5.0
 
       - name: Check translation files are updated
         run: python -m simple_history.tests.generated_file_checks.check_translations

.pre-commit-config.yaml

@@ -1,20 +1,20 @@
 ---
 repos:
   - repo: https://github.com/PyCQA/bandit
-    rev: 1.7.6
+    rev: 1.7.7
     hooks:
       - id: bandit
         args:
           - "-x *test*.py"
 
   - repo: https://github.com/psf/black-pre-commit-mirror
-    rev: 23.12.1
+    rev: 24.2.0
     hooks:
       - id: black
         language_version: python3.8
 
   - repo: https://github.com/pycqa/flake8
-    rev: 6.1.0
+    rev: 7.0.0
     hooks:
       - id: flake8
         args:
@@ -40,14 +40,14 @@ repos:
       - id: detect-private-key
 
   - repo: https://github.com/adrienverge/yamllint
-    rev: v1.33.0
+    rev: v1.35.1
     hooks:
       - id: yamllint
         args:
           - "--strict"
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.15.0
+    rev: v3.15.1
     hooks:
       - id: pyupgrade
         args: [--py38-plus]

.readthedocs.yaml

@@ -9,7 +9,7 @@ version: 2
 build:
   os: ubuntu-22.04
   tools:
-    python: "3.11"
+    python: "3.12"
 
 # Build documentation in the "docs/" directory with Sphinx
 sphinx:

CHANGES.rst

@@ -4,6 +4,13 @@ Changes
 Unreleased
 ----------
 
+- Support custom History ``Manager`` and ``QuerySet`` classes (gh-1280)
+
+3.5.0 (2024-02-19)
+------------------
+
+- Fixed ``FieldError`` when creating historical records for many-to-many fields with
+  ``to="self"`` (gh-1218)
 - Allow ``HistoricalRecords.m2m_fields`` as str (gh-1243)
 - Fixed ``HistoryRequestMiddleware`` deleting non-existent
   ``HistoricalRecords.context.request`` in very specific circumstances (gh-1256)
@@ -16,7 +23,8 @@ Unreleased
   version is lower than 4.2 (gh-1261)
 - Small performance optimization of the ``clean-duplicate_history`` command (gh-1015)
 - Support Simplified Chinese translation (gh-1281)
-- Support custom History ``Manager`` and ``QuerySet`` classes (gh-1280)
+- Added support for Django 5.0 (gh-1283)
+- Added support for Python 3.13 (gh-1289)
 
 3.4.0 (2023-08-18)
 ------------------
@@ -37,8 +45,6 @@ Unreleased
   ``HistoricalRecords.context.request``) under some circumstances (gh-1188)
 - Made ``HistoryRequestMiddleware`` async-capable (gh-1209)
 - Fixed error when setting ``table_name`` with ``inherit=True`` (gh-1195)
-- Fixed ``FieldError`` when creating historical records for many-to-many fields with
-  ``to="self"`` (gh-1218)
 
 3.3.0 (2023-03-08)
 ------------------

README.rst

@@ -42,9 +42,9 @@ This app supports the following combinations of Django and Python:
   Django      Python
 ==========  ========================
 3.2         3.8, 3.9, 3.10
-4.1         3.8, 3.9, 3.10, 3.11, 3.12-dev
-4.2         3.8, 3.9, 3.10, 3.11, 3.12-dev
-main        3.10, 3.11, 3.12-dev
+4.2         3.8, 3.9, 3.10, 3.11, 3.12, 3.13-dev
+5.0         3.10, 3.11, 3.12, 3.13-dev
+main        3.10, 3.11, 3.12, 3.13-dev
 ==========  ========================
 
 Getting Help

docs/index.rst

@@ -42,9 +42,9 @@ This app supports the following combinations of Django and Python:
   Django      Python
 ==========  =======================
 3.2         3.8, 3.9, 3.10
-4.1         3.8, 3.9, 3.10, 3.11, 3.12-dev
-4.2         3.8, 3.9, 3.10, 3.11, 3.12-dev
-main        3.10, 3.11, 3.12-dev
+4.2         3.8, 3.9, 3.10, 3.11, 3.12, 3.13-dev
+5.0         3.10, 3.11, 3.12, 3.13-dev
+main        3.10, 3.11, 3.12, 3.13-dev
 ==========  =======================
 
 Contribute

setup.py

@@ -39,15 +39,16 @@
             "Intended Audience :: Developers",
             "Framework :: Django",
             "Framework :: Django :: 3.2",
-            "Framework :: Django :: 4.1",
             "Framework :: Django :: 4.2",
+            "Framework :: Django :: 5.0",
             "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",
             "License :: OSI Approved :: BSD License",
         ],
         python_requires=">=3.8",

tox.ini

@@ -1,9 +1,12 @@
 [tox]
 envlist =
     py{38,39,310}-dj32-{sqlite3,postgres,mysql,mariadb},
-    py{38,39,310,311,312}-dj41-{sqlite3,postgres,mysql,mariadb},
     py{38,39,310,311,312}-dj42-{sqlite3,postgres,mysql,mariadb},
+    py{310,311,312}-dj50-{sqlite3,postgres,mysql,mariadb},
     py{310,311,312}-djmain-{sqlite3,postgres,mysql,mariadb},
+    # DEV: Add `313` to the Python versions above (so that postgres is tested with 3.13)
+    #      when `psycopg2-binary` supports 3.13
+    py313-dj{42,50,main}-{sqlite3,mysql,mariadb},
     docs,
     lint
 
@@ -14,12 +17,13 @@ python =
     3.10: py310
     3.11: py311, docs, lint
     3.12: py312
+    3.13: py313
 
 [gh-actions:env]
 DJANGO =
     3.2: dj32
-    4.1: dj41
     4.2: dj42
+    5.0: dj50
     main: djmain
 
 [flake8]
@@ -32,8 +36,8 @@ exclude = __init__.py,simple_history/registry_tests/migration_test_app/migration
 deps =
     -rrequirements/test.txt
     dj32: Django>=3.2,<3.3
-    dj41: Django>=4.1,<4.2
     dj42: Django>=4.2,<4.3
+    dj50: Django>=5.0,<5.1
     djmain: https://github.com/django/django/tarball/main
     postgres: -rrequirements/postgres.txt
     mysql: -rrequirements/mysql.txt