diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 49cb50013..4b599cc81 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -12,11 +12,6 @@ updates: groups: rust: patterns: ["*"] - ignore: - # These packages are currently pinned, see: - # https://github.com/EnergySystemsModellingLab/MUSE2/issues/1431 - - dependency-name: highs - - dependency-name: highs-sys - package-ecosystem: "github-actions" directory: "/" schedule: diff --git a/Cargo.lock b/Cargo.lock index bc8bd11ae..bc9c2e03b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -150,9 +150,9 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.71.1" +version = "0.72.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f58bf3d7db68cfbac37cfc485a8d711e87e064c3d0fe0435b92f7a407f9d6b3" +checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895" dependencies = [ "bitflags", "cexpr", @@ -789,9 +789,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "highs" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d85ad4b92e0e2d0340efe7961ccadd66312b9c87ff235df9556aa52fe99bf941" +checksum = "7dfc791427e78fdc1a0a37983f79c20f86a0b7b7dfdb5d6a57a6f72d77cd9074" dependencies = [ "highs-sys", "log", @@ -799,9 +799,9 @@ dependencies = [ [[package]] name = "highs-sys" -version = "1.12.1" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c51d1e4e682c01dd882d2d0cd89b6725cd5805dd307d290aac0a37be6fe0c58" +checksum = "e4da0c52322648e2360a5a8896d23301fa5ed99ed7607c5faf229bd0bbb30d3f" dependencies = [ "bindgen", "cmake", @@ -1071,7 +1071,6 @@ dependencies = [ "fern", "float-cmp", "highs", - "highs-sys", "human-panic", "include_dir", "indexmap", diff --git a/Cargo.toml b/Cargo.toml index eb410248f..0f6c0c7ee 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,14 +24,7 @@ fern = {version = "0.7.1", features = ["chrono", "colored"]} chrono = "0.4" clap = {version = "4.6.1", features = ["cargo", "derive"]} include_dir = "0.7.4" -# Pinned because newer versions of `highs-sys` (required by newer version of `highs`) lead to -# different results on different platforms: -# https://github.com/EnergySystemsModellingLab/MUSE2/issues/1431 -# -# As `highs-sys` is a transitive dependency, it can be removed from this file when we are happy to -# unpin. -highs = "=2.3.0" -highs-sys = "=1.12.1" +highs = "2.4.0" indexmap = "2.14.0" human-panic = "2.0.8" clap-markdown = "0.1.5"