Skip to content

[pull] main from django:main #193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
Nov 22, 2025
+7 −8
Merged

[pull] main from django:main #193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/ref/contrib/gis/geos.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -712,7 +712,7 @@ Other Properties & Methods
the input vertices. If the geometry is already valid, it is returned
untouched. This is similar to the
:class:`~django.contrib.gis.db.models.functions.MakeValid` database
function. Requires GEOS 3.8.
function.

.. method:: GEOSGeometry.normalize(clone=False)

Expand Down
3 changes: 1 addition & 2 deletions docs/ref/contrib/gis/install/geolibs.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ geospatial libraries:
============================== ==================================== ================================ =======================================================
Program Description Required Supported Versions
============================== ==================================== ================================ =======================================================
:ref:`GEOS <geos-overview>` Geometry Engine Open Source Yes 3.14, 3.13, 3.12, 3.11, 3.10, 3.9, 3.8
:ref:`GEOS <geos-overview>` Geometry Engine Open Source Yes 3.14, 3.13, 3.12, 3.11, 3.10, 3.9
`PROJ`_ Cartographic Projections library Yes (PostgreSQL and SQLite only) 9.x, 8.x, 7.x, 6.x
:ref:`GDAL <gdal-overview>` Geospatial Data Abstraction Library Yes 3.11, 3.10, 3.9, 3.8, 3.7, 3.6, 3.5, 3.4, 3.3, 3.2, 3.1
:ref:`GeoIP <geoip2-overview>` IP-based geolocation library No 2
Expand All @@ -26,7 +26,6 @@ totally fine with GeoDjango. Your mileage may vary.

..
Libs release dates:
GEOS 3.8.0 2019-10-10
GEOS 3.9.0 2020-12-14
GEOS 3.10.0 2021-10-20
GEOS 3.11.0 2022-07-01
Expand Down
2 changes: 2 additions & 0 deletions docs/releases/6.1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,8 @@ backends.

* Support for PostGIS 3.1 is removed.

* Support for GEOS 3.8 is removed.

:mod:`django.contrib.postgres`
------------------------------

Expand Down
8 changes: 3 additions & 5 deletions tests/gis_tests/geos_tests/test_geos.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1295,11 +1295,9 @@ def test_emptyCollections(self):

# Testing __getitem__ (doesn't work on Point or Polygon)
if isinstance(g, Point):
# IndexError is not raised in GEOS 3.8.0.
if geos_version_tuple() != (3, 8, 0):
msg = "Invalid GEOS Geometry index:"
with self.assertRaisesMessage(IndexError, msg):
g.x
msg = "Invalid GEOS Geometry index:"
with self.assertRaisesMessage(IndexError, msg):
g.x
elif isinstance(g, Polygon):
lr = g.shell
self.assertEqual("LINEARRING EMPTY", lr.wkt)
Expand Down