Merge pull request #5592 from benjaoming/gis-fix

Always raise an error when importing from django.contrib.gis
learningequality · Mar 7, 2019 · 703b862 · 703b862
2 parents d5a3462 + 56bee65
commit 703b862
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/docs/installguide/release_notes.rst b/docs/installguide/release_notes.rst
@@ -8,6 +8,13 @@ to read the release notes.
   upgrading from ``0.16.x`` to ``0.17.x`` is fine - but upgrading from
   ``0.15.x`` to ``0.17.x`` is not guaranteed to work.
 
+0.17.6.dev
+----------
+
+Bug fixes
+^^^^^^^^^
+
+* Fix rare ``GEOSException`` on systems with libgeos :url-issue:`5592`
 
 0.17.5
 ------

diff --git a/kalite/packages/bundled/django/contrib/gis/__init__.py b/kalite/packages/bundled/django/contrib/gis/__init__.py
@@ -4,3 +4,9 @@
     memoryview = memoryview
 else:
     memoryview = buffer
+
+
+# Disable all this stuff because we do not want unnecessary imports of system
+# libraries that may break needlessly
+# Ref: https://github.com/iiab/iiab/issues/1382
+raise ImportError("Harmless: We do not support gis")