p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Refs #28181 -- Corrected detection of GDAL 2.1 on Windows. 

Follow up to a404f75f92.
This commit is contained in:
Tim Graham 2017-05-30 09:39:59 -04:00 committed by GitHub
parent 9509268cea
commit c32476e5ba
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,7 +21,7 @@ if lib_path:
lib_names = None lib_names = None
elif os.name == 'nt': elif os.name == 'nt':
# Windows NT shared libraries # Windows NT shared libraries
lib_names = ['gdal21', 'gdal20', 'gdal111', 'gdal110', 'gdal19'] lib_names = ['gdal201', 'gdal20', 'gdal111', 'gdal110', 'gdal19']
elif os.name == 'posix': elif os.name == 'posix':
# *NIX library names. # *NIX library names.
lib_names = ['gdal', 'GDAL', 'gdal2.1.0', 'gdal2.0.0', 'gdal1.11.0', 'gdal1.10.0', 'gdal1.9.0'] lib_names = ['gdal', 'GDAL', 'gdal2.1.0', 'gdal2.0.0', 'gdal1.11.0', 'gdal1.10.0', 'gdal1.9.0']

2
docs/releases/1.11.2.txt
View File

@ -42,3 +42,5 @@ Bugfixes
* Prevented ``Subquery`` from adding an unnecessary ``CAST`` which resulted in * Prevented ``Subquery`` from adding an unnecessary ``CAST`` which resulted in
invalid SQL (:ticket:`28199`). invalid SQL (:ticket:`28199`).
* Corrected detection of GDAL 2.1 on Windows (:ticket:`28181`).