From fffaf47f502d3dd9bc2787da02a862c292d58bfe Mon Sep 17 00:00:00 2001
From: Michele Alberti <michele.alberti@cea.fr>
Date: Mon, 4 Apr 2022 15:11:55 +0200
Subject: [PATCH] [dune] Bump dune version.

---
 caisar.opam         | 2 +-
 dune-project        | 6 +++---
 nnet.opam           | 2 +-
 onnx.opam           | 2 +-
 tests/marabou.t     | 2 +-
 tests/simple.t      | 2 +-
 tests/simple_onnx.t | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/caisar.opam b/caisar.opam
index f650bec3..00fd5054 100644
--- a/caisar.opam
+++ b/caisar.opam
@@ -9,7 +9,7 @@ depends: [
   "piqilib" {>= "0.6.14"}
   "zarith" {>= "1.7"}
   "ocplib-endian" {>= "1.0"}
-  "dune" {>= "2.9" & >= "2.7.1" & <= "2.9.0"}
+  "dune" {>= "2.9" & >= "2.9.3"}
   "base" {>= "v0.14.0"}
   "stdio" {>= "v0.14.0"}
   "cmdliner" {= "1.0.4"}
diff --git a/dune-project b/dune-project
index c7418cda..27f42b54 100644
--- a/dune-project
+++ b/dune-project
@@ -19,7 +19,7 @@
    (piqilib (>= 0.6.14))
    (zarith (>= 1.7))
    (ocplib-endian (>= 1.0))
-   (dune (and (>= 2.7.1) (<= 2.9.0)))
+   (dune (>= 2.9.3))
    (base (>= v0.14.0))
    (stdio (>= v0.14.0))
    (cmdliner (= 1.0.4))
@@ -45,7 +45,7 @@
   (synopsis "NNet parser")
   (depends
    (ocaml (>= 4.13))
-   (dune (and (>= 2.7.1) (<= 2.9.0)))
+   (dune (>= 2.9.3))
    (base (>= v0.14.0))
   )
 )
@@ -55,7 +55,7 @@
   (synopsis "ONNX parser")
   (depends
    (ocaml (>= 4.13))
-   (dune (and (>= 2.7.1) (<= 2.9.0)))
+   (dune (>= 2.9.3))
    (base (>= v0.14.0))
    (ocaml-protoc-plugin (= 4.2.0))
   )
diff --git a/nnet.opam b/nnet.opam
index 9a77f0f3..52a1ad9f 100644
--- a/nnet.opam
+++ b/nnet.opam
@@ -4,7 +4,7 @@ version: "0.1"
 synopsis: "NNet parser"
 depends: [
   "ocaml" {>= "4.13"}
-  "dune" {>= "2.9" & >= "2.7.1" & <= "2.9.0"}
+  "dune" {>= "2.9" & >= "2.9.3"}
   "base" {>= "v0.14.0"}
   "odoc" {with-doc}
 ]
diff --git a/onnx.opam b/onnx.opam
index 8149e05b..46e753ce 100644
--- a/onnx.opam
+++ b/onnx.opam
@@ -4,7 +4,7 @@ version: "0.1"
 synopsis: "ONNX parser"
 depends: [
   "ocaml" {>= "4.13"}
-  "dune" {>= "2.9" & >= "2.7.1" & <= "2.9.0"}
+  "dune" {>= "2.9" & >= "2.9.3"}
   "base" {>= "v0.14.0"}
   "ocaml-protoc-plugin" {= "4.2.0"}
   "odoc" {with-doc}
diff --git a/tests/marabou.t b/tests/marabou.t
index ecf95011..ffc8f76f 100644
--- a/tests/marabou.t
+++ b/tests/marabou.t
@@ -17,7 +17,7 @@ Test verify
 
   $ PATH=$(pwd)/bin:$PATH
 
-  $ caisar verify -L . --format whyml --prover=Marabou - 2>&1 <<EOF | sed 's/\/tmp\/[a-z0-9./]*/$TMPFILE/'
+  $ caisar verify -L . --format whyml --prover=Marabou - 2>&1 <<EOF | sed 's/\/tmp\/[a-z0-9_./]*/$TMPFILE/'
   > theory T
   >   use TestNetwork.AsTuple
   >   use ieee_float.Float64
diff --git a/tests/simple.t b/tests/simple.t
index ccc1b93a..ed3d8805 100644
--- a/tests/simple.t
+++ b/tests/simple.t
@@ -17,7 +17,7 @@ Test verify
 
   $ PATH=$(pwd)/bin:$PATH
 
-  $ caisar verify -L . --format whyml --prover=PyRAT - 2>&1 <<EOF | sed 's/\/tmp\/[a-z0-9./]*/$TMPFILE/'
+  $ caisar verify -L . --format whyml --prover=PyRAT - 2>&1 <<EOF | sed 's/\/tmp\/[a-z0-9_./]*/$TMPFILE/'
   > theory T
   >   use TestNetwork.AsTuple
   >   use ieee_float.Float64
diff --git a/tests/simple_onnx.t b/tests/simple_onnx.t
index 63db9311..5c6442dc 100644
--- a/tests/simple_onnx.t
+++ b/tests/simple_onnx.t
@@ -17,7 +17,7 @@ Test verify
 
   $ PATH=$(pwd)/bin:$PATH
 
-  $ caisar verify -L . --format whyml --prover=PyRAT - 2>&1 <<EOF | sed 's/\/tmp\/[a-z0-9./]*/$TMPFILE/'
+  $ caisar verify -L . --format whyml --prover=PyRAT - 2>&1 <<EOF | sed 's/\/tmp\/[a-z0-9_./]*/$TMPFILE/'
   > theory T
   >   use TestNetworkONNX.AsTuple
   >   use ieee_float.Float64
-- 
GitLab