diff --git a/django/contrib/gis/gdal/libgdal.py b/django/contrib/gis/gdal/libgdal.py index 5e617ee447..ac0b9bbd44 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 = ['gdal111', 'gdal110', 'gdal19', 'gdal18', 'gdal17'] + lib_names = ['gdal21', 'gdal20', 'gdal111', 'gdal110', 'gdal19'] elif os.name == 'posix': # *NIX library names. - lib_names = ['gdal', 'GDAL', 'gdal1.11.0', 'gdal1.10.0', 'gdal1.9.0', 'gdal1.8.0', 'gdal1.7.0'] + lib_names = ['gdal', 'GDAL', 'gdal2.1.0', 'gdal2.0.0', 'gdal1.11.0', 'gdal1.10.0', 'gdal1.9.0'] else: raise GDALException('Unsupported OS "%s"' % os.name) diff --git a/docs/releases/1.11.2.txt b/docs/releases/1.11.2.txt index 084edc5e86..12c03558cc 100644 --- a/docs/releases/1.11.2.txt +++ b/docs/releases/1.11.2.txt @@ -9,4 +9,5 @@ Django 1.11.2 fixes several bugs in 1.11.1. Bugfixes ======== -* ... +* Added detection for GDAL 2.1 and 2.0, and removed detection for unsupported + versions 1.7 and 1.8 (:ticket:`28181`).