From 759ff4862a815d55c59bd8147bb180e08431e9c4 Mon Sep 17 00:00:00 2001 From: Mariusz Felisiak Date: Thu, 16 Jun 2022 09:44:19 +0200 Subject: [PATCH] Fixed #33786 -- Confirmed support for GDAL 3.5. --- django/contrib/gis/gdal/libgdal.py | 2 ++ docs/ref/contrib/gis/install/geolibs.txt | 9 +++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/django/contrib/gis/gdal/libgdal.py b/django/contrib/gis/gdal/libgdal.py index 96af333c3f..15639d1d83 100644 --- a/django/contrib/gis/gdal/libgdal.py +++ b/django/contrib/gis/gdal/libgdal.py @@ -22,6 +22,7 @@ if lib_path: elif os.name == "nt": # Windows NT shared libraries lib_names = [ + "gdal305", "gdal304", "gdal303", "gdal302", @@ -36,6 +37,7 @@ elif os.name == "posix": lib_names = [ "gdal", "GDAL", + "gdal3.5.0", "gdal3.4.0", "gdal3.3.0", "gdal3.2.0", diff --git a/docs/ref/contrib/gis/install/geolibs.txt b/docs/ref/contrib/gis/install/geolibs.txt index 8e9178f585..8becd0553f 100644 --- a/docs/ref/contrib/gis/install/geolibs.txt +++ b/docs/ref/contrib/gis/install/geolibs.txt @@ -5,16 +5,16 @@ Installing Geospatial libraries GeoDjango uses and/or provides interfaces for the following open source geospatial libraries: -======================== ==================================== ================================ ====================================== +======================== ==================================== ================================ =========================================== Program Description Required Supported Versions -======================== ==================================== ================================ ====================================== +======================== ==================================== ================================ =========================================== :doc:`GEOS <../geos>` Geometry Engine Open Source Yes 3.10, 3.9, 3.8, 3.7, 3.6 `PROJ`_ Cartographic Projections library Yes (PostgreSQL and SQLite only) 9.x, 8.x, 7.x, 6.x, 5.x, 4.x -:doc:`GDAL <../gdal>` Geospatial Data Abstraction Library Yes 3.4, 3.3, 3.2, 3.1, 3.0, 2.4, 2.3, 2.2 +:doc:`GDAL <../gdal>` Geospatial Data Abstraction Library Yes 3.5, 3.4, 3.3, 3.2, 3.1, 3.0, 2.4, 2.3, 2.2 :doc:`GeoIP <../geoip2>` IP-based geolocation library No 2 `PostGIS`__ Spatial extensions for PostgreSQL Yes (PostgreSQL only) 3.2, 3.1, 3.0, 2.5 `SpatiaLite`__ Spatial extensions for SQLite Yes (SQLite only) 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. @@ -34,6 +34,7 @@ totally fine with GeoDjango. Your mileage may vary. GDAL 3.2.0 2020-11-02 GDAL 3.3.0 2021-05-03 GDAL 3.4.0 2021-11-04 + GDAL 3.5.0 2022-05-13 PostGIS 2.5.0 2018-09-23 PostGIS 3.0.0 2019-10-20 PostGIS 3.1.0 2020-12-18