Update contrib.gis for Django 5.1 (#2587)

* Update contrib.gis for Django 5.1

From django/django@08306ba:

* In `django.contrib.gis.gdal.prototypes.raster`, these were removed:
  * `register_all`
  * `get_driver`
  * `get_driver_by_name`
  * `get_driver_count`
  * `get_driver_description`

* In `django.contrib.gis.gdal.prototypes.ds`, these were added:
  * `GDAL_OF_READONLY`
  * `GDAL_OF_UPDATE`
  * `GDAL_OF_ALL`
  * `GDAL_OF_RASTER`
  * `GDAL_OF_VECTOR`
  * `get_driver_description`
  * `get_dataset_driver`

* In `django.contrib.gis.gdal.prototypes.ds`, these were removed:
  * `get_driver_name`
  * `release_ds`

From django/django@3f6d939:

* In `django.contrib.gis.gdal.geometries`, these were added:
  - `LineString.m`
  - `Point.m`
* In `django.contrib.gis.gdal.prototypes.geom`, these were added:
  - `getm`
  - `is_measured`
  - `set_measured`
  - `to_iso_wkb`
  - `to_iso_wkt`

From django/django@cfacd69:

* In `django.contrib.gis.gdal.prototypes.geom`, these were added:
  - `is_3d`
  - `set_3d`

Co-authored-by: sobolevn <mail@sobolevn.me>

Author: adamchainz

django-stubs/contrib/gis/gdal/geometries.pyi

@@ -101,6 +101,8 @@ class Point(OGRGeometry):
     @property
     def z(self) -> float | None: ...
     @property
+    def m(self) -> float | None: ...
+    @property
     def coords(self) -> tuple[float, float] | tuple[float, float, float]: ...
     @property
     def tuple(self) -> tuple[float, float] | tuple[float, float, float]: ...
@@ -117,6 +119,8 @@ class LineString(OGRGeometry):
     def y(self) -> list[float]: ...
     @property
     def z(self) -> list[float] | None: ...
+    @property
+    def m(self) -> list[float] | None: ...
 
 class LinearRing(LineString): ...
 

django-stubs/contrib/gis/gdal/prototypes/ds.pyi

@@ -1,16 +1,21 @@
-from typing import Any
+from typing import Any, Final
 
 c_int_p: Any
+GDAL_OF_READONLY: Final = 0x00
+GDAL_OF_UPDATE: Final = 0x01
+GDAL_OF_ALL: Final = 0x00
+GDAL_OF_RASTER: Final = 0x02
+GDAL_OF_VECTOR: Final = 0x04
 register_all: Any
 cleanup_all: Any
 get_driver: Any
 get_driver_by_name: Any
 get_driver_count: Any
-get_driver_name: Any
+get_driver_description: Any
 open_ds: Any
 destroy_ds: Any
-release_ds: Any
 get_ds_name: Any
+get_dataset_driver: Any
 get_layer: Any
 get_layer_by_name: Any
 get_layer_count: Any

django-stubs/contrib/gis/gdal/prototypes/geom.pyi

@@ -10,6 +10,7 @@ to_kml: Any
 getx: Any
 gety: Any
 getz: Any
+getm: Any
 from_wkb: Any
 from_wkt: Any
 from_gml: Any
@@ -22,11 +23,17 @@ geom_diff: Any
 geom_intersection: Any
 geom_sym_diff: Any
 geom_union: Any
+is_3d: Any
+set_3d: Any
+is_measured: Any
+set_measured: Any
 add_geom: Any
 import_wkt: Any
 destroy_geom: Any
 to_wkb: Any
+to_iso_wkb: Any
 to_wkt: Any
+to_iso_wkt: Any
 to_gml: Any
 get_wkbsize: Any
 assign_srs: Any

django-stubs/contrib/gis/gdal/prototypes/raster.pyi

@@ -1,10 +1,5 @@
 from typing import Any
 
-register_all: Any
-get_driver: Any
-get_driver_by_name: Any
-get_driver_count: Any
-get_driver_description: Any
 create_ds: Any
 open_ds: Any
 close_ds: Any

scripts/stubtest/allowlist_todo_django52.txt

@@ -26,38 +26,15 @@ django.contrib.gis.gdal.OGRGeometry.has_curve
 django.contrib.gis.gdal.geometries.CircularString
 django.contrib.gis.gdal.geometries.CompoundCurve
 django.contrib.gis.gdal.geometries.CurvePolygon
-django.contrib.gis.gdal.geometries.LineString.m
 django.contrib.gis.gdal.geometries.MultiCurve
 django.contrib.gis.gdal.geometries.MultiSurface
 django.contrib.gis.gdal.geometries.OGRGeometry.geos_support
 django.contrib.gis.gdal.geometries.OGRGeometry.get_curve_geometry
 django.contrib.gis.gdal.geometries.OGRGeometry.get_linear_geometry
 django.contrib.gis.gdal.geometries.OGRGeometry.has_curve
-django.contrib.gis.gdal.geometries.Point.m
-django.contrib.gis.gdal.prototypes.ds.GDAL_OF_ALL
-django.contrib.gis.gdal.prototypes.ds.GDAL_OF_RASTER
-django.contrib.gis.gdal.prototypes.ds.GDAL_OF_READONLY
-django.contrib.gis.gdal.prototypes.ds.GDAL_OF_UPDATE
-django.contrib.gis.gdal.prototypes.ds.GDAL_OF_VECTOR
-django.contrib.gis.gdal.prototypes.ds.get_dataset_driver
-django.contrib.gis.gdal.prototypes.ds.get_driver_description
-django.contrib.gis.gdal.prototypes.ds.get_driver_name
-django.contrib.gis.gdal.prototypes.ds.release_ds
 django.contrib.gis.gdal.prototypes.geom.get_curve_geom
 django.contrib.gis.gdal.prototypes.geom.get_linear_geom
-django.contrib.gis.gdal.prototypes.geom.getm
 django.contrib.gis.gdal.prototypes.geom.has_curve_geom
-django.contrib.gis.gdal.prototypes.geom.is_3d
-django.contrib.gis.gdal.prototypes.geom.is_measured
-django.contrib.gis.gdal.prototypes.geom.set_3d
-django.contrib.gis.gdal.prototypes.geom.set_measured
-django.contrib.gis.gdal.prototypes.geom.to_iso_wkb
-django.contrib.gis.gdal.prototypes.geom.to_iso_wkt
-django.contrib.gis.gdal.prototypes.raster.get_driver
-django.contrib.gis.gdal.prototypes.raster.get_driver_by_name
-django.contrib.gis.gdal.prototypes.raster.get_driver_count
-django.contrib.gis.gdal.prototypes.raster.get_driver_description
-django.contrib.gis.gdal.prototypes.raster.register_all
 django.contrib.gis.geos.prototypes.io.DEFAULT_TRIM_VALUE
 django.contrib.gis.management
 django.contrib.gis.management.commands