Merge pull request #107 from mbarbin/clean-up-opam-dev-constraints

mbarbin · web-flow · commit 8ef69c99de01 · 2025-10-10T11:15:56.000+02:00
Simplify opam dev dependencies
diff --git a/dune-project b/dune-project
@@ -328,20 +328,12 @@
    (and
     (>= 5.2)
     (< 5.4~)))
-  (ocamlformat
-   (and
-    :with-dev-setup
-    (= 0.27.0)))
   (astring
    (>= 0.8.5))
   (base
    (>= v0.17))
   (base_quickcheck
    (>= v0.17))
-  (bisect_ppx
-   (and
-    :with-dev-setup
-    (>= 2.8.3)))
   (bitv
    (>= 2.1))
   (cmdlang
@@ -388,10 +380,6 @@
    (>= v0.17))
   (ppx_here
    (>= v0.17))
-  (ppx_js_style
-   (and
-    :with-dev-setup
-    (>= v0.17)))
   (ppx_let
    (>= v0.17))
   (ppx_sexp_conv
@@ -446,19 +434,15 @@
     (>= 5.3)
     (< 5.4~)))
   (ocamlformat
-   (and
-    :with-dev-setup
-    (= 0.27.0)))
+   (= 0.27.0))
   (astring
    (>= 0.8.5))
   (base
    (>= v0.17))
   (base_quickcheck
    (>= v0.17))
   (bisect_ppx
-   (and
-    :with-dev-setup
-    (>= 2.8.3)))
+   (>= 2.8.3))
   (bitv
    (>= 2.1))
   (cmdlang
@@ -504,9 +488,7 @@
   (ppx_here
    (>= v0.17))
   (ppx_js_style
-   (and
-    :with-dev-setup
-    (>= v0.17)))
+   (>= v0.17))
   (ppx_let
    (>= v0.17))
   (ppx_sexp_conv
diff --git a/volgo-dev.opam b/volgo-dev.opam
@@ -11,11 +11,11 @@ bug-reports: "https://github.com/mbarbin/vcs/issues"
 depends: [
   "dune" {>= "3.17"}
   "ocaml" {>= "5.3" & < "5.4~"}
-  "ocamlformat" {with-dev-setup & = "0.27.0"}
+  "ocamlformat" {= "0.27.0"}
   "astring" {>= "0.8.5"}
   "base" {>= "v0.17"}
   "base_quickcheck" {>= "v0.17"}
-  "bisect_ppx" {with-dev-setup & >= "2.8.3"}
+  "bisect_ppx" {>= "2.8.3"}
   "bitv" {>= "2.1"}
   "cmdlang" {>= "0.0.9"}
   "cmdlang-cmdliner-err-runner" {>= "0.0.16"}
@@ -38,7 +38,7 @@ depends: [
   "ppx_expect" {>= "v0.17"}
   "ppx_hash" {>= "v0.17"}
   "ppx_here" {>= "v0.17"}
-  "ppx_js_style" {with-dev-setup & >= "v0.17"}
+  "ppx_js_style" {>= "v0.17"}
   "ppx_let" {>= "v0.17"}
   "ppx_sexp_conv" {>= "v0.17"}
   "ppx_sexp_message" {>= "v0.17"}
diff --git a/volgo-tests.opam b/volgo-tests.opam
@@ -10,11 +10,9 @@ bug-reports: "https://github.com/mbarbin/vcs/issues"
 depends: [
   "dune" {>= "3.17"}
   "ocaml" {>= "5.2" & < "5.4~"}
-  "ocamlformat" {with-dev-setup & = "0.27.0"}
   "astring" {>= "0.8.5"}
   "base" {>= "v0.17"}
   "base_quickcheck" {>= "v0.17"}
-  "bisect_ppx" {with-dev-setup & >= "2.8.3"}
   "bitv" {>= "2.1"}
   "cmdlang" {>= "0.0.9"}
   "cmdlang-cmdliner-err-runner" {>= "0.0.16"}
@@ -37,7 +35,6 @@ depends: [
   "ppx_expect" {>= "v0.17"}
   "ppx_hash" {>= "v0.17"}
   "ppx_here" {>= "v0.17"}
-  "ppx_js_style" {with-dev-setup & >= "v0.17"}
   "ppx_let" {>= "v0.17"}
   "ppx_sexp_conv" {>= "v0.17"}
   "ppx_sexp_message" {>= "v0.17"}
