diff --git a/CHANGES.md b/CHANGES.md index a11aff0..6c17b4e 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,18 @@ +## 0.0.8 (unreleased) + +### Added + +### Changed + +- Split packages +- Use `expect_test_helpers_core.expect_test_helpers_base` + +### Deprecated + +### Fixed + +### Removed + ## 0.0.7 (2024-07-26) ### Added diff --git a/dune-project b/dune-project index 9f57546..ecaf78b 100644 --- a/dune-project +++ b/dune-project @@ -29,7 +29,133 @@ (and :dev (>= 2.8.3))) - (expect-test-helpers + (patdiff + (and + (>= v0.17) + (< v0.18))) + (ppx_compare + (and + (>= v0.17) + (< v0.18))) + (ppx_enumerate + (and + (>= v0.17) + (< v0.18))) + (ppx_hash + (and + (>= v0.17) + (< v0.18))) + (ppx_here + (and + (>= v0.17) + (< v0.18))) + (ppx_js_style + (and + :dev + (>= v0.17) + (< v0.18))) + (ppx_let + (and + (>= v0.17) + (< v0.18))) + (ppx_sexp_conv + (and + (>= v0.17) + (< v0.18))) + (ppx_sexp_value + (and + (>= v0.17) + (< v0.18))) + (ppxlib + (>= 0.33)) + (textutils + (and + (>= v0.17) + (< v0.18))))) + +(package + (name fingerboard-system) + (synopsis "Package for Fingerboard systems") + (depends + (ocaml + (>= 5.2)) + (base + (and + (>= v0.17) + (< v0.18))) + (bisect_ppx + (and + :dev + (>= 2.8.3))) + (expect_test_helpers_core + (and + (>= v0.17) + (< v0.18))) + (fingerboard + (= :version)) + (patdiff + (and + (>= v0.17) + (< v0.18))) + (ppx_compare + (and + (>= v0.17) + (< v0.18))) + (ppx_enumerate + (and + (>= v0.17) + (< v0.18))) + (ppx_expect + (and + (>= v0.17) + (< v0.18))) + (ppx_hash + (and + (>= v0.17) + (< v0.18))) + (ppx_here + (and + (>= v0.17) + (< v0.18))) + (ppx_js_style + (and + :dev + (>= v0.17) + (< v0.18))) + (ppx_let + (and + (>= v0.17) + (< v0.18))) + (ppx_sexp_conv + (and + (>= v0.17) + (< v0.18))) + (ppx_sexp_value + (and + (>= v0.17) + (< v0.18))) + (ppxlib + (>= 0.33)) + (textutils + (and + (>= v0.17) + (< v0.18))))) + +(package + (name fingerboard-tests) + (synopsis "Tests for fingerboard") + (depends + (ocaml + (>= 5.2)) + (base + (and + (>= v0.17) + (< v0.18))) + (bisect_ppx + (and + :dev + (>= 2.8.3))) + (expect_test_helpers_core (and (>= v0.17) (< v0.18))) @@ -47,7 +173,6 @@ (< v0.18))) (ppx_expect (and - :with-test (>= v0.17) (< v0.18))) (ppx_hash diff --git a/fingerboard-system.opam b/fingerboard-system.opam new file mode 100644 index 0000000..47d450c --- /dev/null +++ b/fingerboard-system.opam @@ -0,0 +1,45 @@ +# This file is generated by dune, edit dune-project instead +opam-version: "2.0" +synopsis: "Package for Fingerboard systems" +maintainer: ["Mathieu Barbin"] +authors: ["Mathieu Barbin"] +license: "AGPL-3.0-or-later" +homepage: "https://github.com/mbarbin/fingerboard" +doc: "https://mbarbin.github.io/fingerboard/" +bug-reports: "https://github.com/mbarbin/fingerboard/issues" +depends: [ + "dune" {>= "3.16"} + "ocaml" {>= "5.2"} + "base" {>= "v0.17" & < "v0.18"} + "bisect_ppx" {dev & >= "2.8.3"} + "expect_test_helpers_core" {>= "v0.17" & < "v0.18"} + "fingerboard" {= version} + "patdiff" {>= "v0.17" & < "v0.18"} + "ppx_compare" {>= "v0.17" & < "v0.18"} + "ppx_enumerate" {>= "v0.17" & < "v0.18"} + "ppx_expect" {>= "v0.17" & < "v0.18"} + "ppx_hash" {>= "v0.17" & < "v0.18"} + "ppx_here" {>= "v0.17" & < "v0.18"} + "ppx_js_style" {dev & >= "v0.17" & < "v0.18"} + "ppx_let" {>= "v0.17" & < "v0.18"} + "ppx_sexp_conv" {>= "v0.17" & < "v0.18"} + "ppx_sexp_value" {>= "v0.17" & < "v0.18"} + "ppxlib" {>= "0.33"} + "textutils" {>= "v0.17" & < "v0.18"} + "odoc" {with-doc} +] +build: [ + ["dune" "subst"] {dev} + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" + "@runtest" {with-test} + "@doc" {with-doc} + ] +] +dev-repo: "git+https://github.com/mbarbin/fingerboard.git" diff --git a/fingerboard-tests.opam b/fingerboard-tests.opam new file mode 100644 index 0000000..ca9bacf --- /dev/null +++ b/fingerboard-tests.opam @@ -0,0 +1,44 @@ +# This file is generated by dune, edit dune-project instead +opam-version: "2.0" +synopsis: "Tests for fingerboard" +maintainer: ["Mathieu Barbin"] +authors: ["Mathieu Barbin"] +license: "AGPL-3.0-or-later" +homepage: "https://github.com/mbarbin/fingerboard" +doc: "https://mbarbin.github.io/fingerboard/" +bug-reports: "https://github.com/mbarbin/fingerboard/issues" +depends: [ + "dune" {>= "3.16"} + "ocaml" {>= "5.2"} + "base" {>= "v0.17" & < "v0.18"} + "bisect_ppx" {dev & >= "2.8.3"} + "expect_test_helpers_core" {>= "v0.17" & < "v0.18"} + "patdiff" {>= "v0.17" & < "v0.18"} + "ppx_compare" {>= "v0.17" & < "v0.18"} + "ppx_enumerate" {>= "v0.17" & < "v0.18"} + "ppx_expect" {>= "v0.17" & < "v0.18"} + "ppx_hash" {>= "v0.17" & < "v0.18"} + "ppx_here" {>= "v0.17" & < "v0.18"} + "ppx_js_style" {dev & >= "v0.17" & < "v0.18"} + "ppx_let" {>= "v0.17" & < "v0.18"} + "ppx_sexp_conv" {>= "v0.17" & < "v0.18"} + "ppx_sexp_value" {>= "v0.17" & < "v0.18"} + "ppxlib" {>= "0.33"} + "textutils" {>= "v0.17" & < "v0.18"} + "odoc" {with-doc} +] +build: [ + ["dune" "subst"] {dev} + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" + "@runtest" {with-test} + "@doc" {with-doc} + ] +] +dev-repo: "git+https://github.com/mbarbin/fingerboard.git" diff --git a/fingerboard.opam b/fingerboard.opam index d1905ac..d34b1fe 100644 --- a/fingerboard.opam +++ b/fingerboard.opam @@ -12,11 +12,9 @@ depends: [ "ocaml" {>= "5.2"} "base" {>= "v0.17" & < "v0.18"} "bisect_ppx" {dev & >= "2.8.3"} - "expect-test-helpers" {>= "v0.17" & < "v0.18"} "patdiff" {>= "v0.17" & < "v0.18"} "ppx_compare" {>= "v0.17" & < "v0.18"} "ppx_enumerate" {>= "v0.17" & < "v0.18"} - "ppx_expect" {with-test & >= "v0.17" & < "v0.18"} "ppx_hash" {>= "v0.17" & < "v0.18"} "ppx_here" {>= "v0.17" & < "v0.18"} "ppx_js_style" {dev & >= "v0.17" & < "v0.18"} diff --git a/systems/cello/e12/dune b/systems/cello/e12/dune index df0af43..5dc2bc1 100644 --- a/systems/cello/e12/dune +++ b/systems/cello/e12/dune @@ -1,5 +1,6 @@ (library (name fingerboard_cello_system_e12) + (public_name fingerboard-system.cello.e12) (flags :standard -w @@ -9,10 +10,14 @@ -open Base -open - Expect_test_helpers + Expect_test_helpers_base -open Fingerboard) - (libraries base expect-test-helpers fingerboard textutils.ascii_table) + (libraries + base + expect_test_helpers_core.expect_test_helpers_base + fingerboard + textutils.ascii_table) (inline_tests) (instrumentation (backend bisect_ppx)) diff --git a/systems/cello/e19/dune b/systems/cello/e19/dune index f3c507b..6f8e77a 100644 --- a/systems/cello/e19/dune +++ b/systems/cello/e19/dune @@ -1,5 +1,6 @@ (library (name fingerboard_cello_system_e19) + (public_name fingerboard-system.cello.e19) (flags :standard -w @@ -9,10 +10,14 @@ -open Base -open - Expect_test_helpers + Expect_test_helpers_base -open Fingerboard) - (libraries base expect-test-helpers fingerboard textutils.ascii_table) + (libraries + base + expect_test_helpers_core.expect_test_helpers_base + fingerboard + textutils.ascii_table) (inline_tests) (instrumentation (backend bisect_ppx)) diff --git a/systems/cello/e31/dune b/systems/cello/e31/dune index 6345266..491b513 100644 --- a/systems/cello/e31/dune +++ b/systems/cello/e31/dune @@ -1,5 +1,6 @@ (library (name fingerboard_cello_system_e31) + (public_name fingerboard-system.cello.e31) (flags :standard -w @@ -9,10 +10,14 @@ -open Base -open - Expect_test_helpers + Expect_test_helpers_base -open Fingerboard) - (libraries base expect-test-helpers fingerboard textutils.ascii_table) + (libraries + base + expect_test_helpers_core.expect_test_helpers_base + fingerboard + textutils.ascii_table) (inline_tests) (instrumentation (backend bisect_ppx)) diff --git a/systems/cello/e53/dune b/systems/cello/e53/dune index 1933852..0794ca4 100644 --- a/systems/cello/e53/dune +++ b/systems/cello/e53/dune @@ -1,5 +1,6 @@ (library (name fingerboard_cello_system_e53) + (public_name fingerboard-system.cello.e53) (flags :standard -w @@ -9,10 +10,14 @@ -open Base -open - Expect_test_helpers + Expect_test_helpers_base -open Fingerboard) - (libraries base expect-test-helpers fingerboard textutils.ascii_table) + (libraries + base + expect_test_helpers_core.expect_test_helpers_base + fingerboard + textutils.ascii_table) (inline_tests) (instrumentation (backend bisect_ppx)) diff --git a/systems/cello/e55/dune b/systems/cello/e55/dune index 89cbaa7..c7e5275 100644 --- a/systems/cello/e55/dune +++ b/systems/cello/e55/dune @@ -1,5 +1,6 @@ (library (name fingerboard_cello_system_e55) + (public_name fingerboard-system.cello.e55) (flags :standard -w @@ -9,10 +10,14 @@ -open Base -open - Expect_test_helpers + Expect_test_helpers_base -open Fingerboard) - (libraries base expect-test-helpers fingerboard textutils.ascii_table) + (libraries + base + expect_test_helpers_core.expect_test_helpers_base + fingerboard + textutils.ascii_table) (inline_tests) (instrumentation (backend bisect_ppx)) diff --git a/systems/cello/just/dune b/systems/cello/just/dune index 5c5e376..e8c1afd 100644 --- a/systems/cello/just/dune +++ b/systems/cello/just/dune @@ -1,5 +1,6 @@ (library (name fingerboard_cello_system_just) + (public_name fingerboard-system.cello.just) (flags :standard -w @@ -9,10 +10,14 @@ -open Base -open - Expect_test_helpers + Expect_test_helpers_base -open Fingerboard) - (libraries base expect-test-helpers fingerboard textutils.ascii_table) + (libraries + base + expect_test_helpers_core.expect_test_helpers_base + fingerboard + textutils.ascii_table) (inline_tests) (instrumentation (backend bisect_ppx)) diff --git a/systems/cello/pythagorean/dune b/systems/cello/pythagorean/dune index 5a6cf21..0db9e33 100644 --- a/systems/cello/pythagorean/dune +++ b/systems/cello/pythagorean/dune @@ -1,5 +1,6 @@ (library (name fingerboard_cello_system_pythagorean) + (public_name fingerboard-system.cello.pythagorean) (flags :standard -w @@ -9,10 +10,14 @@ -open Base -open - Expect_test_helpers + Expect_test_helpers_base -open Fingerboard) - (libraries base expect-test-helpers fingerboard textutils.ascii_table) + (libraries + base + expect_test_helpers_core.expect_test_helpers_base + fingerboard + textutils.ascii_table) (inline_tests) (instrumentation (backend bisect_ppx)) diff --git a/systems/edos/dune b/systems/edos/dune index 0482098..547ebd7 100644 --- a/systems/edos/dune +++ b/systems/edos/dune @@ -1,5 +1,6 @@ (library (name fingerboard_edo_systems) + (public_name fingerboard-system.edo) (flags :standard -w @@ -9,12 +10,12 @@ -open Base -open - Expect_test_helpers + Expect_test_helpers_base -open Fingerboard) (libraries base - expect-test-helpers + expect_test_helpers_core.expect_test_helpers_base fingerboard patdiff.expect_test_patdiff textutils.ascii_table) diff --git a/test/dune b/test/dune index 5ae29af..af34854 100644 --- a/test/dune +++ b/test/dune @@ -1,5 +1,6 @@ (library (name fingerboard_test) + (public_name fingerboard-tests.fingerboard_test) (flags :standard -w @@ -9,12 +10,12 @@ -open Base -open - Expect_test_helpers + Expect_test_helpers_base -open Fingerboard) (libraries base - expect-test-helpers + expect_test_helpers_core.expect_test_helpers_base fingerboard fingerboard_cello_system_e12 fingerboard_cello_system_e19