Test threedi-schema 0.224

dependencies.py

@@ -29,25 +29,26 @@
 from PyQt5.QtWidgets import QProgressDialog
 from qgis.core import Qgis
 
-import setuptools  # noqa: https://github.com/pypa/setuptools/issues/2993
 import importlib
 import logging
 import os
 import pkg_resources
 import platform
+import setuptools  # noqa: https://github.com/pypa/setuptools/issues/2993
 import shutil
 import subprocess
 import sys
 import tarfile
 
+
 # in case the dependency is a tar, the constraint should be the
 # explicit version (e.g. "==3.8.0")
 Dependency = namedtuple("Dependency", ["name", "package", "constraint", "tar"])
 
 #: List of expected dependencies.
 DEPENDENCIES = [
     Dependency("SQLAlchemy", "sqlalchemy", "==2.0.6", False),
-    Dependency("GeoAlchemy2", "geoalchemy2", "==0.13.*", False),
+    Dependency("GeoAlchemy2", "geoalchemy2", "==0.15.*", False),
     Dependency("pyqtgraph", "pyqtgraph", ">=0.13.2", False),
     Dependency(
         "importlib-resources", "importlib_resources", "", False
@@ -59,8 +60,8 @@
     Dependency("cftime", "cftime", ">=1.5.0", False),  # threedigrid[results]
     Dependency("alembic", "alembic", "==1.8.*", False),
     Dependency("threedigrid", "threedigrid", "==2.2.*", False),
-    Dependency("threedi-schema", "threedi_schema", "==0.219.*", False),
-    Dependency("threedi-modelchecker", "threedi_modelchecker", "==2.6.*", False),
+    Dependency("threedi-schema", "threedi_schema", "==0.224.*", False),
+    Dependency("threedi-modelchecker", "threedi_modelchecker", "==2.10.*", False),
     Dependency("threedidepth", "threedidepth", "==0.6.3", False),
     Dependency("click", "click", ">=8.0", False),
     Dependency("packaging", "packaging", "", False),
@@ -71,8 +72,7 @@
     Dependency("networkx", "networkx", "", False),
     Dependency("condenser", "condenser", ">=0.2.1", False),
     Dependency("Shapely", "shapely", ">=2.0.0", False),
-    Dependency("threedigrid-builder", "threedigrid_builder", "==1.14.*", False),
-    Dependency("hydxlib", "hydxlib", "==1.5.2", False),
+    Dependency("threedigrid-builder", "threedigrid_builder", "==1.17.*", False),
     Dependency("h5netcdf", "h5netcdf", "", False),
     Dependency("greenlet", "greenlet", "!=0.4.17", False),
     Dependency("threedi-mi-utils", "threedi_mi_utils", "==0.1.2", False),

external-dependencies/populate.sh

@@ -67,16 +67,16 @@ wget https://files.pythonhosted.org/packages/cd/84/66072ee12c3e79061f183c09a24be
 # Download windows wheels (cp39, win, amd64)
 
 wget https://files.pythonhosted.org/packages/b2/8e/83d9e3bff5c0ff7a0ec7e850c785916e616ab20d8793943f9e1d2a987fab/shapely-2.0.0-cp39-cp39-win_amd64.whl
-wget https://files.pythonhosted.org/packages/75/b7/7849ad6f25e17f72f4c7e411b36b456205db2c501ad495bfc97c1cd3b813/threedigrid_builder-1.14.4-cp39-cp39-win_amd64.whl
+wget https://files.pythonhosted.org/packages/fe/e3/15a630b4cfd787bba84fb43beac7a25ae29c2b417ad7c4cfadae129a0819/threedigrid_builder-1.17.1-cp39-cp39-win_amd64.whl#sha256=24e06c136e399e1d6299c0a9b3e4c869084aba5878c833487fb13390aec10af8
 wget https://files.pythonhosted.org/packages/b3/89/1d3b78577a6b2762cb254f6ce5faec9b7c7b23052d1cdb7237273ff37d10/greenlet-2.0.2-cp39-cp39-win_amd64.whl#sha256=db1a39669102a1d8d12b57de2bb7e2ec9066a6f2b3da35ae511ff93b01b5d564
 wget https://files.pythonhosted.org/packages/5f/d6/5f59a5e5570c4414d94c6da4c97731deab832cbd14eaf23189d54a92d1e1/cftime-1.6.2-cp39-cp39-win_amd64.whl#sha256=86fe550b94525c327578a90b2e13418ca5ba6c636d5efe3edec310e631757eea
 
 
 # Download linux wheels (both cp38 and cp310)
 wget https://files.pythonhosted.org/packages/06/07/0700e5e33c44bc87e19953244c29f73669cfb6f19868899170f9c7e34554/shapely-2.0.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
 wget https://files.pythonhosted.org/packages/4e/03/f3bcb7d96aef6d56b62e2f25996f161c05f92a45d452165be2007b756e0f/shapely-2.0.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
-wget https://files.pythonhosted.org/packages/0b/22/8868b2266baa2f8f9747100232807de4151fd720322ee5d5d724d6415d63/threedigrid_builder-1.14.4-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
-wget https://files.pythonhosted.org/packages/bd/8c/db51b687ee80cf28787f7b862b62e77e096001513176252d824384d2739c/threedigrid_builder-1.14.4-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
+wget https://files.pythonhosted.org/packages/53/67/a3f7e0ec8936a2882c97eb1e595ea91c3a5de4869d023064bbc8886d6ab7/threedigrid_builder-1.17.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
+wget https://files.pythonhosted.org/packages/d0/6f/19252e21244e19adf6816cbc6b9d5f1f3cae72b9bd62f1f7da1bc484c9b1/threedigrid_builder-1.17.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
 wget https://files.pythonhosted.org/packages/6e/11/a1f1af20b6a1a8069bc75012569d030acb89fd7ef70f888b6af2f85accc6/greenlet-2.0.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl#sha256=d75209eed723105f9596807495d58d10b3470fa6732dd6756595e89925ce2470
 wget https://files.pythonhosted.org/packages/e1/17/d8042d82f44c08549b535bf2e7d1e87aa1863df5ed6cf1cf773eb2dfdf67/cftime-1.6.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl#sha256=acb294fdb80e33545ae54b4421df35c4e578708a5ffce1c00408b2294e70ecef
 wget https://files.pythonhosted.org/packages/44/51/bc9d47beee47afda1d335f05efa848dc403bd183344f03d431281518e8ab/cftime-1.5.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.whl#sha256=7a820e16357dbdc9723b2059f7178451de626a8b2e5f80b9d91a77e3dac42133

processing/providers.py

@@ -1,7 +1,7 @@
 # See https://docs.qgis.org/3.10/en/docs/pyqgis_developer_cookbook/processing.html
 from qgis.core import QgsProcessingProvider
 from qgis.PyQt.QtGui import QIcon
-from threedi_results_analysis.processing.dwf_calculation_algorithm import DWFCalculatorAlgorithm
+# from threedi_results_analysis.processing.dwf_calculation_algorithm import DWFCalculatorAlgorithm
 from threedi_results_analysis.processing.gpkg_conversion_algorithm import ThreeDiConvertToGpkgAlgorithm
 from threedi_results_analysis.processing.grid_creation_algorithm import ThreeDiGenerateCompGridAlgorithm
 from threedi_results_analysis.processing.cross_sectional_discharge_algorithm import CrossSectionalDischargeAlgorithm
@@ -12,9 +12,9 @@
 from threedi_results_analysis.processing.schematisation_algorithms import (
     CheckSchematisationAlgorithm,
     MigrateAlgorithm,
-    ImportSufHydAlgorithm,
-    GuessIndicatorAlgorithm,
-    ImportHydXAlgorithm,
+    # ImportSufHydAlgorithm,
+    # GuessIndicatorAlgorithm,
+    # ImportHydXAlgorithm,
 )
 
 from threedi_results_analysis.processing.threedidepth_algorithms import ThreediDepthAlgorithm, ThreediMaxDepthAlgorithm
@@ -28,14 +28,14 @@ class ThreediProvider(QgsProcessingProvider):
     def loadAlgorithms(self, *args, **kwargs):
         self.addAlgorithm(ThreediDepthAlgorithm())
         self.addAlgorithm(ThreediMaxDepthAlgorithm())
-        self.addAlgorithm(DWFCalculatorAlgorithm())
+        # self.addAlgorithm(DWFCalculatorAlgorithm())
         self.addAlgorithm(CheckSchematisationAlgorithm())
         self.addAlgorithm(MigrateAlgorithm())
-        self.addAlgorithm(ImportHydXAlgorithm())
+        # self.addAlgorithm(ImportHydXAlgorithm())
         self.addAlgorithm(ThreeDiConvertToGpkgAlgorithm())
         self.addAlgorithm(ThreeDiGenerateCompGridAlgorithm())
-        self.addAlgorithm(ImportSufHydAlgorithm())
-        self.addAlgorithm(GuessIndicatorAlgorithm())
+        # self.addAlgorithm(ImportSufHydAlgorithm())
+        # self.addAlgorithm(GuessIndicatorAlgorithm())
         self.addAlgorithm(CrossSectionalDischargeAlgorithm())
         self.addAlgorithm(DetectLeakingObstaclesAlgorithm())
         self.addAlgorithm(DetectLeakingObstaclesWithDischargeThresholdAlgorithm())