Merge branch 'main' of github.com:hotosm/geojson-aoi-parser

Author: luke-everhart

.pre-commit-config.yaml

@@ -1,15 +1,15 @@
 repos:
   # Versioning: Commit messages & changelog
   - repo: https://github.com/commitizen-tools/commitizen
-    rev: v4.8.3
+    rev: v4.9.1
     hooks:
       - id: commitizen
         stages: [commit-msg]
 
   # Lint / autoformat: Python code
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: "v0.12.11"
+    rev: "v0.13.0"
     hooks:
       # Run the linter
       - id: ruff

geojson_aoi/_async/postgis.py

@@ -51,7 +51,7 @@ def __init__(
     async def __aenter__(self) -> "AsyncPostGis":
         """Initialise the database via context manager."""
         await self.create_connection()
-        
+
         async with self.connection.cursor() as cur:
             await cur.execute(self.normalize.init_table(self.table_id))
 
@@ -62,11 +62,11 @@ async def __aenter__(self) -> "AsyncPostGis":
                         INSERT INTO {} (geometry)
                         VALUES ({});
                     """).format(sql.Identifier(self.table_id), sql.SQL(st_functions))
-                
+
                 data = (Jsonb(geom),)
 
                 await cur.execute(_sql, data)
-            
+
             # NOTE: Potential future polygon merging feature.
             # if self.merge:
             #    cur.execute(self.normalize.merge_disjoints(self.geoms, self.table_id))

geojson_aoi/_sync/postgis.py

@@ -34,9 +34,7 @@ class PostGis:
     Can reuse an existing upstream connection.
     """
 
-    def __init__(
-        self, db: str | Connection, geoms: list[GeoJSON], merge: bool = False
-    ):
+    def __init__(self, db: str | Connection, geoms: list[GeoJSON], merge: bool = False):
         """Initialise variables and compose classes."""
         self.table_id = uuid4().hex
         self.geoms = geoms
@@ -51,7 +49,7 @@ def __init__(
     def __enter__(self) -> "PostGis":
         """Initialise the database via context manager."""
         self.create_connection()
-        
+
         with self.connection.cursor() as cur:
             cur.execute(self.normalize.init_table(self.table_id))
 
@@ -62,11 +60,11 @@ def __enter__(self) -> "PostGis":
                         INSERT INTO {} (geometry)
                         VALUES ({});
                     """).format(sql.Identifier(self.table_id), sql.SQL(st_functions))
-                
+
                 data = (Jsonb(geom),)
 
                 cur.execute(_sql, data)
-            
+
             # NOTE: Potential future polygon merging feature.
             # if self.merge:
             #    cur.execute(self.normalize.merge_disjoints(self.geoms, self.table_id))

tests/_async/test_parser.py

@@ -4,7 +4,6 @@
 import warnings
 
 import pytest
-import pytest_asyncio
 
 from geojson_aoi._async.parser import parse_aoi_async
 
@@ -448,7 +447,10 @@ async def test_warnings_raised_invalid_coords(db):
                 "properties": {},
             }
         ],
-        "crs": {"type": "name", "properties": {"name": "urn:ogc:async def:crs:EPSG::4326"}},
+        "crs": {
+            "type": "name",
+            "properties": {"name": "urn:ogc:async def:crs:EPSG::4326"},
+        },
     }
     with pytest.warns(UserWarning):
         await parse_aoi_async(db, geojson_data)