innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed #33577 -- Confirmed support for GDAL 3.4.

This commit is contained in:
Mariusz Felisiak 2022-03-16 09:07:01 +01:00 committed by GitHub
parent 3b3f38b3b0
commit 970f5bf503
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/contrib/gis/gdal/libgdal.py
View File

@ -22,6 +22,7 @@ if lib_path:
elif os.name == "nt": elif os.name == "nt":
# Windows NT shared libraries # Windows NT shared libraries
lib_names = [ lib_names = [
"gdal304",
"gdal303", "gdal303",
"gdal302", "gdal302",
"gdal301", "gdal301",
@ -35,6 +36,7 @@ elif os.name == "posix":
lib_names = [ lib_names = [
"gdal", "gdal",
"GDAL", "GDAL",
"gdal3.4.0",
"gdal3.3.0", "gdal3.3.0",
"gdal3.2.0", "gdal3.2.0",
"gdal3.1.0", "gdal3.1.0",

9
docs/ref/contrib/gis/install/geolibs.txt
View File

@ -5,16 +5,16 @@ Installing Geospatial libraries
GeoDjango uses and/or provides interfaces for the following open source GeoDjango uses and/or provides interfaces for the following open source
geospatial libraries: geospatial libraries:
======================== ==================================== ================================ ================================= ======================== ==================================== ================================ ======================================
Program Description Required Supported Versions Program Description Required Supported Versions
======================== ==================================== ================================ ================================= ======================== ==================================== ================================ ======================================
:doc:`GEOS <../geos>` Geometry Engine Open Source Yes 3.10, 3.9, 3.8, 3.7, 3.6 :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) 8.x, 7.x, 6.x, 5.x, 4.x `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.3, 3.2, 3.1, 3.0, 2.4, 2.3, 2.2 :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:`GeoIP <../geoip2>` IP-based geolocation library No 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, 2.4 `PostGIS`__ Spatial extensions for PostgreSQL Yes (PostgreSQL only) 3.2, 3.1, 3.0, 2.5, 2.4
`SpatiaLite`__ Spatial extensions for SQLite Yes (SQLite only) 5.0, 4.3 `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 Note that older or more recent versions of these libraries *may* also work
totally fine with GeoDjango. Your mileage may vary. totally fine with GeoDjango. Your mileage may vary.
@ -33,6 +33,7 @@ totally fine with GeoDjango. Your mileage may vary.
GDAL 3.1.0 2020-05-07 GDAL 3.1.0 2020-05-07
GDAL 3.2.0 2020-11-02 GDAL 3.2.0 2020-11-02
GDAL 3.3.0 2021-05-03 GDAL 3.3.0 2021-05-03
GDAL 3.4.0 2021-11-04
PostGIS 2.4.0 2017-09-30 PostGIS 2.4.0 2017-09-30
PostGIS 2.5.0 2018-09-23 PostGIS 2.5.0 2018-09-23
PostGIS 3.0.0 2019-10-20 PostGIS 3.0.0 2019-10-20

5
tests/gis_tests/gdal_tests/test_raster.py
View File

@ -807,8 +807,13 @@ class GDALBandTests(SimpleTestCase):
band = rs.bands[0] band = rs.bands[0]
# Setting attributes in write mode raises exception in the _flush method # Setting attributes in write mode raises exception in the _flush method
try:
with self.assertRaises(GDALException): with self.assertRaises(GDALException):
setattr(band, "nodata_value", 10) setattr(band, "nodata_value", 10)
finally:
pam_file = self.rs_path + ".aux.xml"
if os.path.isfile(pam_file):
os.remove(pam_file)
def test_band_data_setters(self): def test_band_data_setters(self):
# Create in-memory raster and get band # Create in-memory raster and get band

6
tests/gis_tests/inspectapp/tests.py
View File

@ -143,8 +143,8 @@ class OGRInspectTest(SimpleTestCase):
# The ordering of model fields might vary depending on several factors # The ordering of model fields might vary depending on several factors
# (version of GDAL, etc.). # (version of GDAL, etc.).
if connection.vendor == "sqlite": if connection.vendor == "sqlite" and GDAL_VERSION < (3, 4):
# SpatiaLite introspection is somewhat lacking (#29461). # SpatiaLite introspection is somewhat lacking on GDAL < 3.4 (#29461).
self.assertIn(" f_decimal = models.CharField(max_length=0)", model_def) self.assertIn(" f_decimal = models.CharField(max_length=0)", model_def)
else: else:
self.assertIn( self.assertIn(
@ -156,7 +156,7 @@ class OGRInspectTest(SimpleTestCase):
# Probably a bug between GDAL and MariaDB on time fields. # Probably a bug between GDAL and MariaDB on time fields.
self.assertIn(" f_datetime = models.DateTimeField()", model_def) self.assertIn(" f_datetime = models.DateTimeField()", model_def)
self.assertIn(" f_time = models.TimeField()", model_def) self.assertIn(" f_time = models.TimeField()", model_def)
if connection.vendor == "sqlite": if connection.vendor == "sqlite" and GDAL_VERSION < (3, 4):
self.assertIn(" f_float = models.CharField(max_length=0)", model_def) self.assertIn(" f_float = models.CharField(max_length=0)", model_def)
else: else:
self.assertIn(" f_float = models.FloatField()", model_def) self.assertIn(" f_float = models.FloatField()", model_def)