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

[1.11.x] Fixed #28181 -- Added detection for GDAL 2.1 and 2.0. 

Follow up to:
ffdf507ec0 (adding GDAL 2.0 support)
ebaa2fef27 (confirming GDAL 2.1 support)
8c7778884b (removing GDAL 1.8, 1.7 support)

Backport of a404f75f92 from master
This commit is contained in:
Tim Graham 2017-05-08 10:59:16 -04:00
parent 4bdc832a75
commit 7fdbd25336
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,10 +23,10 @@ if lib_path:
lib_names = None
elif os.name == 'nt':
# Windows NT shared libraries
lib_names = [str('gdal111'), str('gdal110'), str('gdal19'), str('gdal18'), str('gdal17')]
lib_names = [str('gdal21'), str('gdal20'), str('gdal111'), str('gdal110'), str('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)

3
docs/releases/1.11.2.txt
View File

@ -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`).