Kaydet (Commit) a404f75f authored tarafından Tim Graham's avatar Tim Graham Kaydeden (comit) GitHub

Fixed #28181 -- Added detection for GDAL 2.1 and 2.0.

Follow up to:
ffdf507e (adding GDAL 2.0 support)
ebaa2fef (confirming GDAL 2.1 support)
8c777888 (removing GDAL 1.8, 1.7 support)
üst 5df0ff41
......@@ -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)
......
......@@ -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`).
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment