From bd903e8a6ec7a5b321f24096223e43e4aea5b653 Mon Sep 17 00:00:00 2001 From: Sergey Fedoseev Date: Mon, 11 Sep 2017 22:57:24 +0500 Subject: [PATCH] Fixed #28570 -- Dropped support for GEOS 3.3.x. Removed setting SRID in GEOSGeometry.clone() which was only required in GEOS 3.3.0. --- django/contrib/gis/geos/geometry.py | 2 +- docs/ref/contrib/gis/install/geolibs.txt | 3 +-- docs/releases/2.0.txt | 2 ++ 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/django/contrib/gis/geos/geometry.py b/django/contrib/gis/geos/geometry.py index 325b66f6b8..e486190cc2 100644 --- a/django/contrib/gis/geos/geometry.py +++ b/django/contrib/gis/geos/geometry.py @@ -613,7 +613,7 @@ class GEOSGeometryBase(GEOSBase): def clone(self): "Clone this Geometry." - return GEOSGeometry(capi.geom_clone(self.ptr), srid=self.srid) + return GEOSGeometry(capi.geom_clone(self.ptr)) class LinearGeometryMixin: diff --git a/docs/ref/contrib/gis/install/geolibs.txt b/docs/ref/contrib/gis/install/geolibs.txt index 7e4e40ff13..d1a49e356a 100644 --- a/docs/ref/contrib/gis/install/geolibs.txt +++ b/docs/ref/contrib/gis/install/geolibs.txt @@ -8,7 +8,7 @@ geospatial libraries: ======================== ==================================== ================================ =================================== Program Description Required Supported Versions ======================== ==================================== ================================ =================================== -:doc:`GEOS <../geos>` Geometry Engine Open Source Yes 3.5, 3.4, 3.3 +:doc:`GEOS <../geos>` Geometry Engine Open Source Yes 3.5, 3.4 `PROJ.4`_ Cartographic Projections library Yes (PostgreSQL and SQLite only) 4.9, 4.8, 4.7, 4.6, 4.5, 4.4 :doc:`GDAL <../gdal>` Geospatial Data Abstraction Library Yes 2.2, 2.1, 2.0, 1.11, 1.10, 1.9 :doc:`GeoIP <../geoip2>` IP-based geolocation library No 2 @@ -26,7 +26,6 @@ totally fine with GeoDjango. Your mileage may vary. .. Libs release dates: - GEOS 3.3.0 2011-05-30 GEOS 3.4.0 2013-08-11 GEOS 3.5.0 2015-08-15 GDAL 1.9.0 2012-01-03 diff --git a/docs/releases/2.0.txt b/docs/releases/2.0.txt index a0d5999547..d1fb42c5de 100644 --- a/docs/releases/2.0.txt +++ b/docs/releases/2.0.txt @@ -628,6 +628,8 @@ Miscellaneous * ``django.contrib.gis.gdal.OGRException`` is removed. It's been an alias for ``GDALException`` since Django 1.8. +* Support for GEOS 3.3.x is dropped. + .. _deprecated-features-2.0: Features deprecated in 2.0