Merge branch 'master' into django-commons-prep

Author: ddabble

.github/workflows/test.yml

@@ -12,15 +12,22 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
-        django-version: ['4.2', '5.0', '5.1', 'main']
+        django-version: ['4.2', '5.0', '5.1', '5.2', 'main']
 
         exclude:
-          # Exclude py3.9 for Django main and 5+
+          # Exclude py3.9 for Django >= 5.0,
+          # and py3.10 and py3.11 for Django > 5.2
           - python-version: '3.9'
             django-version: '5.0'
           - python-version: '3.9'
             django-version: '5.1'
           - python-version: '3.9'
+            django-version: '5.2'
+          - python-version: '3.9'
+            django-version: 'main'
+          - python-version: '3.10'
+            django-version: 'main'
+          - python-version: '3.11'
             django-version: 'main'
 
     services:
@@ -79,8 +86,9 @@ jobs:
           DJANGO: ${{ matrix.django-version }}
 
       - name: Upload coverage
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v5
         with:
+          token: ${{ secrets.CODECOV_TOKEN }}
           name: Python ${{ matrix.python-version }}, Django ${{ matrix.django-version }}
 
 

.pre-commit-config.yaml

@@ -1,26 +1,26 @@
 ---
 repos:
   - repo: https://github.com/PyCQA/bandit
-    rev: 1.8.0
+    rev: 1.8.3
     hooks:
       - id: bandit
         exclude: /.*tests/
 
   - repo: https://github.com/psf/black-pre-commit-mirror
-    rev: 24.10.0
+    rev: 25.1.0
     hooks:
       - id: black
         language_version: python3.9
 
   - repo: https://github.com/pycqa/flake8
-    rev: 7.1.1
+    rev: 7.2.0
     hooks:
       - id: flake8
         args:
           - "--config=tox.ini"
 
   - repo: https://github.com/PyCQA/isort
-    rev: 5.13.2
+    rev: 6.0.1
     hooks:
       - id: isort
 
@@ -40,23 +40,23 @@ repos:
       - id: detect-private-key
 
   - repo: https://github.com/tox-dev/pyproject-fmt
-    rev: v2.5.0
+    rev: v2.5.1
     hooks:
       - id: pyproject-fmt
   - repo: https://github.com/abravalheri/validate-pyproject
-    rev: v0.23
+    rev: v0.24.1
     hooks:
       - id: validate-pyproject
 
   - repo: https://github.com/adrienverge/yamllint
-    rev: v1.35.1
+    rev: v1.37.1
     hooks:
       - id: yamllint
         args:
           - "--strict"
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.19.0
+    rev: v3.19.1
     hooks:
       - id: pyupgrade
         args: [--py39-plus]

CHANGES.rst

@@ -4,6 +4,18 @@ Changes
 Unreleased
 ----------
 
+- Tests are no longer bundled in released wheels (gh-1478)
+- Move repository to the Django Commons organization (gh-1391)
+
+3.9.0 (2025-01-26)
+------------------
+
+- Removed the ``simple_history_admin_list.display_list()`` template tag that was
+  deprecated in version 3.6.0 (gh-1444)
+
+3.8.0 (2025-01-23)
+------------------
+
 - Made ``skip_history_when_saving`` work when creating an object - not just when
   updating an object (gh-1262)
 - Improved performance of the ``latest_of_each()`` history manager method (gh-1360)
@@ -15,7 +27,9 @@ Unreleased
 - Added pagination to ``SimpleHistoryAdmin`` (gh-1277)
 - Fixed issue with history button not working when viewing historical entries in the
   admin (gh-527)
-- Move repository to the Django Commons organization (gh-1391)
+- Added support for Django 5.2 (gh-1441)
+- ``simple_history_admin_list.display_list()`` *was planned to be removed in this
+  release, but it was overlooked, and will instead be removed in 3.9.0*
 
 3.7.0 (2024-05-29)
 ------------------

README.rst

@@ -44,7 +44,8 @@ This app supports the following combinations of Django and Python:
 4.2         3.9, 3.10, 3.11, 3.12, 3.13
 5.0         3.10, 3.11, 3.12, 3.13
 5.1         3.10, 3.11, 3.12, 3.13
-main        3.10, 3.11, 3.12, 3.13
+5.2         3.10, 3.11, 3.12, 3.13
+main        3.12, 3.13
 ==========  ========================
 
 Getting Help

docs/index.rst

@@ -40,7 +40,8 @@ This app supports the following combinations of Django and Python:
 4.2         3.9, 3.10, 3.11, 3.12, 3.13
 5.0         3.10, 3.11, 3.12, 3.13
 5.1         3.10, 3.11, 3.12, 3.13
-main        3.10, 3.11, 3.12, 3.13
+5.2         3.10, 3.11, 3.12, 3.13
+main        3.12, 3.13
 ==========  =======================
 
 Contribute

pyproject.toml

@@ -22,6 +22,8 @@ classifiers = [
   "Framework :: Django",
   "Framework :: Django :: 4.2",
   "Framework :: Django :: 5.0",
+  "Framework :: Django :: 5.1",
+  "Framework :: Django :: 5.2",
   "Intended Audience :: Developers",
   "License :: OSI Approved :: BSD License",
   "Programming Language :: Python",
@@ -57,6 +59,10 @@ local_scheme = "node-and-date"
 packages = [
   "simple_history",
 ]
+exclude = [
+  "simple_history/registry_tests",
+  "simple_history/tests",
+]
 
 [tool.hatch.metadata.hooks.fancy-pypi-readme]
 content-type = "text/x-rst"

requirements/coverage.txt

@@ -1,2 +1,2 @@
-coverage==7.6.8
+coverage==7.9.0
 toml==0.10.2

requirements/docs.txt

@@ -1,2 +1,2 @@
-Sphinx==8.1.3
+Sphinx==8.2.3
 sphinx-rtd-theme==3.0.2

requirements/lint.txt

@@ -1,3 +1,3 @@
-black==24.10.0
-flake8==7.1.1
-isort==5.13.2
+black==25.1.0
+flake8==7.2.0
+isort==6.0.1

requirements/mysql.txt

@@ -1 +1 @@
-mysqlclient==2.2.6
+mysqlclient==2.2.7

requirements/postgres.txt

@@ -1 +1 @@
-psycopg[binary]==3.2.3
+psycopg[binary]==3.2.9

requirements/tox.txt

@@ -1,3 +1,3 @@
 -r ./coverage.txt
-tox==4.23.2
-tox-gh-actions==3.2.0
+tox==4.26.0
+tox-gh-actions==3.3.0

simple_history/templatetags/simple_history_admin_list.py

@@ -1,13 +1,10 @@
 import unittest
 
-from simple_history import __version__
-from simple_history.templatetags.simple_history_admin_list import display_list
-
 
 class DeprecationWarningTest(unittest.TestCase):
-    def test__display_list__warns_deprecation_and_is_yet_to_be_removed(self):
-        with self.assertWarns(DeprecationWarning):
-            display_list({})
-        # DEV: `display_list()` (and the file `simple_history_admin_list.py`) should be
-        #      removed when 3.8 is released
-        self.assertLess(__version__, "3.8")
+    """Tests that check whether ``DeprecationWarning`` is raised for certain features,
+    and that compare ``simple_history.__version__`` against the version the features
+    will be removed in.
+
+    If this class is empty, it normally means that nothing is currently deprecated.
+    """

simple_history/tests/tests/test_deprecation.py

@@ -1,7 +1,8 @@
 [tox]
 envlist =
-    py{39,310,311,312,313}-dj42-{sqlite3,postgres,mysql,mariadb},
-    py{310,311,312,313}-dj{50,51,main}-{sqlite3,postgres,mysql,mariadb},
+    py3{9-13}-dj42-{sqlite3,postgres,mysql,mariadb},
+    py3{10-13}-dj{50-52}-{sqlite3,postgres,mysql,mariadb},
+    py3{12-13}-dj{main}-{sqlite3,postgres,mysql,mariadb},
     docs,
     lint
 
@@ -18,6 +19,7 @@ DJANGO =
     4.2: dj42
     5.0: dj50
     5.1: dj51
+    5.2: dj52
     main: djmain
 
 [flake8]
@@ -32,6 +34,7 @@ deps =
     dj42: Django>=4.2,<4.3
     dj50: Django>=5.0,<5.1
     dj51: Django>=5.1,<5.2
+    dj52: Django>=5.2a1,<5.3  # Use a1 to allow testing of the release candidates
     djmain: https://github.com/django/django/tarball/main
     postgres: -rrequirements/postgres.txt
     mysql: -rrequirements/mysql.txt