diff options
| author | Tim Graham <timograham@gmail.com> | 2017-05-08 10:59:16 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2017-05-08 11:00:49 -0400 |
| commit | 7fdbd253365f934d2910de3bfd756616c306bc14 (patch) | |
| tree | 038bc40e88d7a9c0bd1ddaaf12c4170bab08a5b2 | |
| parent | 4bdc832a7598c1811c5a50fb39c912c02ce87a39 (diff) | |
[1.11.x] Fixed #28181 -- Added detection for GDAL 2.1 and 2.0.
Follow up to:
ffdf507ec0821f0520e315c2e8a6cf231ea3fd5a (adding GDAL 2.0 support)
ebaa2fef27644430e2b9dfa912f02e39582bfc05 (confirming GDAL 2.1 support)
8c7778884bced3e756ce139da781b0c8c8b2395c (removing GDAL 1.8, 1.7 support)
Backport of a404f75f92971634c76330f3742261d33ccecca1 from master
| -rw-r--r-- | django/contrib/gis/gdal/libgdal.py | 4 | ||||
| -rw-r--r-- | docs/releases/1.11.2.txt | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/django/contrib/gis/gdal/libgdal.py b/django/contrib/gis/gdal/libgdal.py index a987b387b2..4ce0c42a06 100644 --- a/django/contrib/gis/gdal/libgdal.py +++ b/django/contrib/gis/gdal/libgdal.py @@ -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) 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`). |