From df3512fe1bf4a6498a8af41821a8768fb70b8c66 Mon Sep 17 00:00:00 2001 From: Selasie Hanson Date: Fri, 18 Oct 2019 18:57:17 -0500 Subject: [PATCH 1/8] project upgraded to dune --- dataloader-lwt.opam | 6 +++--- dataloader-lwt/src/dune | 5 +++++ dataloader-lwt/src/jbuild | 8 -------- dataloader-lwt/test/dune | 11 +++++++++++ dataloader-lwt/test/jbuild | 11 ----------- dataloader-lwt/test/test.ml | 2 +- dataloader.opam | 6 +++--- dataloader/src/dune | 5 +++++ dataloader/src/jbuild | 7 ------- dataloader/test/dune | 11 +++++++++++ dataloader/test/jbuild | 11 ----------- dataloader/test/test.ml | 8 ++++---- dune-project | 2 ++ 13 files changed, 45 insertions(+), 48 deletions(-) create mode 100644 dataloader-lwt/src/dune delete mode 100644 dataloader-lwt/src/jbuild create mode 100644 dataloader-lwt/test/dune delete mode 100644 dataloader-lwt/test/jbuild create mode 100644 dataloader/src/dune delete mode 100644 dataloader/src/jbuild create mode 100644 dataloader/test/dune delete mode 100644 dataloader/test/jbuild create mode 100644 dune-project diff --git a/dataloader-lwt.opam b/dataloader-lwt.opam index a6bd310..a5ceb2b 100644 --- a/dataloader-lwt.opam +++ b/dataloader-lwt.opam @@ -5,10 +5,10 @@ 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]] +build: [["dune" "build" "-p" name "-j" jobs]] +build-test: [["dune" "runtest" "-p" name "-j" jobs]] depends: [ - "jbuilder" {build} + "dune" {build & >= "1.0"} "dataloader" "lwt" "alcotest" {test} 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..6e2bc87 --- /dev/null +++ b/dataloader-lwt/test/dune @@ -0,0 +1,11 @@ +(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/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..32f859c 100644 --- a/dataloader.opam +++ b/dataloader.opam @@ -5,10 +5,10 @@ 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]] +build: [["dune" "build" "-p" name "-j" jobs]] +build-test: [["dune" "runtest" "-p" name "-j" jobs]] depends: [ - "jbuilder" {build} + "dune" {build & >= "1.0"} "rresult" "alcotest" {test} ] diff --git a/dataloader/src/dune b/dataloader/src/dune new file mode 100644 index 0000000..74d0dc1 --- /dev/null +++ b/dataloader/src/dune @@ -0,0 +1,5 @@ +(library + (name dataloader) + (public_name dataloader) + (wrapped false) + (libraries result)) 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..fc7d17f --- /dev/null +++ b/dataloader/test/dune @@ -0,0 +1,11 @@ +(executables + (libraries dataloader alcotest) + (names test)) + +(alias + (name runtest) + (package dataloader) + (deps + (:< test.exe)) + (action + (run %{<} -v))) 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) From b29ddf0f82fc39d68215fbd2c5b10bafaca6d744 Mon Sep 17 00:00:00 2001 From: Selasie Hanson Date: Fri, 18 Oct 2019 19:41:29 -0500 Subject: [PATCH 2/8] fix opam files --- dataloader-lwt.opam | 17 +++++++++-------- dataloader.opam | 17 +++++++++-------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/dataloader-lwt.opam b/dataloader-lwt.opam index a5ceb2b..fa2763d 100644 --- a/dataloader-lwt.opam +++ b/dataloader-lwt.opam @@ -1,18 +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: [["dune" "build" "-p" name "-j" jobs]] -build-test: [["dune" "runtest" "-p" name "-j" jobs]] +dev-repo: "git+https://github.com/andreas/ocaml-dataloader.git" +build: [ + ["dune" "build" "-p" name "-j" jobs] + ["dune" "runtest" "-p" name "-j" jobs] {with-test} +] depends: [ + "ocaml" {>= "4.03.0" } "dune" {build & >= "1.0"} "dataloader" "lwt" - "alcotest" {test} -] -available: [ - ocaml-version >= "4.03.0" + "alcotest" ] +synopsis: "Lwt support for dataloader" diff --git a/dataloader.opam b/dataloader.opam index 32f859c..382af89 100644 --- a/dataloader.opam +++ b/dataloader.opam @@ -1,17 +1,18 @@ -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: [["dune" "build" "-p" name "-j" jobs]] -build-test: [["dune" "runtest" "-p" name "-j" jobs]] +dev-repo: "git+https://github.com/andreas/ocaml-dataloader.git" +build: [ + ["dune" "build" "-p" name "-j" jobs] + ["dune" "runtest" "-p" name "-j" jobs] {with-test} +] depends: [ + "ocaml" {>= "4.03.0"} "dune" {build & >= "1.0"} "rresult" - "alcotest" {test} -] -available: [ - ocaml-version >= "4.03.0" + "alcotest" ] +synopsis: "Dataloader for ocaml" From c13ebb6a6cb2dc13beb35be391ea8ce3c6049aea Mon Sep 17 00:00:00 2001 From: SelasieHanson Date: Sun, 24 Nov 2019 20:49:07 -0600 Subject: [PATCH 3/8] Update dataloader-lwt.opam annotate alcotest with `{with-test}` variable Co-Authored-By: Andreas Garnaes --- dataloader-lwt.opam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dataloader-lwt.opam b/dataloader-lwt.opam index fa2763d..fe93280 100644 --- a/dataloader-lwt.opam +++ b/dataloader-lwt.opam @@ -14,6 +14,6 @@ depends: [ "dune" {build & >= "1.0"} "dataloader" "lwt" - "alcotest" + "alcotest" {with-test} ] synopsis: "Lwt support for dataloader" From 1b149e37ab4a22373aeeaf29c6824c870bd3f72f Mon Sep 17 00:00:00 2001 From: SelasieHanson Date: Sun, 24 Nov 2019 20:50:13 -0600 Subject: [PATCH 4/8] Update dataloader.opam test annotation for alcotest Co-Authored-By: Andreas Garnaes --- dataloader.opam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dataloader.opam b/dataloader.opam index 382af89..5511ff5 100644 --- a/dataloader.opam +++ b/dataloader.opam @@ -13,6 +13,6 @@ depends: [ "ocaml" {>= "4.03.0"} "dune" {build & >= "1.0"} "rresult" - "alcotest" + "alcotest" {with-test} ] synopsis: "Dataloader for ocaml" From e81d2c314dbb6e5f77277d6c5123949725bf7f99 Mon Sep 17 00:00:00 2001 From: Selasie Hanson Date: Sun, 24 Nov 2019 20:57:32 -0600 Subject: [PATCH 5/8] Removes unused dependencies. Simplifies dune test files --- dataloader-lwt/test/dune | 12 ++---------- dataloader.opam | 1 - dataloader/src/dune | 3 +-- dataloader/test/dune | 12 ++---------- 4 files changed, 5 insertions(+), 23 deletions(-) diff --git a/dataloader-lwt/test/dune b/dataloader-lwt/test/dune index 6e2bc87..74df608 100644 --- a/dataloader-lwt/test/dune +++ b/dataloader-lwt/test/dune @@ -1,11 +1,3 @@ -(executables +(test (libraries dataloader-lwt lwt.unix alcotest) - (names test)) - -(alias - (name runtest) - (package dataloader-lwt) - (deps - (:< test.exe)) - (action - (run %{<} -v))) + (name test)) diff --git a/dataloader.opam b/dataloader.opam index 5511ff5..c2a2660 100644 --- a/dataloader.opam +++ b/dataloader.opam @@ -12,7 +12,6 @@ build: [ depends: [ "ocaml" {>= "4.03.0"} "dune" {build & >= "1.0"} - "rresult" "alcotest" {with-test} ] synopsis: "Dataloader for ocaml" diff --git a/dataloader/src/dune b/dataloader/src/dune index 74d0dc1..f1ad5d5 100644 --- a/dataloader/src/dune +++ b/dataloader/src/dune @@ -1,5 +1,4 @@ (library (name dataloader) (public_name dataloader) - (wrapped false) - (libraries result)) + (wrapped false)) diff --git a/dataloader/test/dune b/dataloader/test/dune index fc7d17f..4fc12cd 100644 --- a/dataloader/test/dune +++ b/dataloader/test/dune @@ -1,11 +1,3 @@ -(executables +(test (libraries dataloader alcotest) - (names test)) - -(alias - (name runtest) - (package dataloader) - (deps - (:< test.exe)) - (action - (run %{<} -v))) + (name test)) From 5515b2ab52ed28b717fec41cb1d3aadd770e8f56 Mon Sep 17 00:00:00 2001 From: Selasie Hanson Date: Sun, 24 Nov 2019 22:41:03 -0600 Subject: [PATCH 6/8] install before runtest --- dataloader-lwt.opam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dataloader-lwt.opam b/dataloader-lwt.opam index fe93280..9db90fd 100644 --- a/dataloader-lwt.opam +++ b/dataloader-lwt.opam @@ -7,7 +7,7 @@ bug-reports: "https://github.com/andreas/ocaml-dataloader/issues" dev-repo: "git+https://github.com/andreas/ocaml-dataloader.git" build: [ ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} + ["dune" "runtest" "-p" name "-j" jobs "@install" "@runtest" {with-test}] ] depends: [ "ocaml" {>= "4.03.0" } From f5a3c0c173d68a85777b8e5adac9b4ca32d03bf7 Mon Sep 17 00:00:00 2001 From: Selasie Hanson Date: Mon, 25 Nov 2019 00:11:40 -0600 Subject: [PATCH 7/8] try pinning --- dataloader-lwt.opam | 3 ++- dataloader.opam | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dataloader-lwt.opam b/dataloader-lwt.opam index 9db90fd..24b51ad 100644 --- a/dataloader-lwt.opam +++ b/dataloader-lwt.opam @@ -6,8 +6,9 @@ doc: "https://andreas.github.io/ocaml-dataloader/" bug-reports: "https://github.com/andreas/ocaml-dataloader/issues" dev-repo: "git+https://github.com/andreas/ocaml-dataloader.git" build: [ + ["dune" "subst"] {pinned} ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs "@install" "@runtest" {with-test}] + ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] depends: [ "ocaml" {>= "4.03.0" } diff --git a/dataloader.opam b/dataloader.opam index c2a2660..7d8d326 100644 --- a/dataloader.opam +++ b/dataloader.opam @@ -6,6 +6,7 @@ doc: "https://andreas.github.io/ocaml-dataloader/" bug-reports: "https://github.com/andreas/ocaml-dataloader/issues" dev-repo: "git+https://github.com/andreas/ocaml-dataloader.git" build: [ + ["dune" "subst"] {pinned} ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] From 133ef8df91545c683d86568c8452636d471246f8 Mon Sep 17 00:00:00 2001 From: Selasie Hanson Date: Sun, 1 Dec 2019 23:53:41 -0600 Subject: [PATCH 8/8] add version numbers --- dataloader-lwt.opam | 1 + dataloader.opam | 1 + 2 files changed, 2 insertions(+) diff --git a/dataloader-lwt.opam b/dataloader-lwt.opam index 24b51ad..b5213fb 100644 --- a/dataloader-lwt.opam +++ b/dataloader-lwt.opam @@ -5,6 +5,7 @@ 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: "git+https://github.com/andreas/ocaml-dataloader.git" +version: "0.0.1" build: [ ["dune" "subst"] {pinned} ["dune" "build" "-p" name "-j" jobs] diff --git a/dataloader.opam b/dataloader.opam index 7d8d326..4ac7b88 100644 --- a/dataloader.opam +++ b/dataloader.opam @@ -5,6 +5,7 @@ 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: "git+https://github.com/andreas/ocaml-dataloader.git" +version: "0.0.1" build: [ ["dune" "subst"] {pinned} ["dune" "build" "-p" name "-j" jobs]