pin pygeoif to 0.7, fix flake8 (geopython#61)

* Revert "pygeoif 1.0.0" This reverts commit 5ebe1e5. * pin to pygeoif 0.7 * fix flake8
live-eo · Oct 17, 2022 · 1f187c0 · 1f187c0
1 parent e90c913
commit 1f187c0
Show file tree

Hide file tree

Showing 11 changed files with 54 additions and 45 deletions.
diff --git a/pygeofilter/backends/django/filters.py b/pygeofilter/backends/django/filters.py
@@ -145,8 +145,8 @@ def between(lhs: F, low: Union[F, Value], high: Union[F, Value],
 
 def like(lhs: F, pattern: str, nocase: bool = False, not_: bool = False,
          mapping_choices: Optional[Dict[str, Dict[str, str]]] = None) -> Q:
-    """ Create a filter to filter elements according to a string attribute using
-        wildcard expressions.
+    """ Create a filter to filter elements according to a string attribute
+        using wildcard expressions.
 
         :param lhs: the field to compare
         :type lhs: :class:`django.db.models.F`

diff --git a/pygeofilter/backends/evaluator.py b/pygeofilter/backends/evaluator.py
@@ -126,7 +126,7 @@ def adopt(self, node, *sub_args):
         )
 
     def adopt_result(self, result: Any) -> Any:
-        """Interface function for adopting the final evaluation result if necessary.
-        Default is no-op.
+        """Interface function for adopting the final evaluation result
+        if necessary.  Default is no-op.
         """
         return result
diff --git a/pygeofilter/backends/sql/evaluate.py b/pygeofilter/backends/sql/evaluate.py
@@ -121,7 +121,7 @@ def spatial_operation(self, node, lhs, rhs):
     @handle(ast.BBox)
     def bbox(self, node, lhs):
         func = SPATIAL_COMPARISON_OP_MAP[ast.SpatialComparisonOp.INTERSECTS]
-        rhs = f"ST_GeomFromText('POLYGON(({node.minx} {node.miny}, {node.minx} {node.maxy}, {node.maxx} {node.maxy}, {node.maxx} {node.miny}, {node.minx} {node.miny}))')"
+        rhs = f"ST_GeomFromText('POLYGON(({node.minx} {node.miny}, {node.minx} {node.maxy}, {node.maxx} {node.maxy}, {node.maxx} {node.miny}, {node.minx} {node.miny}))')"  # noqa
         return f"{func}({lhs},{rhs})"
 
     @handle(ast.Attribute)

diff --git a/pygeofilter/backends/sqlalchemy/filters.py b/pygeofilter/backends/sqlalchemy/filters.py
@@ -5,7 +5,7 @@
 from typing import Callable, Dict
 
 from sqlalchemy import and_, func, not_, or_
-from pygeoif import shape
+from pygeoif.geometry import as_shape
 
 
 def parse_bbox(box, srid: int = None):
@@ -19,7 +19,7 @@ def parse_bbox(box, srid: int = None):
 
 
 def parse_geometry(geom):
-    wkt = shape(geom).wkt
+    wkt = as_shape(geom).to_wkt()
     search = re.search(r"SRID=(\d+);", wkt)
     sridtxt = "" if search else "SRID=4326;"
     return func.ST_GeomFromEWKT(f"{sridtxt}{wkt}")
@@ -142,8 +142,8 @@ def between(lhs, low, high, negate=False):
 
 
 def like(lhs, rhs, case=False, negate=False):
-    """ Create a filter to filter elements according to a string attribute using
-        wildcard expressions.
+    """ Create a filter to filter elements according to a string attribute
+        using wildcard expressions.
 
         :param lhs: the field to compare
         :param rhs: the wildcard pattern: a string containing any number of '%'

diff --git a/pygeofilter/values.py b/pygeofilter/values.py
@@ -30,7 +30,7 @@
 from datetime import date, time, datetime, timedelta
 from typing import Any, List, Union, Optional
 
-from pygeoif import shape
+from pygeoif.geometry import as_shape
 
 
 @dataclass
@@ -43,7 +43,7 @@ def __geo_interface__(self):
 
     def __eq__(self, o: object) -> bool:
         return (
-            shape(self).__geo_interface__ == shape(o).__geo_interface__
+            as_shape(self).__geo_interface__ == as_shape(o).__geo_interface__
         )
 
 
@@ -73,7 +73,7 @@ def __geo_interface__(self):
 
     def __eq__(self, o: object) -> bool:
         return (
-            shape(self).__geo_interface__ == shape(o).__geo_interface__
+            as_shape(self).__geo_interface__ == as_shape(o).__geo_interface__
         )
 
 

diff --git a/requirements-test.txt b/requirements-test.txt
@@ -7,7 +7,7 @@ pyproj
 rtree
 pygml
 dateparser
-pygeoif
+pygeoif==0.7
 lark
 elasticsearch
 elasticsearch-dsl
diff --git a/setup.py b/setup.py
@@ -36,7 +36,8 @@
 
 # get version number
 # from https://github.com/mapbox/rasterio/blob/master/setup.py#L55
-with open(os.path.join(os.path.dirname(__file__), 'pygeofilter/__init__.py')) as f:
+init_py = os.path.join(os.path.dirname(__file__), 'pygeofilter/__init__.py')
+with open(init_py) as f:
     for line in f:
         if line.find("__version__") >= 0:
             version = line.split("=")[1].strip()
@@ -48,10 +49,12 @@
 with open('README.md') as f:
     readme = f.read()
 
+description='pygeofilter is a pure Python parser implementation of OGC filtering standards'  # noqa
+
 setup(
     name='pygeofilter',
     version=version,
-    description='pygeofilter is a pure Python parser implementation of OGC filtering standards',
+    description=description,
     long_description=readme,
     long_description_content_type="text/markdown",
     author='Fabian Schindler',
@@ -63,7 +66,7 @@
     install_requires=[
         "dateparser",
         "lark<1.0",
-        "pygeoif>=1.0.0",
+        "pygeoif==0.7",
         "dataclasses;python_version<'3.7'",
     ] if not on_rtd else [],
     extras_require={

diff --git a/tests/parsers/cql2_json/test_parser.py b/tests/parsers/cql2_json/test_parser.py
@@ -408,8 +408,8 @@ def test_within_multipolygon_attr():
     assert result == ast.GeometryWithin(
         values.Geometry(
             normalize_geom(
-                geometry.MultiPolygon.from_polygons(
-                    geometry.Polygon([(1, 1), (2, 2), (0, 3), (1, 1)])
+                geometry.MultiPolygon(
+                    [geometry.Polygon([(1, 1), (2, 2), (0, 3), (1, 1)])]
                 ).__geo_interface__
             ),
         ),
@@ -435,9 +435,11 @@ def test_touches_attr_multilinestring():
         ast.Attribute("geometry"),
         values.Geometry(
             normalize_geom(
-                geometry.MultiLineString.from_linestrings(
-                    geometry.LineString([(1, 1), (2, 2)]),
-                    geometry.LineString([(0, 3), (1, 1)]),
+                geometry.MultiLineString(
+                    [
+                        geometry.LineString([(1, 1), (2, 2)]),
+                        geometry.LineString([(0, 3), (1, 1)]),
+                    ]
                 ).__geo_interface__
             ),
         ),
@@ -462,9 +464,11 @@ def test_crosses_attr_multilinestring():
         ast.Attribute("geometry"),
         values.Geometry(
             normalize_geom(
-                geometry.MultiLineString.from_linestrings(
-                    geometry.LineString([(1, 1), (2, 2)]),
-                    geometry.LineString([(0, 3), (1, 1)]),
+                geometry.MultiLineString(
+                    [
+                        geometry.LineString([(1, 1), (2, 2)]),
+                        geometry.LineString([(0, 3), (1, 1)]),
+                    ]
                 ).__geo_interface__
             )
         ),
@@ -489,9 +493,11 @@ def test_overlaps_attr_multilinestring():
         ast.Attribute("geometry"),
         values.Geometry(
             normalize_geom(
-                geometry.MultiLineString.from_linestrings(
-                    geometry.LineString([(1, 1), (2, 2)]),
-                    geometry.LineString([(0, 3), (1, 1)]),
+                geometry.MultiLineString(
+                    [
+                        geometry.LineString([(1, 1), (2, 2)]),
+                        geometry.LineString([(0, 3), (1, 1)]),
+                    ]
                 ).__geo_interface__
             ),
         ),

diff --git a/tests/parsers/cql_json/test_parser.py b/tests/parsers/cql_json/test_parser.py
@@ -509,9 +509,9 @@ def test_within_multipolygon_attr():
     assert result == ast.GeometryWithin(
         values.Geometry(
             normalize_geom(
-                geometry.MultiPolygon.from_polygons(
+                geometry.MultiPolygon([
                     geometry.Polygon([(1, 1), (2, 2), (0, 3), (1, 1)])
-                ).__geo_interface__
+                ]).__geo_interface__
             ),
         ),
         ast.Attribute('geometry'),
@@ -533,10 +533,10 @@ def test_touches_attr_multilinestring():
         ast.Attribute('geometry'),
         values.Geometry(
             normalize_geom(
-                geometry.MultiLineString.from_linestrings(
+                geometry.MultiLineString([
                     geometry.LineString([(1, 1), (2, 2)]),
                     geometry.LineString([(0, 3), (1, 1)]),
-                ).__geo_interface__
+                ]).__geo_interface__
             ),
         ),
     )
@@ -557,10 +557,10 @@ def test_crosses_attr_multilinestring():
         ast.Attribute('geometry'),
         values.Geometry(
             normalize_geom(
-                geometry.MultiLineString.from_linestrings(
+                geometry.MultiLineString([
                     geometry.LineString([(1, 1), (2, 2)]),
                     geometry.LineString([(0, 3), (1, 1)]),
-                ).__geo_interface__
+                ]).__geo_interface__
             )
         ),
     )
@@ -581,10 +581,10 @@ def test_overlaps_attr_multilinestring():
         ast.Attribute('geometry'),
         values.Geometry(
             normalize_geom(
-                geometry.MultiLineString.from_linestrings(
+                geometry.MultiLineString([
                     geometry.LineString([(1, 1), (2, 2)]),
                     geometry.LineString([(0, 3), (1, 1)]),
-                ).__geo_interface__
+                ]).__geo_interface__
             ),
         ),
     )

diff --git a/tests/parsers/ecql/test_parser.py b/tests/parsers/ecql/test_parser.py
@@ -328,9 +328,9 @@ def test_within_multipolygon_attr():
     result = parse('WITHIN(MULTIPOLYGON(((1 1,2 2,0 3,1 1))), geometry)')
     assert result == ast.GeometryWithin(
         values.Geometry(
-            geometry.MultiPolygon.from_polygons(
+            geometry.MultiPolygon([
                 geometry.Polygon([(1, 1), (2, 2), (0, 3), (1, 1)])
-            ).__geo_interface__,
+            ]).__geo_interface__,
         ),
         ast.Attribute('geometry'),
     )
@@ -341,10 +341,10 @@ def test_touches_attr_multilinestring():
     assert result == ast.GeometryTouches(
         ast.Attribute('geometry'),
         values.Geometry(
-            geometry.MultiLineString.from_linestrings(
+            geometry.MultiLineString([
                 geometry.LineString([(1, 1), (2, 2)]),
                 geometry.LineString([(0, 3), (1, 1)]),
-            ).__geo_interface__,
+            ]).__geo_interface__,
         ),
     )
 
@@ -354,10 +354,10 @@ def test_crosses_attr_multilinestring():
     assert result == ast.GeometryCrosses(
         ast.Attribute('geometry'),
         values.Geometry(
-            geometry.MultiLineString.from_linestrings(
+            geometry.MultiLineString([
                 geometry.LineString([(1, 1), (2, 2)]),
                 geometry.LineString([(0, 3), (1, 1)]),
-            ).__geo_interface__,
+            ]).__geo_interface__,
         ),
     )
 
@@ -367,10 +367,10 @@ def test_overlaps_attr_multilinestring():
     assert result == ast.GeometryOverlaps(
         ast.Attribute('geometry'),
         values.Geometry(
-            geometry.MultiLineString.from_linestrings(
+            geometry.MultiLineString([
                 geometry.LineString([(1, 1), (2, 2)]),
                 geometry.LineString([(0, 3), (1, 1)]),
-            ).__geo_interface__,
+            ]).__geo_interface__,
         ),
     )
 

diff --git a/tests/parsers/jfe/test_parser.py b/tests/parsers/jfe/test_parser.py
@@ -227,9 +227,9 @@ def test_within_multipolygon_attr():
     assert result == ast.GeometryWithin(
         values.Geometry(
             normalize_geom(
-                geometry.MultiPolygon.from_polygons(
+                geometry.MultiPolygon([
                     geometry.Polygon([(1, 1), (2, 2), (0, 3), (1, 1)])
-                ).__geo_interface__
+                ]).__geo_interface__
             ),
         ),
         ast.Attribute('geometry'),