Merge branch 'refs/heads/main' into feature/soft-constraint-link-node

.github/workflows/python.yml

@@ -58,7 +58,9 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        python-version: [ '3.9', '3.10', '3.11', '3.12' ]
+        # We produce abi3-py39 wheels for Python 3.9 later.
+        # If this is changed, then the PyO3 feature in the pywr-python/Cargo.toml file must also be updated.
+        python-version: [ '3.9' ]
     steps:
       - uses: actions/checkout@v4
         with:
@@ -89,7 +91,9 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [ '3.9', '3.10', '3.11', '3.12' ]
+        # We produce abi3-py39 wheels for Python 3.9 later.
+        # If this is changed, then the PyO3 feature in the pywr-python/Cargo.toml file must also be updated.
+        python-version: [ '3.9' ]
     steps:
       - uses: actions/checkout@v4
         with:

.gitignore

@@ -224,3 +224,5 @@ Cargo.lock
 
 # These are backup files generated by rustfmt
 **/*.rs.bk
+
+.DS_Store

.gitmodules

@@ -1,6 +1,15 @@
 [submodule "clp-sys/vendor/Clp"]
-	path = clp-sys/vendor/Clp
+	path = coin-or-sys/vendor/Clp
 	url = https://github.com/coin-or/Clp
 [submodule "clp-sys/vendor/CoinUtils"]
-	path = clp-sys/vendor/CoinUtils
+	path = coin-or-sys/vendor/CoinUtils
 	url = https://github.com/coin-or/CoinUtils.git
+[submodule "coin-or-sys/vendor/Cgl"]
+	path = coin-or-sys/vendor/Cgl
+	url = https://github.com/coin-or/Cgl.git
+[submodule "coin-or-sys/vendor/Cbc"]
+	path = coin-or-sys/vendor/Cbc
+	url = https://github.com/coin-or/Cbc.git
+[submodule "coin-or-sys/vendor/Osi"]
+	path = coin-or-sys/vendor/Osi
+	url = https://github.com/coin-or/Osi

Cargo.toml

@@ -4,7 +4,7 @@ members = [
     "ipm-common",
     "ipm-ocl",
     "ipm-simd",
-    "clp-sys",
+    "coin-or-sys",
     "pywr-core",
     "pywr-schema",
     "pywr-cli",
@@ -16,7 +16,7 @@ exclude = [
 ]
 # IPM packages are not default because they require nightly (portable_simd).
 default-members = [
-    "clp-sys",
+    "coin-or-sys",
     "pywr-core",
     "pywr-schema",
     "pywr-cli",
@@ -39,13 +39,13 @@ thiserror = "1.0.25"
 num = "0.4.0"
 float-cmp = "0.9.0"
 ndarray = "0.15.3"
-polars = { version = "0.39", features = ["lazy", "rows", "ndarray"] }
-pyo3-polars = "0.13"
+polars = { version = "0.41.2", features = ["lazy", "rows", "ndarray"] }
+pyo3-polars = "0.15"
 pyo3 = { version = "0.21", default-features = false }
 pyo3-log = "0.10"
 tracing = { version = "0.1", features = ["log"] }
 csv = "1.1"
 hdf5 = { git = "https://github.com/aldanor/hdf5-rust.git", package = "hdf5", features = ["static", "zlib"] }
 pywr-v1-schema = { git = "https://github.com/pywr/pywr-schema/", tag = "v0.13.0", package = "pywr-schema" }
-chrono = { version = "0.4.34" }
+chrono = { version = "0.4.34", features = ["serde"] }
 schemars = { version = "0.8.16", features = ["chrono"] }

clp-sys/Cargo.toml → coin-or-sys/Cargo.toml

@@ -1,9 +1,9 @@
 [package]
-name = "clp-sys"
+name = "coin-or-sys"
 version = "0.1.0"
 authors = ["James Tomlinson <[email protected]>"]
 edition = "2021"
-description = "Low-level bindings to COIN-OR CLP (Coin-or linear programming)."
+description = "Low-level bindings to COIN-OR CLP (Coin-or linear programming) and CBC (Coin-or branch and cut)."
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/pywr/pywr-next/"