diff --git a/dataloader-lwt.opam b/dataloader-lwt.opam index a6bd310..b5213fb 100644 --- a/dataloader-lwt.opam +++ b/dataloader-lwt.opam @@ -1,18 +1,21 @@ -opam-version: "1.2" +opam-version: "2.0" maintainer: "Andreas Garnaes " authors: "Andreas Garnaes " homepage: "https://github.com/andreas/ocaml-dataloader" doc: "https://andreas.github.io/ocaml-dataloader/" bug-reports: "https://github.com/andreas/ocaml-dataloader/issues" -dev-repo: "https://github.com/andreas/ocaml-dataloader.git" -build: [["jbuilder" "build" "-p" name "-j" jobs]] -build-test: [["jbuilder" "runtest" "-p" name "-j" jobs]] +dev-repo: "git+https://github.com/andreas/ocaml-dataloader.git" +version: "0.0.1" +build: [ + ["dune" "subst"] {pinned} + ["dune" "build" "-p" name "-j" jobs] + ["dune" "runtest" "-p" name "-j" jobs] {with-test} +] depends: [ - "jbuilder" {build} + "ocaml" {>= "4.03.0" } + "dune" {build & >= "1.0"} "dataloader" "lwt" - "alcotest" {test} -] -available: [ - ocaml-version >= "4.03.0" + "alcotest" {with-test} ] +synopsis: "Lwt support for dataloader" diff --git a/dataloader-lwt/src/dune b/dataloader-lwt/src/dune new file mode 100644 index 0000000..3ac6d53 --- /dev/null +++ b/dataloader-lwt/src/dune @@ -0,0 +1,5 @@ +(library + (name dataloader_lwt) + (public_name dataloader-lwt) + (wrapped false) + (libraries dataloader lwt)) diff --git a/dataloader-lwt/src/jbuild b/dataloader-lwt/src/jbuild deleted file mode 100644 index ed7beb1..0000000 --- a/dataloader-lwt/src/jbuild +++ /dev/null @@ -1,8 +0,0 @@ -(jbuild_version 1) - -(library - ((name dataloader_lwt) - (public_name dataloader-lwt) - (wrapped false) - (libraries (dataloader lwt)))) - diff --git a/dataloader-lwt/test/dune b/dataloader-lwt/test/dune new file mode 100644 index 0000000..74df608 --- /dev/null +++ b/dataloader-lwt/test/dune @@ -0,0 +1,3 @@ +(test + (libraries dataloader-lwt lwt.unix alcotest) + (name test)) diff --git a/dataloader-lwt/test/jbuild b/dataloader-lwt/test/jbuild deleted file mode 100644 index e96b3a4..0000000 --- a/dataloader-lwt/test/jbuild +++ /dev/null @@ -1,11 +0,0 @@ -(jbuild_version 1) - -(executables - ((libraries (dataloader-lwt lwt.unix alcotest)) - (names (test)))) - -(alias - ((name runtest) - (package dataloader-lwt) - (deps (test.exe)) - (action (run ${<} -v)))) diff --git a/dataloader-lwt/test/test.ml b/dataloader-lwt/test/test.ml index 70c253a..4976d1c 100644 --- a/dataloader-lwt/test/test.ml +++ b/dataloader-lwt/test/test.ml @@ -26,7 +26,7 @@ let suite = [ |> Lwt_main.run ); ("failed load", `Quick, fun () -> - let loader = Dataloader_lwt.create ~load:(fun keys -> + let loader = Dataloader_lwt.create ~load:(fun _keys -> Lwt_result.fail (Failure "boom") ) in List.map (fun i -> diff --git a/dataloader.opam b/dataloader.opam index bbe393e..4ac7b88 100644 --- a/dataloader.opam +++ b/dataloader.opam @@ -1,17 +1,19 @@ -opam-version: "1.2" +opam-version: "2.0" maintainer: "Andreas Garnaes " authors: "Andreas Garnaes " homepage: "https://github.com/andreas/ocaml-dataloader" doc: "https://andreas.github.io/ocaml-dataloader/" bug-reports: "https://github.com/andreas/ocaml-dataloader/issues" -dev-repo: "https://github.com/andreas/ocaml-dataloader.git" -build: [["jbuilder" "build" "-p" name "-j" jobs]] -build-test: [["jbuilder" "runtest" "-p" name "-j" jobs]] -depends: [ - "jbuilder" {build} - "rresult" - "alcotest" {test} +dev-repo: "git+https://github.com/andreas/ocaml-dataloader.git" +version: "0.0.1" +build: [ + ["dune" "subst"] {pinned} + ["dune" "build" "-p" name "-j" jobs] + ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] -available: [ - ocaml-version >= "4.03.0" +depends: [ + "ocaml" {>= "4.03.0"} + "dune" {build & >= "1.0"} + "alcotest" {with-test} ] +synopsis: "Dataloader for ocaml" diff --git a/dataloader/src/dune b/dataloader/src/dune new file mode 100644 index 0000000..f1ad5d5 --- /dev/null +++ b/dataloader/src/dune @@ -0,0 +1,4 @@ +(library + (name dataloader) + (public_name dataloader) + (wrapped false)) diff --git a/dataloader/src/jbuild b/dataloader/src/jbuild deleted file mode 100644 index 5d05c55..0000000 --- a/dataloader/src/jbuild +++ /dev/null @@ -1,7 +0,0 @@ -(jbuild_version 1) - -(library - ((name dataloader) - (public_name dataloader) - (wrapped false) - (libraries (result)))) diff --git a/dataloader/test/dune b/dataloader/test/dune new file mode 100644 index 0000000..4fc12cd --- /dev/null +++ b/dataloader/test/dune @@ -0,0 +1,3 @@ +(test + (libraries dataloader alcotest) + (name test)) diff --git a/dataloader/test/jbuild b/dataloader/test/jbuild deleted file mode 100644 index 1c2f7ee..0000000 --- a/dataloader/test/jbuild +++ /dev/null @@ -1,11 +0,0 @@ -(jbuild_version 1) - -(executables - ((libraries (dataloader alcotest)) - (names (test)))) - -(alias - ((name runtest) - (package dataloader) - (deps (test.exe)) - (action (run ${<} -v)))) diff --git a/dataloader/test/test.ml b/dataloader/test/test.ml index 9926ef6..c0914c2 100644 --- a/dataloader/test/test.ml +++ b/dataloader/test/test.ml @@ -1,6 +1,6 @@ let suite = [ ("load one", `Quick, fun () -> - let loader = Dataloader.create ~load:(fun keys fail ok -> + let loader = Dataloader.create ~load:(fun keys _fail ok -> ok keys ) in Dataloader.load loader 1 @@ -11,7 +11,7 @@ let suite = [ ); ("load n", `Quick, fun () -> let loader_calls = ref 0 in - let loader = Dataloader.create ~load:(fun keys fail ok -> + let loader = Dataloader.create ~load:(fun keys _fail ok -> loader_calls := !loader_calls + 1; ok keys ) in @@ -24,13 +24,13 @@ let suite = [ Alcotest.(check int) "Load calls" 1 !loader_calls ); ("failed load", `Quick, fun () -> - let loader = Dataloader.create ~load:(fun keys fail ok -> + let loader = Dataloader.create ~load:(fun _keys fail _ok -> fail (Failure "boom") ) in List.iter (fun i -> Dataloader.load loader i (fun _ -> ()) - (fun value -> Alcotest.failf "Expected failure, got %d" i) + (fun _value -> Alcotest.failf "Expected failure, got %d" i) ) [1;2;3;4;5;6;7;8;9;10]; Dataloader.trigger loader; ) diff --git a/dune-project b/dune-project new file mode 100644 index 0000000..b8d3ba5 --- /dev/null +++ b/dune-project @@ -0,0 +1,2 @@ +(lang dune 1.0) +(name dataloader)