diff options
| author | Tim Graham <timograham@gmail.com> | 2018-06-12 13:34:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-12 13:34:58 -0400 |
| commit | 9e4f26bb40abcade301ec836aa0b84acf5f60041 (patch) | |
| tree | f5c2a1315e8da1df9ff0de8cde0714d9314f9283 | |
| parent | 8dcd43ce06b06cd67dab134099135d976ae9884a (diff) | |
Fixed #29483 -- Confirmed support for GDAL 2.3.
| -rw-r--r-- | django/contrib/gis/gdal/libgdal.py | 4 | ||||
| -rw-r--r-- | docs/ref/contrib/gis/install/geolibs.txt | 3 | ||||
| -rw-r--r-- | tests/gis_tests/inspectapp/tests.py | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/django/contrib/gis/gdal/libgdal.py b/django/contrib/gis/gdal/libgdal.py index fa39362c30..295c5ea099 100644 --- a/django/contrib/gis/gdal/libgdal.py +++ b/django/contrib/gis/gdal/libgdal.py @@ -21,10 +21,10 @@ if lib_path: lib_names = None elif os.name == 'nt': # Windows NT shared libraries - lib_names = ['gdal202', 'gdal201', 'gdal20', 'gdal111'] + lib_names = ['gdal203', 'gdal202', 'gdal201', 'gdal20', 'gdal111'] elif os.name == 'posix': # *NIX library names. - lib_names = ['gdal', 'GDAL', 'gdal2.2.0', 'gdal2.1.0', 'gdal2.0.0', 'gdal1.11.0'] + lib_names = ['gdal', 'GDAL', 'gdal2.3.0', 'gdal2.2.0', 'gdal2.1.0', 'gdal2.0.0', 'gdal1.11.0'] else: raise ImproperlyConfigured('GDAL is unsupported on OS "%s".' % os.name) diff --git a/docs/ref/contrib/gis/install/geolibs.txt b/docs/ref/contrib/gis/install/geolibs.txt index f483052e47..708b5a8a0b 100644 --- a/docs/ref/contrib/gis/install/geolibs.txt +++ b/docs/ref/contrib/gis/install/geolibs.txt @@ -10,7 +10,7 @@ Program Description Required ======================== ==================================== ================================ =================================== :doc:`GEOS <../geos>` Geometry Engine Open Source Yes 3.6, 3.5, 3.4 `PROJ.4`_ Cartographic Projections library Yes (PostgreSQL and SQLite only) 4.9, 4.8, 4.7, 4.6, 4.5, 4.4 -:doc:`GDAL <../gdal>` Geospatial Data Abstraction Library Yes 2.2, 2.1, 2.0, 1.11 +:doc:`GDAL <../gdal>` Geospatial Data Abstraction Library Yes 2.3, 2.2, 2.1, 2.0, 1.11 :doc:`GeoIP <../geoip2>` IP-based geolocation library No 2 `PostGIS`__ Spatial extensions for PostgreSQL Yes (PostgreSQL only) 2.4, 2.3, 2.2, 2.1 `SpatiaLite`__ Spatial extensions for SQLite Yes (SQLite only) 4.3, 4.2, 4.1 @@ -28,6 +28,7 @@ totally fine with GeoDjango. Your mileage may vary. GDAL 2.0.0 2015-06 GDAL 2.1.0 2016-04 GDAL 2.2.0 2017-05 + GDAL 2.3.0 2018-05 PostGIS 2.1.0 2013-08-17 PostGIS 2.2.0 2015-10-17 PostGIS 2.3.0 2016-09-26 diff --git a/tests/gis_tests/inspectapp/tests.py b/tests/gis_tests/inspectapp/tests.py index ca49fc0d2d..f499bbdbe0 100644 --- a/tests/gis_tests/inspectapp/tests.py +++ b/tests/gis_tests/inspectapp/tests.py @@ -88,7 +88,8 @@ class OGRInspectTest(TestCase): # Same test with a 25D-type geometry field shp_file = os.path.join(TEST_DATA, 'gas_lines', 'gas_leitung.shp') model_def = ogrinspect(shp_file, 'MyModel', multi_geom=True) - self.assertIn('geom = models.MultiLineStringField(srid=-1)', model_def) + srid = '-1' if GDAL_VERSION < (2, 3) else '31253' + self.assertIn('geom = models.MultiLineStringField(srid=%s)' % srid, model_def) def test_date_field(self): shp_file = os.path.join(TEST_DATA, 'cities', 'cities.shp') |