Make geomet an optional dependency at runtime

aboudreault · aboudreault · commit ffc9e372f9a9 · 2020-05-19T09:35:20.000-04:00
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,10 +2,18 @@
 ======
 Not released
 
+Features
+--------
+* Make geomet an optional dependency at runtime (PYTHON-1237)
+
 Bug Fixes
 ---------
 * Unable to connect to a cloud cluster using Ubuntu 20.04 (PYTHON-1238)
 
+Others
+------
+* Bump geomet dependency version to 0.2 (PYTHON-1243)
+
 3.23.0
 ======
 April 6, 2020
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -552,7 +552,7 @@ pipeline {
   }
 
   triggers {
-    parameterizedCron((branchPatternCron.matcher(env.BRANCH_NAME).matches() && !riptanoPatternCron.matcher(env.GIT_URL).find()) ? """
+    parameterizedCron((branchPatternCron.matcher(env.BRANCH_NAME).matches() && !riptanoPatternCron.matcher(GIT_URL).find()) ? """
       # Every weeknight (Monday - Friday) around 4:00 AM
       # These schedules will run with and without Cython enabled for Python v2.7.14 and v3.5.6
       H 4 * * 1-5 %CI_SCHEDULE=WEEKNIGHTS;EVENT_LOOP_MANAGER=LIBEV;CI_SCHEDULE_PYTHON_VERSION=2.7.14;CI_SCHEDULE_SERVER_VERSION=2.2 3.11 dse-5.1 dse-6.0 dse-6.7
@@ -600,7 +600,7 @@ pipeline {
     EVENT_LOOP_MANAGER = "${params.EVENT_LOOP_MANAGER.toLowerCase()}"
     EXECUTE_LONG_TESTS = "${params.EXECUTE_LONG_TESTS ? 'True' : 'False'}"
     CCM_ENVIRONMENT_SHELL = '/usr/local/bin/ccm_environment.sh'
-    CCM_MAX_HEAP_SIZE = '1024M'
+    CCM_MAX_HEAP_SIZE = '1536M'
   }
 
   stages {
diff --git a/cassandra/util.py b/cassandra/util.py
@@ -17,14 +17,22 @@
 import datetime
 from functools import total_ordering
 import logging
-from geomet import wkt
 from itertools import chain
 import random
 import re
 import six
 import uuid
 import sys
 
+_HAS_GEOMET = True
+try:
+    from geomet import wkt
+except:
+    _HAS_GEOMET = False
+
+
+from cassandra import DriverException
+
 DATETIME_EPOC = datetime.datetime(1970, 1, 1)
 UTC_DATETIME_EPOC = datetime.datetime.utcfromtimestamp(0)
 
@@ -35,6 +43,7 @@
 assert sys.byteorder in ('little', 'big')
 is_little_endian = sys.byteorder == 'little'
 
+
 def datetime_from_timestamp(timestamp):
     """
     Creates a timezone-agnostic datetime from timestamp (in seconds) in a consistent manner.
@@ -1308,6 +1317,9 @@ def from_wkt(s):
         """
         Parse a Point geometry from a wkt string and return a new Point object.
         """
+        if not _HAS_GEOMET:
+            raise DriverException("Geomet is required to deserialize a wkt geometry.")
+
         try:
             geom = wkt.loads(s)
         except ValueError:
@@ -1363,6 +1375,9 @@ def from_wkt(s):
         """
         Parse a LineString geometry from a wkt string and return a new LineString object.
         """
+        if not _HAS_GEOMET:
+            raise DriverException("Geomet is required to deserialize a wkt geometry.")
+
         try:
             geom = wkt.loads(s)
         except ValueError:
@@ -1444,6 +1459,9 @@ def from_wkt(s):
         """
         Parse a Polygon geometry from a wkt string and return a new Polygon object.
         """
+        if not _HAS_GEOMET:
+            raise DriverException("Geomet is required to deserialize a wkt geometry.")
+
         try:
             geom = wkt.loads(s)
         except ValueError:
diff --git a/tests/unit/advanced/test_geometry.py b/tests/unit/advanced/test_geometry.py
@@ -22,7 +22,7 @@
 from cassandra.cqltypes import lookup_casstype
 from cassandra.protocol import ProtocolVersion
 from cassandra.cqltypes import PointType, LineStringType, PolygonType, WKBGeometryType
-from cassandra.util import Point, LineString, Polygon, _LinearRing, Distance
+from cassandra.util import Point, LineString, Polygon, _LinearRing, Distance, _HAS_GEOMET
 
 wkb_be = 0
 wkb_le = 1
@@ -104,7 +104,7 @@ def test_eq(self):
             # specifically use assertFalse(eq) to make sure we're using the geo __eq__ operator
             self.assertFalse(geo == object())
 
-
+@unittest.skipUnless(_HAS_GEOMET, "Skip wkt geometry tests when geomet is not installed")
 class WKTTest(unittest.TestCase):
 
     def test_line_parse(self):
