Merge branch 'master' into feat/ukrainian-translation

ddabble · ddabble · commit be72f2d29105 · 2025-12-09T15:30:50.000+01:00
# Conflicts:
#	CHANGES.rst
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Set up Python
         uses: actions/setup-python@v6
         with:
@@ -33,7 +33,7 @@ jobs:
       - name: Build a binary wheel and a source tarball
         run: python3 -m build
       - name: Store the distribution packages
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: python-package-distributions
           path: dist/
@@ -51,7 +51,7 @@ jobs:
       id-token: write  # IMPORTANT: mandatory for trusted publishing
     steps:
       - name: Download all the dists
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v6
         with:
           name: python-package-distributions
           path: dist/
@@ -72,12 +72,12 @@ jobs:
 
     steps:
       - name: Download all the dists
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v6
         with:
           name: python-package-distributions
           path: dist/
       - name: Sign the dists with Sigstore
-        uses: sigstore/gh-action-sigstore-python@v3.0.1
+        uses: sigstore/gh-action-sigstore-python@v3.2.0
         with:
           inputs: >-
             ./dist/*.tar.gz
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -11,23 +11,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
+        python-version: ['3.10', '3.11', '3.12', '3.13', '3.14']
         django-version: ['4.2', '5.0', '5.1', '5.2', '6.0', 'main']
 
         exclude:
-          # Exclude py3.9 for Django >= 5.0,
-          # and py3.10 and py3.11 for Django > 5.2
+          # Exclude py3.10 and py3.11 for Django > 5.2
           # and py3.14 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: '6.0'
-          - python-version: '3.9'
-            django-version: 'main'
           - python-version: '3.10'
             django-version: '6.0'
           - python-version: '3.10'
@@ -75,7 +64,7 @@ jobs:
         options: --health-cmd="mariadb-admin ping" --health-interval=10s --health-timeout=5s --health-retries=3
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v6
@@ -111,7 +100,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Install gettext
         run: |
@@ -133,7 +122,7 @@ jobs:
           # Install this project in editable mode, so that its package metadata can be queried
           pip install --editable .
           # Install the latest minor version of Django we support
-          pip install --pre "Django>=6.0a1"
+          pip install "Django>=6.0,<6.1"
 
       - name: Check translation files are updated
         run: python -m simple_history.tests.generated_file_checks.check_translations
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -10,7 +10,7 @@ repos:
     rev: 25.1.0
     hooks:
       - id: black
-        language_version: python3.9
+        language_version: python3.10
 
   - repo: https://github.com/codespell-project/codespell
     rev: v2.4.1
@@ -66,4 +66,9 @@ repos:
     rev: v3.20.0
     hooks:
       - id: pyupgrade
-        args: [--py39-plus]
+        args: [--py310-plus]
+
+  - repo: https://github.com/adamchainz/django-upgrade
+    rev: 1.29.1
+    hooks:
+      - id: django-upgrade
diff --git a/AUTHORS.rst b/AUTHORS.rst
@@ -137,6 +137,7 @@ Authors
 - Tommy Beadle (`tbeadle <https://github.com/tbeadle>`_)
 - Trey Hunner (`treyhunner <https://github.com/treyhunner>`_)
 - Ulysses Vilela
+- Ülgen Sarıkavak (`ulgens <https://github.com/ulgens/>`_)
 - `vnagendra <https://github.com/vnagendra>`_
 - `yakimka <https://github.com/yakimka>`_
 - `Paulo Peres <https://github.com/PauloPeres>`_
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -4,8 +4,9 @@ Changes
 Unreleased
 ----------
 
-- Added support for Python 3.14
-- Added support for Django 6.0
+- Added support for Python 3.14 (gh-1529)
+- Added support for Django 6.0 (gh-1529)
+- Dropped support for Python 3.9 (gh-1560)
 - Added Ukrainian localization (gh-1547)
 
 3.10.1 (2025-06-20)
diff --git a/README.rst b/README.rst
@@ -41,7 +41,7 @@ This app supports the following combinations of Django and Python:
 ==========  ========================
   Django      Python
 ==========  ========================
-4.2         3.9, 3.10, 3.11, 3.12, 3.13
+4.2         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
 5.2         3.10, 3.11, 3.12, 3.13, 3.14
diff --git a/docs/index.rst b/docs/index.rst
@@ -37,7 +37,7 @@ This app supports the following combinations of Django and Python:
 ==========  =======================
   Django      Python
 ==========  =======================
-4.2         3.9, 3.10, 3.11, 3.12, 3.13
+4.2         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
 5.2         3.10, 3.11, 3.12, 3.13, 3.14
diff --git a/pyproject.toml b/pyproject.toml
@@ -15,7 +15,7 @@ maintainers = [
 authors = [
   { name = "Corey Bertram", email = "corey@qr7.com" },
 ]
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 classifiers = [
   "Development Status :: 5 - Production/Stable",
   "Environment :: Web Environment",
@@ -24,15 +24,16 @@ classifiers = [
   "Framework :: Django :: 5.0",
   "Framework :: Django :: 5.1",
   "Framework :: Django :: 5.2",
+  "Framework :: Django :: 6.0",
   "Intended Audience :: Developers",
   "License :: OSI Approved :: BSD License",
   "Programming Language :: Python",
   "Programming Language :: Python :: 3 :: Only",
-  "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",
+  "Programming Language :: Python :: 3.14",
 ]
 dynamic = [
   "readme",
@@ -79,12 +80,12 @@ fragments = [
 [tool.black]
 line-length = 88
 target-version = [
-  "py39",
+  "py310",
 ]
 
 [tool.isort]
 profile = "black"
-py_version = "39"
+py_version = "310"
 
 [tool.codespell]
 skip = "AUTHORS.rst,*.po"
diff --git a/requirements/lint.txt b/requirements/lint.txt
@@ -1,3 +1,3 @@
-black==25.9.0
+black==25.12.0
 flake8==7.3.0
 isort==7.0.0
diff --git a/requirements/postgres.txt b/requirements/postgres.txt
@@ -1 +1 @@
-psycopg[binary]==3.2.10
+psycopg[binary]==3.2.13
diff --git a/simple_history/template_utils.py b/simple_history/template_utils.py
@@ -1,6 +1,6 @@
 import dataclasses
 from os.path import commonprefix
-from typing import Any, Final, Union
+from typing import Any, Final
 
 from django.db.models import ManyToManyField, Model
 from django.utils.html import conditional_escape
@@ -134,7 +134,7 @@ def stringify_delta_change_values(
         if all the passed elements are safe strings.
         """
 
-        def stringify_value(value: Any) -> Union[str, SafeString]:
+        def stringify_value(value: Any) -> str | SafeString:
             # If `value` is a list, stringify each element using `str()` instead of
             # `repr()` (the latter is the default when calling `list.__str__()`)
             if isinstance(value, list):
diff --git a/simple_history/tests/admin.py b/simple_history/tests/admin.py
@@ -21,6 +21,7 @@
 )
 
 
+@admin.register(Person)
 class PersonAdmin(SimpleHistoryAdmin):
     def has_change_permission(self, request, obj=None):
         return False
@@ -29,17 +30,20 @@ def has_view_permission(self, request, obj=None):
         return False
 
 
+@admin.register(Choice)
 class ChoiceAdmin(SimpleHistoryAdmin):
     history_list_display = ["votes"]
 
 
+@admin.register(FileModel)
 class FileModelAdmin(SimpleHistoryAdmin):
     def test_method(self, obj):
         return "test_method_value"
 
     history_list_display = ["title", "test_method"]
 
 
+@admin.register(Planet)
 class PlanetAdmin(SimpleHistoryAdmin):
     def test_method(self, obj):
         return "test_method_value"
@@ -63,20 +67,16 @@ def place_display(place: Place) -> SafeString:
         return mark_safe(f"<b>{place.name}</b>")
 
 
+@admin.register(PollWithManyToMany)
 class PollWithManyToManyAdmin(SimpleHistoryAdmin):
     def get_historical_record_context_helper(self, request, historical_record):
         return HistoricalPollWithManyToManyContextHelper(self.model, historical_record)
 
 
 admin.site.register(Book, SimpleHistoryAdmin)
-admin.site.register(Choice, ChoiceAdmin)
 admin.site.register(ConcreteExternal, SimpleHistoryAdmin)
 admin.site.register(Document, SimpleHistoryAdmin)
 admin.site.register(Employee, SimpleHistoryAdmin)
 admin.site.register(ExternalModelWithCustomUserIdField, SimpleHistoryAdmin)
-admin.site.register(FileModel, FileModelAdmin)
 admin.site.register(Paper, SimpleHistoryAdmin)
-admin.site.register(Person, PersonAdmin)
-admin.site.register(Planet, PlanetAdmin)
 admin.site.register(Poll, SimpleHistoryAdmin)
-admin.site.register(PollWithManyToMany, PollWithManyToManyAdmin)
diff --git a/simple_history/tests/tests/test_utils.py b/simple_history/tests/tests/test_utils.py
@@ -495,7 +495,6 @@ def test_bulk_update_history_with_batch_size(self):
         self.assertEqual(Poll.objects.count(), 5)
         self.assertEqual(Poll.history.filter(history_type="~").count(), 5)
 
-    @skipUnless(django.VERSION >= (4, 0), "Requires Django 4.0 or above")
     def test_bulk_update_with_history_returns_rows_updated(self):
         rows_updated = bulk_update_with_history(
             self.data,
diff --git a/simple_history/tests/urls.py b/simple_history/tests/urls.py
@@ -1,5 +1,5 @@
 from django.contrib import admin
-from django.urls import path, re_path
+from django.urls import path
 
 from simple_history.tests.view import (
     BucketDataRegisterRequestUserCreate,
@@ -29,8 +29,8 @@
         BucketDataRegisterRequestUserCreate.as_view(),
         name="bucket_data-add",
     ),
-    re_path(
-        r"^bucket_data/(?P<pk>[0-9]+)/$",
+    path(
+        "bucket_data/<int:pk>/",
         BucketDataRegisterRequestUserDetail.as_view(),
         name="bucket_data-detail",
     ),
@@ -40,9 +40,9 @@
         PollWithHistoricalIPAddressCreate.as_view(),
         name="pollip-add",
     ),
-    re_path(r"^poll/(?P<pk>[0-9]+)/$", PollUpdate.as_view(), name="poll-update"),
-    re_path(r"^poll/(?P<pk>[0-9]+)/delete/$", PollDelete.as_view(), name="poll-delete"),
-    re_path(r"^polls/(?P<pk>[0-9]+)/$", PollDetail.as_view(), name="poll-detail"),
+    path("poll/<int:pk>/", PollUpdate.as_view(), name="poll-update"),
+    path("poll/<int:pk>/delete/", PollDelete.as_view(), name="poll-delete"),
+    path("polls/<int:pk>/", PollDetail.as_view(), name="poll-detail"),
     path("polls/", PollList.as_view(), name="poll-list"),
     path("polls-bulk-create/", PollBulkCreateView.as_view(), name="poll-bulk-create"),
     path(
diff --git a/tox.ini b/tox.ini
@@ -9,7 +9,6 @@ envlist =
 
 [gh-actions]
 python =
-    3.9: py39
     3.10: py310
     3.11: py311, docs, lint
     3.12: py312
@@ -38,7 +37,7 @@ deps =
     dj50: Django>=5.0,<5.1
     dj51: Django>=5.1,<5.2
     dj52: Django>=5.2,<5.3
-    dj60: Django>=6.0a1,<6.1  # Use a1 to allow testing of the release candidates
+    dj60: Django>=6.0,<6.1
     djmain: https://github.com/django/django/tarball/main
     postgres: -rrequirements/postgres.txt
     mysql: -rrequirements/mysql.txt

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-psycopg[binary]==3.2.10`
	`1`	`+psycopg[binary]==3.2.13`