shapely 2.x compatibility

#158

Author: jdries

setup.py

@@ -57,7 +57,8 @@
         "openeo_processes==0.0.4",  # 0.0.4 is special build/release, also see https://github.com/Open-EO/openeo-python-driver/issues/152
         "gunicorn>=20.0.1",
         "numpy>=1.22.0",
-        "shapely<2.0.0",  # https://github.com/Open-EO/openeo-python-driver/issues/158
+        "shapely<2.0.0; python_version<='3.9'",
+        "shapely>=2.0.0; python_version>'3.9'",
         "pandas>=1.4.0",
         "geopandas>=0.11.0",  # 0.11.0 fixes https://github.com/geopandas/geopandas/pull/2243
         "xarray>=0.16.2",

tests/util/test_geometry.py

@@ -9,7 +9,7 @@
 from pyproj.exceptions import CRSError
 from shapely.geometry import Point, Polygon
 from shapely.geometry.base import BaseGeometry
-from shapely.geos import WKTWriter
+
 
 from openeo_driver.util.geometry import (
     BoundingBox,
@@ -249,8 +249,13 @@ def test_spatial_extent_union_mixed_crs():
 
 
 def to_wkt(geometry: BaseGeometry, rounding_precision=2):
-    wkt_writer = WKTWriter(shapely.geos.lgeos, rounding_precision=rounding_precision)
-    return wkt_writer.write(geometry)
+    try:
+        from shapely import to_wkt
+        to_wkt(geometry,rounding_precision=rounding_precision)
+    except ImportError:
+        from shapely.geos import WKTWriter
+        wkt_writer = WKTWriter(shapely.geos.lgeos, rounding_precision=rounding_precision)
+        return wkt_writer.write(geometry)
 
 
 class TestGeometryBufferer: