Merge branch 'develop'

Author: protoroto

.github/workflows/test.yml

@@ -8,24 +8,29 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.11.x, 3.10.x, 3.9]
-        django: [42, 32]
+        python-version: [3.13.x, 3.12.x, 3.11.x, 3.10.x, 3.9]
+        django: [52, 42]
         sekizai: [sekizai,nosekizai]
+        exclude:
+        - django: 52
+          python-version: 3.9
+        - django: 42
+          python-version: 3.13.x
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
     - name: Cache pip
-      uses: actions/cache@v1
+      uses: actions/cache@v4
       with:
         path: ~/.cache/pip
         key: ${{ runner.os }}-pip-${{ matrix.toxenv }}
         restore-keys: |
           ${{ runner.os }}-pip-${{ matrix.toxenv }}
     - name: Cache tox
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: .tox
         key: ${{ runner.os }}-tox-${{ format('py-django{1}-{2}', matrix.python-version, matrix.django, matrix.sekizai) }}-${{ hashFiles('setup.cfg') }}

.pre-commit-config.yaml

@@ -3,7 +3,7 @@
 exclude: "(.idea|node_modules|.tox)"
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v5.0.0
     hooks:
       - id: trailing-whitespace
         exclude: .bumpversion.cfg
@@ -18,32 +18,32 @@ repos:
         args:
           - --remove
   - repo: https://github.com/PyCQA/isort
-    rev: "5.13.2"
+    rev: "6.0.1"
     hooks:
       - id: isort
   - repo: https://github.com/psf/black
-    rev: 24.1.1
+    rev: 25.1.0
     hooks:
       - id: black
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: 'v0.1.14'
+    rev: 'v0.11.5'
     hooks:
       - id: ruff
   - repo: https://github.com/econchick/interrogate
-    rev: 1.5.0
+    rev: 1.7.0
     hooks:
       - id: interrogate
         args:
           - "-cpyproject.toml"
           - "--quiet"
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.15.0
+    rev: v3.19.1
     hooks:
       - id: pyupgrade
         args:
           - --py3-plus
   - repo: https://github.com/adamchainz/django-upgrade
-    rev: "1.15.0"
+    rev: "1.24.0"
     hooks:
       - id: django-upgrade
         args: [--target-version, "3.2"]

README.rst

@@ -28,14 +28,14 @@ Supported versions
 Django
 ******
 
-3.2 to 4.2 (newer versions might work but are not tested yet)
+4.2 to 5.2 (newer versions might work but are not tested yet)
 
 
 ******
 Python
 ******
 
-Python 3.9 to 3.11
+Python 3.9 to 3.13
 
 *******************
 Supported Meta Tags

changes/213.bugfix

@@ -0,0 +1 @@
+Fix docs build

changes/216.feature

@@ -0,0 +1 @@
+Add support for Django 5.2 and python 3.12 and 3.13, remove support for Django 3.2

changes/222.bugfix

@@ -0,0 +1 @@
+Bump Github actions/cache tag version

docs/conf.py

@@ -15,10 +15,6 @@
 import os
 import sys
 
-# The theme to use for HTML and HTML Help pages.  See the documentation for
-# a list of builtin themes.
-import sphinx_rtd_theme
-
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
@@ -118,8 +114,6 @@
 
 html_theme = "sphinx_rtd_theme"
 
-html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
-
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.

meta/__init__.py

@@ -1 +1 @@
-__version__ = "2.4.2"
+__version__ = "2.4.3.dev1"

pyproject.toml

@@ -54,7 +54,7 @@ commit = true
 message = "Release {new_version}"
 commit_args = "--no-verify"
 tag = false
-current_version = "2.4.2"
+current_version = "2.4.3.dev1"
 parse = """(?x)
     (?P<major>[0-9]+)
     \\.(?P<minor>[0-9]+)

setup.cfg

@@ -16,24 +16,24 @@ license_file = LICENSE
 classifiers =
 	Development Status :: 5 - Production/Stable
 	Framework :: Django
-	Framework :: Django :: 3.2
-	Framework :: Django :: 4.0
-	Framework :: Django :: 4.1
 	Framework :: Django :: 4.2
+    Framework :: Django :: 5.2
 	Environment :: Web Environment
 	Intended Audience :: Developers
 	License :: OSI Approved :: BSD License
 	Programming Language :: Python :: 3
 	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
 
 [options]
 include_package_data = True
 setup_requires =
 	setuptools
 packages = meta
-python_requires = >=3.7
+python_requires = >=3.9
 test_suite = cms_helper.run
 zip_safe = False
 
@@ -43,7 +43,7 @@ meta = *.html *.png *.gif *js *jpg *jpeg *svg *py *mo *po
 
 [options.extras_require]
 docs =
-	django<5.0
+	django<6.0
 	sphinx-rtd-theme
 
 [sdist]