threedi-modelchecker 2.6.2__tar.gz → 2.6.3.dev1__tar.gz

{threedi-modelchecker-2.6.2 → threedi-modelchecker-2.6.3.dev1}/CHANGES.rst

@@ -2,6 +2,12 @@ Changelog of threedi-modelchecker
 =================================
 
 
+2.6.3 (unreleased)
+------------------
+- Support geopackage
+- Support changes in threedi-schema (0.220) needed for geopackage support
+
+
 2.6.2 (2024-02-29)
 ------------------
 

{threedi-modelchecker-2.6.2/threedi_modelchecker.egg-info → threedi-modelchecker-2.6.3.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: threedi-modelchecker
-Version: 2.6.2
+Version: 2.6.3.dev1
 Summary: Checks validity of a 3Di schematisation
 Author-email: Nelen & Schuurmans <info@nelen-schuurmans.nl>
 License: MIT
@@ -15,7 +15,7 @@ License-File: LICENSE
 Requires-Dist: Click
 Requires-Dist: GeoAlchemy2!=0.11.*,>=0.9
 Requires-Dist: SQLAlchemy>=1.4
-Requires-Dist: threedi-schema==0.219.*
+Requires-Dist: threedi-schema==0.220.*
 Provides-Extra: rasterio
 Requires-Dist: rasterio>=1.3; extra == "rasterio"
 Provides-Extra: test

{threedi-modelchecker-2.6.2 → threedi-modelchecker-2.6.3.dev1}/pyproject.toml

@@ -19,7 +19,7 @@ dependencies = [
     "Click",
     "GeoAlchemy2>=0.9,!=0.11.*",
     "SQLAlchemy>=1.4",
-    "threedi-schema==0.219.*",
+    "threedi-schema==0.220.*"
 ]
 
 [project.optional-dependencies]

{threedi-modelchecker-2.6.2 → threedi-modelchecker-2.6.3.dev1}/threedi_modelchecker/__init__.py

@@ -1,5 +1,5 @@
 from .model_checks import *  # NOQA
 
 # fmt: off
-__version__ = '2.6.2'
+__version__ = '2.6.3.dev1'
 # fmt: on

{threedi-modelchecker-2.6.2 → threedi-modelchecker-2.6.3.dev1}/threedi_modelchecker/checks/base.py

@@ -221,7 +221,9 @@ class TypeCheck(BaseCheck):
         self.expected_types = _sqlalchemy_to_sqlite_types(self.column.type)
 
     def get_invalid(self, session):
-        if "sqlite" not in session.bind.dialect.dialect_description:
+        if ("sqlite" not in session.bind.dialect.dialect_description) and (
+            "geopackage" not in session.bind.dialect.dialect_description
+        ):
             return []
         q_invalid = self.to_check(session)
         invalid_type_query = q_invalid.filter(
@@ -311,7 +313,7 @@ class GeometryTypeCheck(BaseCheck):
 def _get_geometry_type(column, dialect):
     if column.type.geometry_type == "GEOMETRY":
         return  # should skip the check
-    if dialect == "sqlite":
+    if dialect in ["sqlite", "geopackage"]:
         return column.type.geometry_type
     elif dialect == "postgresql":
         geom_type = column.type.geometry_type.capitalize()

{threedi-modelchecker-2.6.2 → threedi-modelchecker-2.6.3.dev1}/threedi_modelchecker/config.py

@@ -877,16 +877,6 @@ CHECKS += [
     LinestringLocationCheck(error_code=205, column=table.the_geom, max_distance=1)
     for table in [models.Channel, models.Culvert]
 ]
-CHECKS += [
-    QueryCheck(
-        error_code=206,
-        column=models.ConnectionNode.the_geom_linestring,
-        invalid=Query(models.ConnectionNode).filter(
-            models.ConnectionNode.the_geom_linestring != None
-        ),
-        message=f"{models.ConnectionNode.the_geom_linestring} must be NULL",
-    )
-]
 CHECKS += [
     SpatialIndexCheck(
         error_code=207, column=models.ConnectionNode.the_geom, level=CheckLevel.WARNING

{threedi-modelchecker-2.6.2 → threedi-modelchecker-2.6.3.dev1}/threedi_modelchecker/tests/conftest.py

@@ -20,8 +20,8 @@ def threedi_db(tmpdir_factory):
     https://factoryboy.readthedocs.io/en/latest/orms.html#managing-sessions
     """
     tmp_path = tmpdir_factory.mktemp("spatialite4")
-    tmp_sqlite = tmp_path / "empty_v4.sqlite"
-    shutil.copyfile(data_dir / "empty_v4.sqlite", tmp_sqlite)
+    tmp_sqlite = tmp_path / "empty.gpkg"
+    shutil.copyfile(data_dir / "empty.gpkg", tmp_sqlite)
     db = ThreediDatabase(tmp_sqlite)
     schema = ModelSchema(db)
     schema.upgrade(backup=False, upgrade_spatialite_version=False)
@@ -52,7 +52,7 @@ def session(threedi_db):
 
 @pytest.fixture
 def empty_sqlite_v4(tmp_path):
-    """An function-scoped empty spatialite v4 in the latest migration state"""
-    tmp_sqlite = tmp_path / "empty_v4.sqlite"
-    shutil.copyfile(data_dir / "empty_v4.sqlite", tmp_sqlite)
+    """An function-scoped empty geopackage v4 in the latest migration state"""
+    tmp_sqlite = tmp_path / "empty.gpkg"
+    shutil.copyfile(data_dir / "empty.gpkg", tmp_sqlite)
     return ThreediDatabase(tmp_sqlite)

{threedi-modelchecker-2.6.2 → threedi-modelchecker-2.6.3.dev1}/threedi_modelchecker/tests/test_checks_factories.py

@@ -36,7 +36,7 @@ def test_gen_not_null_checks():
 def test_gen_geometry_check():
     geometry_checks = generate_geometry_checks(models.ConnectionNode.__table__)
 
-    assert len(geometry_checks) == 2
+    assert len(geometry_checks) == 1
     geometry_check_columns = [check.column for check in geometry_checks]
     assert models.ConnectionNode.the_geom in geometry_check_columns
 

{threedi-modelchecker-2.6.2 → threedi-modelchecker-2.6.3.dev1/threedi_modelchecker.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: threedi-modelchecker
-Version: 2.6.2
+Version: 2.6.3.dev1
 Summary: Checks validity of a 3Di schematisation
 Author-email: Nelen & Schuurmans <info@nelen-schuurmans.nl>
 License: MIT
@@ -15,7 +15,7 @@ License-File: LICENSE
 Requires-Dist: Click
 Requires-Dist: GeoAlchemy2!=0.11.*,>=0.9
 Requires-Dist: SQLAlchemy>=1.4
-Requires-Dist: threedi-schema==0.219.*
+Requires-Dist: threedi-schema==0.220.*
 Provides-Extra: rasterio
 Requires-Dist: rasterio>=1.3; extra == "rasterio"
 Provides-Extra: test

{threedi-modelchecker-2.6.2 → threedi-modelchecker-2.6.3.dev1}/threedi_modelchecker.egg-info/SOURCES.txt

@@ -38,4 +38,4 @@ threedi_modelchecker/tests/test_checks_timeseries.py
 threedi_modelchecker/tests/test_exporters.py
 threedi_modelchecker/tests/test_model_checks.py
 threedi_modelchecker/tests/data/__init__.py
-threedi_modelchecker/tests/data/empty_v4.sqlite
+threedi_modelchecker/tests/data/empty.gpkg

{threedi-modelchecker-2.6.2 → threedi-modelchecker-2.6.3.dev1}/threedi_modelchecker.egg-info/requires.txt

@@ -1,7 +1,7 @@
 Click
 GeoAlchemy2!=0.11.*,>=0.9
 SQLAlchemy>=1.4
-threedi-schema==0.219.*
+threedi-schema==0.220.*
 
 [rasterio]
 rasterio>=1.3

threedi-modelchecker-2.6.2/threedi_modelchecker/tests/data/empty_v4.sqlite

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1157e95b7271dbe14142f96bc46664be92f53d463726c4d0cb18be07f9cd7acb
-size 6086656