Merge branch 'main' into negative-min-max-parameters

.github/workflows/deploy-book.yml

@@ -31,12 +31,12 @@ jobs:
           # Just add a `cd` here if you need to change to another directory.
           mdbook build ./pywr-book
       - name: Setup Pages
-        uses: actions/configure-pages@v2
+        uses: actions/configure-pages@v4
       - name: Upload artifact
-        uses: actions/upload-pages-artifact@v1
+        uses: actions/upload-pages-artifact@v3
         with:
           # Upload entire repository
           path: './pywr-book/book'
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v1
+        uses: actions/deploy-pages@v4

Cargo.toml

@@ -41,8 +41,8 @@ polars = { version = "0.37.0", features = ["lazy", "rows", "ndarray"] }
 pyo3-polars = "0.11.1"
 pyo3 = { version = "0.20.2", default-features = false }
 pyo3-log = "0.9.0"
-tracing = {  version ="0.1", features = ["log"] }
+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.11.0", package = "pywr-schema" }
-chrono = { workspace = true }
+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.11.0", package = "pywr-schema" }
+chrono = { version = "0.4.34" }

clp-sys/Cargo.toml

@@ -2,11 +2,15 @@
 name = "clp-sys"
 version = "0.1.0"
 authors = ["James Tomlinson <[email protected]>"]
-edition = "2018"
+edition = "2021"
+description = "Low-level bindings to COIN-OR CLP (Coin-or linear programming)."
+license = "MIT OR Apache-2.0"
+repository = "https://github.com/pywr/pywr-next/"
+
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 
 [build-dependencies]
-cc = { version = "1.0", features = [] }
+cc = { version = "1.0", features = ["parallel"] }

clp-sys/build.rs

@@ -23,17 +23,22 @@ fn make_builder() -> cc::Build {
         .to_owned();
 
     if target.contains("msvc") {
-        builder.flag("-EHsc").flag_if_supported("-std:c++11");
+        builder.flag("-EHsc");
+        // Flag required for macros __cplusplus to work correctly.
+        // See: https://devblogs.microsoft.com/cppblog/msvc-now-correctly-reports-__cplusplus/
+        builder.flag("/Zc:__cplusplus");
+        builder.flag("/std:c++14");
     } else {
-        builder.flag("-std=c++11").flag("-w");
+        builder.flag("-std=c++11");
+        builder.flag("-w");
     }
 
     builder
 }
 
 fn main() {
-    const COIN_UTILS_SRC: &str = "vendor/CoinUtils/src";
-    const COIN_CLP_SRC: &str = "vendor/Clp/src";
+    const COIN_UTILS_SRC: &str = "vendor/CoinUtils/CoinUtils/src";
+    const COIN_CLP_SRC: &str = "vendor/Clp/Clp/src";
 
     // Compile CoinUtils
     let mut builder = make_builder();