From f51a792c414166c8745657856cb50ed8a134e2b0 Mon Sep 17 00:00:00 2001 From: David Smith <39445562+smithdc1@users.noreply.github.com> Date: Fri, 16 Jul 2021 08:36:53 +0100 Subject: [PATCH] Fixed #32928 -- Confirmed support for GDAL 3.3. --- django/contrib/gis/gdal/libgdal.py | 4 ++-- docs/ref/contrib/gis/install/geolibs.txt | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/django/contrib/gis/gdal/libgdal.py b/django/contrib/gis/gdal/libgdal.py index 25807918565..05b5732a166 100644 --- a/django/contrib/gis/gdal/libgdal.py +++ b/django/contrib/gis/gdal/libgdal.py @@ -21,14 +21,14 @@ if lib_path: elif os.name == 'nt': # Windows NT shared libraries lib_names = [ - 'gdal302', 'gdal301', 'gdal300', + 'gdal303', 'gdal302', 'gdal301', 'gdal300', 'gdal204', 'gdal203', 'gdal202', 'gdal201', 'gdal20', ] elif os.name == 'posix': # *NIX library names. lib_names = [ 'gdal', 'GDAL', - 'gdal3.2.0', 'gdal3.1.0', 'gdal3.0.0', + 'gdal3.3.0', 'gdal3.2.0', 'gdal3.1.0', 'gdal3.0.0', 'gdal2.4.0', 'gdal2.3.0', 'gdal2.2.0', 'gdal2.1.0', 'gdal2.0.0', ] else: diff --git a/docs/ref/contrib/gis/install/geolibs.txt b/docs/ref/contrib/gis/install/geolibs.txt index 8199187de3f..469e55ef51c 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.9, 3.8, 3.7, 3.6 `PROJ`_ Cartographic Projections library Yes (PostgreSQL and SQLite only) 8.x, 7.x, 6.x, 5.x, 4.x -:doc:`GDAL <../gdal>` Geospatial Data Abstraction Library Yes 3.2, 3.1, 3.0, 2.4, 2.3, 2.2, 2.1 +:doc:`GDAL <../gdal>` Geospatial Data Abstraction Library Yes 3.3, 3.2, 3.1, 3.0, 2.4, 2.3, 2.2, 2.1 :doc:`GeoIP <../geoip2>` IP-based geolocation library No 2 `PostGIS`__ Spatial extensions for PostgreSQL Yes (PostgreSQL only) 3.0, 2.5, 2.4 `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. @@ -32,6 +32,7 @@ totally fine with GeoDjango. Your mileage may vary. GDAL 3.0.0 2019-05 GDAL 3.1.0 2020-05-07 GDAL 3.2.0 2020-11-02 + GDAL 3.3.0 2021-05-03 PostGIS 2.4.0 2017-09-30 PostGIS 2.5.0 2018-09-23 PostGIS 3.0.0 2019-10-20