Merge pull request #16 from mbarbin/expect-tests

Expect_tests_helpers_base
mbarbin · Aug 23, 2024 · be73fb7 · be73fb7
2 parents a85a9ff + a15cfd7
commit be73fb7
Show file tree

Hide file tree

Showing 24 changed files with 86 additions and 1,448 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,20 @@
+## 0.0.6 (unreleased)
+
+### Added
+
+### Changed
+
+- Now using `expect_test_helpers_base`.
+- Upgrade to `err0` and more recent `commandlang`.
+
+### Deprecated
+
+### Fixed
+
+### Removed
+
+- Removed vendored `expect-test-helpers`.
+
 ## 0.0.5 (2024-08-19)
 
 ### Changed

diff --git a/bin/dune b/bin/dune
@@ -3,6 +3,6 @@
  (public_name ocaml-vcs)
  (package vcs-command)
  (flags :standard -w +a-4-40-41-42-44-45-48-66 -warn-error +a)
- (libraries commandlang-err commandlang-to-cmdliner vcs-command)
+ (libraries commandlang-to-cmdliner err0 vcs-command)
  (instrumentation
   (backend bisect_ppx)))
diff --git a/bin/main.ml b/bin/main.ml
@@ -25,9 +25,6 @@ let () =
     ~name:"ocaml-vcs"
     ~version:"%%VERSION%%"
     ~exn_handler:(function
-    | Vcs.E e ->
-      Some
-        (Commandlang_err.Err.make
-           [ Commandlang_err.Err.pp_of_sexp (Vcs.Err.sexp_of_t e) ])
+    | Vcs.E e -> Some (Err0.Err.make [ Err0.Err.pp_of_sexp (Vcs.Err.sexp_of_t e) ])
     | _ -> None [@coverage off])
 ;;
diff --git a/dune-project b/dune-project
@@ -90,7 +90,7 @@
     :dev
     (>= 2.8.3)))
   (commandlang
-   (>= 0.0.1))
+   (>= 0.0.2))
   (eio
    (>= 1.0))
   (fpath
@@ -154,15 +154,15 @@
   (cmdliner
    (= 1.3.0))
   (commandlang
-   (>= 0.0.1))
-  (commandlang-err
-   (>= 0.0.1))
+   (>= 0.0.2))
   (commandlang-to-cmdliner
-   (>= 0.0.1))
+   (>= 0.0.2))
   (eio
    (>= 1.0))
   (eio_main
    (>= 1.0))
+  (err0
+   (>= 0.0.2))
   (fpath
    (>= 0.7.3))
   (fpath-base
@@ -413,11 +413,9 @@
   (cmdliner
    (= 1.3.0))
   (commandlang
-   (>= 0.0.1))
-  (commandlang-err
-   (>= 0.0.1))
+   (>= 0.0.2))
   (commandlang-to-cmdliner
-   (>= 0.0.1))
+   (>= 0.0.2))
   (core
    (and
     (>= v0.17)
@@ -426,6 +424,12 @@
    (>= 1.0))
   (eio_main
    (>= 1.0))
+  (err0
+   (>= 0.0.2))
+  (expect_test_helpers_core
+   (and
+    (>= v0.17)
+    (< v0.18)))
   (fpath
    (>= 0.7.3))
   (fpath-base

diff --git a/example/dune b/example/dune
@@ -11,16 +11,16 @@
   -open
   Base
   -open
-  Expect_test_helpers
-  -open
   Fpath_base
   -open
+  Expect_test_helpers_base
+  -open
   Or_error.Let_syntax)
  (libraries
   base
   eio
   eio_main
-  expect_test_helpers
+  expect_test_helpers_core.expect_test_helpers_base
   fpath
   fpath-base
   vcs

diff --git a/lib/vcs/test/dune b/lib/vcs/test/dune
@@ -16,16 +16,16 @@
   -open
   Base
   -open
-  Expect_test_helpers
-  -open
   Fpath_base
   -open
+  Expect_test_helpers_base
+  -open
   Or_error.Let_syntax)
  (libraries
   base
   eio
   eio_main
-  expect_test_helpers
+  expect_test_helpers_core.expect_test_helpers_base
   fpath
   fpath-base
   vcs

diff --git a/lib/vcs_arg/test/dune b/lib/vcs_arg/test/dune
@@ -11,10 +11,17 @@
   -open
   Base
   -open
-  Expect_test_helpers
+  Fpath_base
   -open
-  Fpath_base)
- (libraries base eio eio_main expect_test_helpers fpath fpath-base vcs_arg)
+  Expect_test_helpers_base)
+ (libraries
+  base
+  eio
+  eio_main
+  expect_test_helpers_core.expect_test_helpers_base
+  fpath
+  fpath-base
+  vcs_arg)
  (instrumentation
   (backend bisect_ppx))
  (lint

diff --git a/lib/vcs_command/test/dune b/lib/vcs_command/test/dune
@@ -11,8 +11,11 @@
   -open
   Base
   -open
-  Expect_test_helpers)
- (libraries base expect_test_helpers vcs_command)
+  Expect_test_helpers_base)
+ (libraries
+  base
+  expect_test_helpers_core.expect_test_helpers_base
+  vcs_command)
  (instrumentation
   (backend bisect_ppx))
  (lint

diff --git a/lib/vcs_git/test/dune b/lib/vcs_git/test/dune
@@ -11,16 +11,16 @@
   -open
   Base
   -open
-  Expect_test_helpers
-  -open
   Fpath_base
   -open
+  Expect_test_helpers_base
+  -open
   Or_error.Let_syntax)
  (libraries
   base
   eio
   eio_main
-  expect_test_helpers
+  expect_test_helpers_core.expect_test_helpers_base
   fpath
   fpath-base
   vcs

diff --git a/lib/vcs_git_blocking/test/dune b/lib/vcs_git_blocking/test/dune
@@ -11,10 +11,16 @@
   -open
   Base
   -open
-  Expect_test_helpers
+  Fpath_base
   -open
-  Fpath_base)
- (libraries base expect_test_helpers fpath fpath-base vcs vcs_git_blocking)
+  Expect_test_helpers_base)
+ (libraries
+  base
+  expect_test_helpers_core.expect_test_helpers_base
+  fpath
+  fpath-base
+  vcs
+  vcs_git_blocking)
  (instrumentation
   (backend bisect_ppx))
  (lint

diff --git a/lib/vcs_git_cli/test/dune b/lib/vcs_git_cli/test/dune
@@ -16,8 +16,13 @@
   -open
   Base
   -open
-  Expect_test_helpers)
- (libraries base eio eio_main expect_test_helpers vcs_git_cli)
+  Expect_test_helpers_base)
+ (libraries
+  base
+  eio
+  eio_main
+  expect_test_helpers_core.expect_test_helpers_base
+  vcs_git_cli)
  (instrumentation
   (backend bisect_ppx))
  (lint

diff --git a/lib/vcs_test_helpers/test/dune b/lib/vcs_test_helpers/test/dune
@@ -11,16 +11,16 @@
   -open
   Base
   -open
-  Expect_test_helpers
-  -open
   Fpath_base
   -open
+  Expect_test_helpers_base
+  -open
   Or_error.Let_syntax)
  (libraries
   base
   eio
   eio_main
-  expect_test_helpers
+  expect_test_helpers_core.expect_test_helpers_base
   fpath
   fpath-base
   vcs

diff --git a/test/expect/dune b/test/expect/dune
@@ -11,16 +11,16 @@
   -open
   Base
   -open
-  Expect_test_helpers
-  -open
   Fpath_base
   -open
+  Expect_test_helpers_base
+  -open
   Or_error.Let_syntax)
  (libraries
   base
   eio
   eio_main
-  expect_test_helpers
+  expect_test_helpers_core.expect_test_helpers_base
   fpath
   fpath-base
   vcs

diff --git a/vcs-arg.opam b/vcs-arg.opam
@@ -12,7 +12,7 @@ depends: [
   "ocaml" {>= "5.2"}
   "base" {>= "v0.17" & < "v0.18"}
   "bisect_ppx" {dev & >= "2.8.3"}
-  "commandlang" {>= "0.0.1"}
+  "commandlang" {>= "0.0.2"}
   "eio" {>= "1.0"}
   "fpath" {>= "0.7.3"}
   "fpath-base" {>= "0.0.9"}

diff --git a/vcs-command.opam b/vcs-command.opam
@@ -13,11 +13,11 @@ depends: [
   "base" {>= "v0.17" & < "v0.18"}
   "bisect_ppx" {dev & >= "2.8.3"}
   "cmdliner" {= "1.3.0"}
-  "commandlang" {>= "0.0.1"}
-  "commandlang-err" {>= "0.0.1"}
-  "commandlang-to-cmdliner" {>= "0.0.1"}
+  "commandlang" {>= "0.0.2"}
+  "commandlang-to-cmdliner" {>= "0.0.2"}
   "eio" {>= "1.0"}
   "eio_main" {>= "1.0"}
+  "err0" {>= "0.0.2"}
   "fpath" {>= "0.7.3"}
   "fpath-base" {>= "0.0.9"}
   "ppx_compare" {>= "v0.17" & < "v0.18"}

diff --git a/vcs-tests.opam b/vcs-tests.opam
@@ -14,12 +14,13 @@ depends: [
   "base_quickcheck" {>= "v0.17" & < "v0.18"}
   "bisect_ppx" {dev & >= "2.8.3"}
   "cmdliner" {= "1.3.0"}
-  "commandlang" {>= "0.0.1"}
-  "commandlang-err" {>= "0.0.1"}
-  "commandlang-to-cmdliner" {>= "0.0.1"}
+  "commandlang" {>= "0.0.2"}
+  "commandlang-to-cmdliner" {>= "0.0.2"}
   "core" {>= "v0.17" & < "v0.18"}
   "eio" {>= "1.0"}
   "eio_main" {>= "1.0"}
+  "err0" {>= "0.0.2"}
+  "expect_test_helpers_core" {>= "v0.17" & < "v0.18"}
   "fpath" {>= "0.7.3"}
   "fpath-base" {>= "0.0.9"}
   "mdx" {with-doc & >= "2.4"}

diff --git a/vendor/expect-test-helpers/LICENSE b/vendor/expect-test-helpers/LICENSE
diff --git a/vendor/expect-test-helpers/LICENSE.janestreet b/vendor/expect-test-helpers/LICENSE.janestreet
diff --git a/vendor/expect-test-helpers/src/dune b/vendor/expect-test-helpers/src/dune
diff --git a/vendor/expect-test-helpers/src/expect_test_helpers.ml b/vendor/expect-test-helpers/src/expect_test_helpers.ml