From 8e489ac80d2d9e44d022b2feac47859e8964e650 Mon Sep 17 00:00:00 2001 From: Pierre Villemot Date: Thu, 28 Mar 2024 17:08:14 +0100 Subject: [PATCH 1/2] Bump the minimal version of `Dune` to `3.0` The generated opam files by `Dune < 3.0` isn't correct when calling `dune subst`. See issue https://github.com/ocaml/dune/pull/3647. This commit bumps the minimal version to `3.0`. --- dune-project | 4 ++-- ocplib-simplex.opam | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dune-project b/dune-project index 5e0369b..b33dde5 100644 --- a/dune-project +++ b/dune-project @@ -1,4 +1,4 @@ -(lang dune 2.0) +(lang dune 3.0) (generate_opam_files true) (name ocplib-simplex) @@ -23,7 +23,7 @@ (license "LGPL-2.1-or-later") (depends (ocaml (>= 4.02.0)) - (dune (>= 2.0)) + (dune (>= 3.0)) (ocamlfind (>= 1.9.1)) (zarith :with-test) (logs (>= 0.5.0)) diff --git a/ocplib-simplex.opam b/ocplib-simplex.opam index db68ec6..9fae874 100644 --- a/ocplib-simplex.opam +++ b/ocplib-simplex.opam @@ -19,14 +19,14 @@ doc: "https://ocamlpro.github.io/ocplib-simplex" bug-reports: "https://github.com/OCamlPro/ocplib-simplex/issues" depends: [ "ocaml" {>= "4.02.0"} - "dune" {>= "2.0"} + "dune" {>= "3.0" & >= "3.0"} "ocamlfind" {>= "1.9.1"} "zarith" {with-test} "logs" {>= "0.5.0"} "odoc" {with-doc} ] build: [ - ["dune" "subst"] {pinned} + ["dune" "subst"] {dev} [ "dune" "build" From c2e8ee2a4ab2b83b73ea5e0ff5c2fcdd318a8a8b Mon Sep 17 00:00:00 2001 From: Pierre Villemot Date: Thu, 28 Mar 2024 17:34:37 +0100 Subject: [PATCH 2/2] Unused variables in tests --- tests/standalone_minimal_maximization.ml | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/standalone_minimal_maximization.ml b/tests/standalone_minimal_maximization.ml index b19327b..96e5fac 100644 --- a/tests/standalone_minimal_maximization.ml +++ b/tests/standalone_minimal_maximization.ml @@ -1,9 +1,6 @@ - open Simplex let large i = Sim.Core.R2.of_r (Q.of_int i) -let upper i = Sim.Core.R2.upper (Q.of_int i) -let lower i = Sim.Core.R2.lower (Q.of_int i) let bnd r e = {Sim.Core.bvalue = r; explanation = e}