[pull] main from django:main

.github/workflows/postgis.yml

@@ -14,13 +14,17 @@ permissions:
    contents: read
 
 jobs:
-  postgis-latest:
+  postgis:
     if: contains(github.event.pull_request.labels.*.name, 'geodjango')
     runs-on: ubuntu-latest
-    name: Latest PostGIS
+    strategy:
+      fail-fast: false
+      matrix:
+        postgis-version: [latest, "17-3.5-alpine", "17-master"]
+    name: PostGIS ${{ matrix.postgis-version }}
     services:
       postgres:
-        image: postgis/postgis:latest
+        image: postgis/postgis:${{ matrix.postgis-version }}
         env:
           POSTGRES_DB: geodjango
           POSTGRES_USER: user
@@ -41,8 +45,10 @@ jobs:
           python-version: '3.13'
           cache: 'pip'
           cache-dependency-path: 'tests/requirements/py3.txt'
+      - name: Update apt repo
+        run: sudo apt update
       - name: Install libmemcached-dev for pylibmc
-        run: sudo apt install libmemcached-dev
+        run: sudo apt install -y libmemcached-dev
       - name: Install geospatial dependencies
         run: sudo apt install -y binutils libproj-dev gdal-bin
       - name: Print PostGIS versions

django/contrib/gis/utils/__init__.py

@@ -2,24 +2,16 @@
 This module contains useful utilities for GeoDjango.
 """
 
+from django.contrib.gis.utils.layermapping import LayerMapError, LayerMapping
 from django.contrib.gis.utils.ogrinfo import ogrinfo
 from django.contrib.gis.utils.ogrinspect import mapping, ogrinspect
 from django.contrib.gis.utils.srs import add_srs_entry
-from django.core.exceptions import ImproperlyConfigured
 
 __all__ = [
     "add_srs_entry",
     "mapping",
     "ogrinfo",
     "ogrinspect",
+    "LayerMapError",
+    "LayerMapping",
 ]
-
-try:
-    # LayerMapping requires DJANGO_SETTINGS_MODULE to be set,
-    # and ImproperlyConfigured is raised if that's not the case.
-    from django.contrib.gis.utils.layermapping import LayerMapError, LayerMapping
-
-    __all__ += ["LayerMapError", "LayerMapping"]
-
-except ImproperlyConfigured:
-    pass

docs/releases/4.2.24.txt

@@ -0,0 +1,7 @@
+===========================
+Django 4.2.24 release notes
+===========================
+
+*September 3, 2025*
+
+Django 4.2.24 fixes a security issue with severity "high" in 4.2.23.

docs/releases/5.1.12.txt

@@ -0,0 +1,7 @@
+===========================
+Django 5.1.12 release notes
+===========================
+
+*September 3, 2025*
+
+Django 5.1.12 fixes a security issue with severity "high" in 5.1.11.

docs/releases/5.2.6.txt

@@ -2,9 +2,10 @@
 Django 5.2.6 release notes
 ==========================
 
-*Expected September 3, 2025*
+*September 3, 2025*
 
-Django 5.2.6 fixes several bugs in 5.2.5.
+Django 5.2.6 fixes a security issue with severity "high" and several bugs in
+5.2.5.
 
 Bugfixes
 ========

docs/releases/index.txt

@@ -45,6 +45,7 @@ versions of the documentation contain the release notes for any later releases.
 .. toctree::
    :maxdepth: 1
 
+   5.1.12
    5.1.11
    5.1.10
    5.1.9
@@ -85,6 +86,7 @@ versions of the documentation contain the release notes for any later releases.
 .. toctree::
    :maxdepth: 1
 
+   4.2.24
    4.2.23
    4.2.22
    4.2.21