Merge remote-tracking branch 'origin/HEAD' into refactor

CHANGES.rst

@@ -161,7 +161,9 @@
 2.5.5 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Bump threedigrid to 2.0.*
+- Bump threedi-modelchecker to 2.4.*
+- Bump threedigrid-builder to 1.12.*
 
 
 2.5.4 (2023-07-20)

dependencies.py

@@ -49,9 +49,9 @@
     Dependency("SQLAlchemy", "sqlalchemy", "==2.0.6", False),
     Dependency("GeoAlchemy2", "geoalchemy2", "==0.13.*", False),
     Dependency("pyqtgraph", "pyqtgraph", ">=0.13.2", False),
-    Dependency("threedigrid", "threedigrid", ">=2.0.3", False),
+    Dependency("threedigrid", "threedigrid", "==2.0.*", False),
     Dependency("threedi-schema", "threedi_schema", "==0.217.*", False),
-    Dependency("threedi-modelchecker", "threedi_modelchecker", "==2.2.*", False),
+    Dependency("threedi-modelchecker", "threedi_modelchecker", "==2.4.*", False),
     Dependency("threedidepth", "threedidepth", "==0.6.1", False),
     Dependency("click", "click", ">=8.0", False),
     Dependency("alembic", "alembic", "==1.8.*", False),
@@ -71,7 +71,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.11.4", False),
+    Dependency("threedigrid_builder", "threedigrid_builder", "==1.12.*", False),
     Dependency("hydxlib", "hydxlib", "==1.5.1", False),
     Dependency("h5netcdf", "h5netcdf", "", False),
     Dependency("greenlet", "greenlet", "!=0.4.17", False),

external-dependencies/populate.sh

@@ -59,16 +59,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/23/8a/3dbc65fae7a4364c00df2c26a552fb6be4fdc71758b3d8b34502031d8cca/threedigrid_builder-1.11.4-cp39-cp39-win_amd64.whl#sha256=d5625545b148b8694607fcdb7ea89b77af8d95f006212f8b35116d29887a4933
+wget https://files.pythonhosted.org/packages/ae/8f/432412eadf4441519e3b7b94e7c53f542a5500f5a0c12aa3e16fd5e6bd07/threedigrid_builder-1.12.1-cp39-cp39-win_amd64.whl#sha256=0dd01a1a4fa33d7434858c90f4e54157afe163d334b63bbcdc9c7f9df048063e
 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/3e/e5/ced7142226e2b2814b35318e0b9715da7a63f13274aa2e3949e37d2f416c/threedigrid_builder-1.11.4-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl#sha256=6f3d5bc788cc03d5baa7f55b8df9c78dfda8868db03f2099b69f9668330278ff
-wget https://files.pythonhosted.org/packages/ce/59/6fd7a8a52856c85c1e860765c4181723895bfd8ab7aa20180b7e03a4ce0b/threedigrid_builder-1.11.4-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl#sha256=caa0c54d841b9899f101b254f71b58a31d460ae75fc2a71111b3f68a185f0602
+wget https://files.pythonhosted.org/packages/dc/20/bc17c88f5353e78b4e2a9832cc7a6560f5367b8ae657c08e80d3059c1b41/threedigrid_builder-1.12.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl#sha256=ea6270902886a99c89789e31f851cac8d217bf8dbc33f8c2de35d2c30946cc74
+wget https://files.pythonhosted.org/packages/36/2b/532a1482b307b5cb8efca69aa0c1fddfe01015ffde1fbf16bfebddc92926/threedigrid_builder-1.12.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl#sha256=6647ccc1e360af1a6673c4a7d0a2981d46254c82e11df2efce7c2e56927e703c
 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