threedi-modelchecker 2.10.0.dev2__tar.gz → 2.10.0.dev4__tar.gz

{threedi_modelchecker-2.10.0.dev2/threedi_modelchecker.egg-info → threedi_modelchecker-2.10.0.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: threedi-modelchecker
-Version: 2.10.0.dev2
+Version: 2.10.0.dev4
 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.224.0.dev2
+Requires-Dist: threedi-schema<0.225.0,>=0.224.0.dev
 Provides-Extra: rasterio
 Requires-Dist: rasterio>=1.3.10; extra == "rasterio"
 Provides-Extra: test

{threedi_modelchecker-2.10.0.dev2 → threedi_modelchecker-2.10.0.dev4}/pyproject.toml

@@ -19,7 +19,7 @@ dependencies = [
     "Click",
     "GeoAlchemy2>=0.9,!=0.11.*",
     "SQLAlchemy>=1.4",
-    "threedi-schema==0.224.0.dev2"
+    "threedi-schema>=0.224.0.dev,<0.225.0"
 ]
 
 [project.optional-dependencies]

{threedi_modelchecker-2.10.0.dev2 → threedi_modelchecker-2.10.0.dev4}/threedi_modelchecker/__init__.py

@@ -1,5 +1,5 @@
 from .model_checks import *  # NOQA
 
 # fmt: off
-__version__ = '2.10.0.dev2'
+__version__ = '2.10.0.dev4'
 # fmt: on

{threedi_modelchecker-2.10.0.dev2 → threedi_modelchecker-2.10.0.dev4}/threedi_modelchecker/config.py

@@ -2566,7 +2566,6 @@ CHECKS += [
         error_code=1220,
         column=models.ControlMeasureLocation.object_id,
         reference_column=models.ConnectionNode.id,
-        filters=models.ControlMeasureLocation.object_type == "connection_node",
     )
 ]
 
@@ -2617,7 +2616,7 @@ CHECKS += [
                 )
             )
         ),
-        message="v2_control_measure_map.control_id references an id in memory_control or table_control, but the table it references does not contain an entry with that id.",
+        message="control_measure_map.control_id references an id in memory_control or table_control, but the table it references does not contain an entry with that id.",
     )
 ]
 
@@ -2644,7 +2643,6 @@ not_null_cols = [
     models.ControlMeasureMap.weight,
     models.ControlMeasureMap.control_measure_location_id,
     models.ControlMeasureLocation.object_id,
-    models.ControlMeasureLocation.object_type,
 ]
 CHECKS += [
     NotNullCheck(error_code=1230 + i, column=col) for i, col in enumerate(not_null_cols)

{threedi_modelchecker-2.10.0.dev2 → threedi_modelchecker-2.10.0.dev4}/threedi_modelchecker/tests/factories.py

@@ -242,11 +242,12 @@ class ControlTableFactory(factory.alchemy.SQLAlchemyModelFactory):
         sqlalchemy_session = None
 
     action_type = constants.ControlTableActionTypes.set_discharge_coefficients
-    action_table = "0.0;-1.0;2.0#1.0;-1.1;2.1"
+    action_table = "0.0,-1.0 2.0\n1.0,-1.1 2.1"
     measure_operator = constants.MeasureOperators.greater_than
     measure_variable = constants.MeasureVariables.waterlevel
     target_type = constants.StructureControlTypes.channel
     target_id = 10
+    geom = "SRID=4326;POINT(-71.064544 42.28787)"
 
 
 class ControlMemoryFactory(factory.alchemy.SQLAlchemyModelFactory):
@@ -264,6 +265,7 @@ class ControlMemoryFactory(factory.alchemy.SQLAlchemyModelFactory):
     is_active = True
     upper_threshold = 1.0
     lower_threshold = -1.0
+    geom = "SRID=4326;POINT(-71.064544 42.28787)"
 
 
 class CulvertFactory(factory.alchemy.SQLAlchemyModelFactory):

{threedi_modelchecker-2.10.0.dev2 → threedi_modelchecker-2.10.0.dev4/threedi_modelchecker.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: threedi-modelchecker
-Version: 2.10.0.dev2
+Version: 2.10.0.dev4
 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.224.0.dev2
+Requires-Dist: threedi-schema<0.225.0,>=0.224.0.dev
 Provides-Extra: rasterio
 Requires-Dist: rasterio>=1.3.10; extra == "rasterio"
 Provides-Extra: test

{threedi_modelchecker-2.10.0.dev2 → threedi_modelchecker-2.10.0.dev4}/threedi_modelchecker.egg-info/requires.txt

@@ -1,7 +1,7 @@
 Click
 GeoAlchemy2!=0.11.*,>=0.9
 SQLAlchemy>=1.4
-threedi-schema==0.224.0.dev2
+threedi-schema<0.225.0,>=0.224.0.dev
 
 [rasterio]
 rasterio>=1.3.10