Skip to content

[pull] main from django:main #196

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 2 commits into from
Nov 25, 2025
Merged

[pull] main from django:main #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d08ae99
Corrected assertions for True/False results in tests/auth_tests/test_…
RealOrangeOne Nov 24, 2025
fab1f25
Fixed #36738 -- Confirmed support for GDAL 3.12.
varunkasyap Nov 18, 2025
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: 2 additions & 0 deletions django/contrib/gis/gdal/libgdal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
elif os.name == "nt":
# Windows NT shared libraries
lib_names = [
"gdal312",
"gdal311",
"gdal310",
"gdal309",
Expand All @@ -39,6 +40,7 @@
lib_names = [
"gdal",
"GDAL",
"gdal3.12.0",
"gdal3.11.0",
"gdal3.10.0",
"gdal3.9.0",
Expand Down
11 changes: 6 additions & 5 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 @@ -10,16 +10,16 @@ Geospatial libraries
GeoDjango uses and/or provides interfaces for the following open source
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
`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:`GDAL <gdal-overview>` Geospatial Data Abstraction Library Yes 3.12, 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
`PostGIS`__ Spatial extensions for PostgreSQL Yes (PostgreSQL only) 3.6, 3.5, 3.4, 3.3, 3.2
`SpatiaLite`__ Spatial extensions for SQLite Yes (SQLite only) 5.1, 5.0, 4.3
============================== ==================================== ================================ =======================================================
============================== ==================================== ================================ =============================================================

Note that older or more recent versions of these libraries *may* also work
totally fine with GeoDjango. Your mileage may vary.
Expand All @@ -43,6 +43,7 @@ totally fine with GeoDjango. Your mileage may vary.
GDAL 3.9.0 2024-05-10
GDAL 3.10.0 2024-11-06
GDAL 3.11.0 2025-05-09
GDAL 3.12.0 2025-11-07
PostGIS 3.2.0 2021-12-18
PostGIS 3.3.0 2022-08-27
PostGIS 3.4.0 2023-08-15
Expand Down Expand Up @@ -263,7 +264,7 @@ Finally, configure, make and install GDAL:

.. code-block:: shell

$ cmake ..
$ cmake -DCMAKE_BUILD_TYPE=Release ..
$ cmake --build .
$ sudo cmake --build . --target install

Expand Down
14 changes: 7 additions & 7 deletions tests/auth_tests/test_handlers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ def test_check_password(self):
self.assertIsNone(check_password({}, "unknown", ""))

# Valid user with correct password
self.assertTrue(check_password({}, "test", "test"))
self.assertIs(check_password({}, "test", "test"), True)

# Valid user with incorrect password
self.assertIs(check_password({}, "test", "incorrect"), False)

# correct password, but user is inactive
User.objects.filter(username="test").update(is_active=False)
self.assertFalse(check_password({}, "test", "test"))

# Valid user with incorrect password
self.assertFalse(check_password({}, "test", "incorrect"))
self.assertIsNone(check_password({}, "test", "test"))

@override_settings(AUTH_USER_MODEL="auth_tests.CustomUser")
def test_check_password_custom_user(self):
Expand All @@ -53,10 +53,10 @@ def test_check_password_custom_user(self):
self.assertIsNone(check_password({}, "unknown", ""))

# Valid user with correct password'
self.assertTrue(check_password({}, "test@example.com", "test"))
self.assertIs(check_password({}, "test@example.com", "test"), True)

# Valid user with incorrect password
self.assertFalse(check_password({}, "test@example.com", "incorrect"))
self.assertIs(check_password({}, "test@example.com", "incorrect"), False)

def test_groups_for_user(self):
"""
Expand Down