Merge branch 'main' into fix-django-unicode-error

Author: jmgutu

.github/workflows/test.yml

@@ -14,7 +14,7 @@ jobs:
       fail-fast: false
       max-parallel: 5
       matrix:
-        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
+        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
 
     services:
       mariadb:
@@ -73,29 +73,37 @@ jobs:
       fail-fast: false
       max-parallel: 5
       matrix:
-        # Skip 3.13 here, it needs the psycopg3 / postgis3 database
-        python-version: ['3.9', '3.10', '3.11', '3.12']
-        database: [postgresql, postgis]
-        # Add psycopg3 to our matrix for modern python versions
-        include:
-            - python-version: '3.10'
-              database: psycopg3
-            - python-version: '3.11'
-              database: psycopg3
-            - python-version: '3.12'
+        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
+        database: [postgresql, postgis, psycopg3]
+        exclude:
+            - python-version: '3.9'
               database: psycopg3
             - python-version: '3.13'
-              database: psycopg3
+              database: postgis
+            - python-version: '3.13'
+              database: postgresql
+            - python-version: '3.14'
+              database: postgis
+            - python-version: '3.14'
+              database: postgresql
+        # Add postgis3 to our matrix for modern Python versions
+        include:
             - python-version: '3.13'
               database: postgis3
             - python-version: '3.13'
               database: psycopg3
               env:
                 DJANGO_SELENIUM_TESTS=true
+            - python-version: '3.14'
+              database: postgis3
+            - python-version: '3.14'
+              database: psycopg3
+              env:
+                DJANGO_SELENIUM_TESTS=true
 
     services:
       postgres:
-        image: postgis/postgis:14-3.1
+        image: postgis/postgis:17-3.5
         env:
           POSTGRES_DB: debug_toolbar
           POSTGRES_USER: debug_toolbar
@@ -155,7 +163,7 @@ jobs:
       fail-fast: false
       max-parallel: 5
       matrix:
-        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
+        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
 
     steps:
     - uses: actions/checkout@v5

.pre-commit-config.yaml

@@ -14,7 +14,7 @@ repos:
     hooks:
     -   id: doc8
 -   repo: https://github.com/adamchainz/django-upgrade
-    rev: 1.28.0
+    rev: 1.29.0
     hooks:
     -   id: django-upgrade
         args: [--target-version, "4.2"]
@@ -29,18 +29,18 @@ repos:
     -   id: rst-backticks
     -   id: rst-directive-colons
 -   repo: https://github.com/biomejs/pre-commit
-    rev: v2.2.4
+    rev: v2.2.5
     hooks:
       - id: biome-check
         verbose: true
 -   repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: 'v0.13.1'
+    rev: 'v0.14.0'
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]
       - id: ruff-format
 -   repo: https://github.com/tox-dev/pyproject-fmt
-    rev: v2.6.0
+    rev: v2.10.0
     hooks:
       - id: pyproject-fmt
 -   repo: https://github.com/abravalheri/validate-pyproject

docs/changes.rst

@@ -15,6 +15,9 @@ Pending
 * Added ``CommunityPanel`` containing links to documentation and resources.
 * Fixed force_str to catch error and give out default string if value is not
   serializable.
+* Upgraded CI ``postgis`` version to 17-3.5.
+* Added how to generate the documentation locally to the contributing
+  documentation.
 
 6.0.0 (2025-07-22)
 ------------------

docs/contributing.rst

@@ -12,6 +12,8 @@ You can report bugs and request features in the `bug tracker
 
 Please search the existing database for duplicates before filing an issue.
 
+.. _code:
+
 Code
 ----
 
@@ -207,3 +209,69 @@ The release itself requires the following steps:
 #. **After the publishing completed** edit the automatically created GitHub
    release to include the release notes (you may use GitHub's "Generate release
    notes" button for this).
+
+
+Building the documentation locally
+----------------------------------
+
+The project's documentation is built using `Sphinx <https://www.sphinx-doc.org>`_.
+You can generate it locally to preview your changes before submitting a pull
+request.
+
+
+Prerequisites
+--------------
+
+Before building the documentation, ensure that all dependencies are installed
+as described in :ref:`the setup instructions <code>`.
+
+Additionally, to build the documentation with proper spell checking,
+you need to install:
+
+- **Enchant Library** - This is required by the sphinxcontrib-spelling
+        extension via the pyenchant package. For detailed installation
+        instructions, see the
+        `pyenchant installation documentation <https://pyenchant.github.io/pyenchant/install.html#installing-the-enchant-c-library>`_.
+
+
+
+
+Using Tox (Cross-Platform)
+------------------------------------
+
+To build the documentation using Tox, run from the project root:
+
+.. code-block:: bash
+
+    tox -e docs -- html
+
+This will generate the HTML files in ``docs/_build/html/``.
+
+You can then open the documentation in your browser:
+
+- **Linux:** ``xdg-open docs/_build/html/index.html``
+- **macOS:** ``open docs/_build/html/index.html``
+- **Windows:** ``start docs\_build\html\index.html``
+
+*Tox automatically installs the necessary dependencies, so you don’t need
+to activate a virtual environment manually.*
+
+
+Troubleshooting
+----------------
+
+
+If you encounter an error about a missing dependency such as
+``sphinx-build: command not found``, ensure that your virtual environment is
+activated and all dependencies are installed:
+
+.. code-block:: bash
+
+    pip install -r requirements_dev.txt
+
+Alternatively, you can build the documentation using Tox, which automatically
+handles dependencies and environment setup:
+
+.. code-block:: bash
+
+    tox -e docs -- html

docs/spelling_wordlist.txt

@@ -48,6 +48,7 @@ pre
 profiler
 psycopg
 py
+pyenchant
 pyflame
 pylibmc
 pytest
@@ -58,6 +59,7 @@ reinitializing
 resizing
 runserver
 spellchecking
+sphinxcontrib
 spooler
 stacktrace
 stacktraces

pyproject.toml

@@ -31,6 +31,7 @@ classifiers = [
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
   "Programming Language :: Python :: 3.13",
+  "Programming Language :: Python :: 3.14",
   "Topic :: Software Development :: Libraries :: Python Modules",
 ]
 dynamic = [

tox.ini

@@ -6,6 +6,7 @@ envlist =
     py{39,310,311,312}-dj{42}-{sqlite,postgresql,postgis,mysql}
     py{310,311,312}-dj{42,50,51,52}-{sqlite,postgresql,psycopg3,postgis,mysql}
     py{313}-dj{51,52,main}-{sqlite,psycopg3,postgis3,mysql}
+    py{314}-dj{52,main}-{sqlite,psycopg3,postgis3,mysql}
 
 [testenv]
 deps =
@@ -52,28 +53,28 @@ pip_pre = True
 commands = python -b -W always -m coverage run -m django test -v2 {posargs:tests}
 
 
-[testenv:py{39,310,311,312,313}-dj{42,50,51,52,main}-{postgresql,psycopg3}]
+[testenv:py{39,310,311,312,313,314}-dj{42,50,51,52,main}-{postgresql,psycopg3}]
 setenv =
     {[testenv]setenv}
     DB_BACKEND = postgresql
     DB_PORT = {env:DB_PORT:5432}
 
 
-[testenv:py{39,310,311,312,313}-dj{42,50,51,52,main}-{postgis,postgis3}]
+[testenv:py{39,310,311,312,313,314}-dj{42,50,51,52,main}-{postgis,postgis3}]
 setenv =
     {[testenv]setenv}
     DB_BACKEND = postgis
     DB_PORT = {env:DB_PORT:5432}
 
 
-[testenv:py{39,310,311,312,313}-dj{42,50,51,52,main}-mysql]
+[testenv:py{39,310,311,312,313,314}-dj{42,50,51,52,main}-mysql]
 setenv =
     {[testenv]setenv}
     DB_BACKEND = mysql
     DB_PORT = {env:DB_PORT:3306}
 
 
-[testenv:py{39,310,311,312,313}-dj{42,50,51,52,main}-sqlite]
+[testenv:py{39,310,311,312,313,314}-dj{42,50,51,52,main}-sqlite]
 setenv =
     {[testenv]setenv}
     DB_BACKEND = sqlite3
@@ -103,6 +104,7 @@ python =
     3.11: py311
     3.12: py312
     3.13: py313
+    3.14: py314
 
 [gh-actions:env]
 DB_BACKEND =