Ticket #28257: 28257-docs.diff

File 28257-docs.diff, 2.3 KB (added by Tim Graham, 7 years ago)
  • django/contrib/gis/gdal/libgdal.py

    diff --git a/django/contrib/gis/gdal/libgdal.py b/django/contrib/gis/gdal/libgdal.py
    index 96acee9..1e27cb4 100644
    a b if lib_path:  
    2121    lib_names = None
    2222elif os.name == 'nt':
    2323    # Windows NT shared libraries
    24     lib_names = ['gdal201', 'gdal20', 'gdal111', 'gdal110', 'gdal19']
     24    lib_names = ['gdal202', 'gdal201', 'gdal20', 'gdal111', 'gdal110', 'gdal19']
    2525elif os.name == 'posix':
    2626    # *NIX library names.
    27     lib_names = ['gdal', 'GDAL', 'gdal2.1.0', 'gdal2.0.0', 'gdal1.11.0', 'gdal1.10.0', 'gdal1.9.0']
     27    lib_names = ['gdal', 'GDAL', 'gdal2.2.0', 'gdal2.1.0', 'gdal2.0.0', 'gdal1.11.0', 'gdal1.10.0', 'gdal1.9.0']
    2828else:
    2929    raise ImproperlyConfigured('GDAL is unsupported on OS "%s".' % os.name)
    3030
  • docs/ref/contrib/gis/install/geolibs.txt

    diff --git a/docs/ref/contrib/gis/install/geolibs.txt b/docs/ref/contrib/gis/install/geolibs.txt
    index 8d62815..7e4e40f 100644
    a b Program Description Required  
    1010========================  ====================================  ================================  ===================================
    1111:doc:`GEOS <../geos>`     Geometry Engine Open Source           Yes                               3.5, 3.4, 3.3
    1212`PROJ.4`_                 Cartographic Projections library      Yes (PostgreSQL and SQLite only)  4.9, 4.8, 4.7, 4.6, 4.5, 4.4
    13 :doc:`GDAL <../gdal>`     Geospatial Data Abstraction Library   Yes                               2.1, 2.0, 1.11, 1.10, 1.9
     13:doc:`GDAL <../gdal>`     Geospatial Data Abstraction Library   Yes                               2.2, 2.1, 2.0, 1.11, 1.10, 1.9
    1414:doc:`GeoIP <../geoip2>`  IP-based geolocation library          No                                2
    1515`PostGIS`__               Spatial extensions for PostgreSQL     Yes (PostgreSQL only)             2.3, 2.2, 2.1
    1616`SpatiaLite`__            Spatial extensions for SQLite         Yes (SQLite only)                 4.3, 4.2, 4.1, 4.0
    totally fine with GeoDjango. Your mileage may vary.  
    3434    GDAL 1.11.0 2014-04-25
    3535    GDAL 2.0.0 2015-06
    3636    GDAL 2.1.0 2016-04
     37    GDAL 2.2.0 2017-05
    3738    PostGIS 2.1.0 2013-08-17
    3839    PostGIS 2.2.0 2015-10-17
    3940    PostGIS 2.3.0 2016-09-26
Back to Top