diff options
| author | Tim Graham <timograham@gmail.com> | 2019-02-07 19:10:34 -0500 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2019-02-08 14:08:05 -0500 |
| commit | e7fd69d051eaa67cb17f172a39b57253e9cb831a (patch) | |
| tree | 7960b600c1fec82ce32532778f23bb2fb8924cde /tests | |
| parent | 6eb4996672ca5ccaba20e468d91a83d1cd019801 (diff) | |
Fixed #30166 -- Dropped support for GDAL 1.11.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/gis_tests/gdal_tests/test_ds.py | 4 | ||||
| -rw-r--r-- | tests/gis_tests/inspectapp/tests.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/gis_tests/gdal_tests/test_ds.py b/tests/gis_tests/gdal_tests/test_ds.py index 10ad8436b3..d462bec971 100644 --- a/tests/gis_tests/gdal_tests/test_ds.py +++ b/tests/gis_tests/gdal_tests/test_ds.py @@ -3,7 +3,7 @@ import re from datetime import datetime from django.contrib.gis.gdal import ( - GDAL_VERSION, DataSource, Envelope, GDALException, OGRGeometry, + DataSource, Envelope, GDALException, OGRGeometry, ) from django.contrib.gis.gdal.field import ( OFTDateTime, OFTInteger, OFTReal, OFTString, @@ -38,7 +38,7 @@ ds_list = ( ), TestDS( 'test_vrt', ext='vrt', nfeat=3, nfld=3, geom='POINT', gtype='Point25D', - driver='OGR_VRT' if GDAL_VERSION >= (2, 0) else 'VRT', + driver='OGR_VRT', fields={ 'POINT_X': OFTString, 'POINT_Y': OFTString, diff --git a/tests/gis_tests/inspectapp/tests.py b/tests/gis_tests/inspectapp/tests.py index 431818ebfd..35fedf8eb6 100644 --- a/tests/gis_tests/inspectapp/tests.py +++ b/tests/gis_tests/inspectapp/tests.py @@ -74,7 +74,7 @@ class OGRInspectTest(SimpleTestCase): '', 'class MyModel(models.Model):', ' float = models.FloatField()', - ' int = models.{}()'.format('BigIntegerField' if GDAL_VERSION >= (2, 0) else 'FloatField'), + ' int = models.BigIntegerField()', ' str = models.CharField(max_length=80)', ' geom = models.PolygonField(%s)' % self.expected_srid, ] @@ -102,7 +102,7 @@ class OGRInspectTest(SimpleTestCase): '', 'class City(models.Model):', ' name = models.CharField(max_length=80)', - ' population = models.{}()'.format('BigIntegerField' if GDAL_VERSION >= (2, 0) else 'FloatField'), + ' population = models.BigIntegerField()', ' density = models.FloatField()', ' created = models.DateField()', ' geom = models.PointField(%s)' % self.expected_srid, |