Skip to content

Commit e64d98e

Browse files
authored
Merge pull request #148 from mbarbin/deps-tweaks
Deps tweaks
2 parents fd963e1 + 839cc29 commit e64d98e

10 files changed

Lines changed: 5 additions & 40 deletions

File tree

dune-project

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -60,16 +60,10 @@
6060
(>= 5.2))
6161
(base
6262
(>= v0.17))
63-
(fpath
64-
(>= 0.7.3))
65-
(fpath-sexp0
66-
(>= 0.4.0))
6763
(pp
6864
(>= 2.0.0))
6965
(pplumbing-err
7066
(>= 0.0.16))
71-
(pplumbing-pp-tty
72-
(>= 0.0.16))
7367
(ppx_hash
7468
(>= v0.17))
7569
(ppxlib
@@ -89,7 +83,6 @@
8983
(cmdlang-cmdliner-err-runner
9084
(>= 0.0.16))
9185
(conf-git :with-test)
92-
(conf-hg :with-test)
9386
(dune-build-info
9487
(>= 3.17))
9588
(fpath
@@ -193,7 +186,6 @@
193186
(depends
194187
(ocaml
195188
(>= 5.2))
196-
(conf-hg :with-test)
197189
(eio
198190
(>= 1.0))
199191
(fpath
@@ -249,7 +241,6 @@
249241
(depends
250242
(ocaml
251243
(>= 4.14))
252-
(conf-hg :with-test)
253244
(fpath
254245
(>= 0.7.3))
255246
(fpath-sexp0
@@ -356,14 +347,6 @@
356347
(base
357348
(>= v0.17))
358349
conf-git
359-
(eio
360-
(>= 1.0))
361-
(eio_main
362-
(>= 1.0))
363-
(fpath
364-
(>= 0.7.3))
365-
(fpath-sexp0
366-
(>= 0.4.0))
367350
(pp
368351
(>= 2.0.0))
369352
(pplumbing-err
@@ -396,6 +379,8 @@
396379
(>= 1.3.0))
397380
conf-git
398381
conf-hg
382+
(ppx_expect
383+
(>= v0.17))
399384
(ppx_js_style
400385
(>= v0.17))
401386
(ppxlib

src/volgo-base/dune

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,10 @@
1010
-open
1111
Base
1212
-open
13-
Fpath_sexp0
14-
-open
1513
Pplumbing_err
1614
-open
1715
Volgo)
18-
(libraries base fpath fpath-sexp0 pp pplumbing-err volgo)
16+
(libraries base pplumbing-err volgo)
1917
(instrumentation
2018
(backend bisect_ppx))
2119
(lint

test/volgo-base/dune

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,13 @@
1616
-open
1717
Base
1818
-open
19-
Fpath_sexp0
20-
-open
2119
Pplumbing_err
2220
-open
2321
Volgo
2422
-open
2523
Volgo_stdlib)
2624
(libraries
2725
base
28-
eio
29-
eio_main
30-
fpath
31-
fpath-sexp0
3226
pp
3327
pplumbing-err
3428
ppx_hash.runtime-lib

test/volgo-base/test__refs.ml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,7 @@
77
module Vcs = Volgo_base.Vcs
88

99
let%expect_test "parse_exn" =
10-
Eio_main.run
11-
@@ fun env ->
12-
let path = Eio.Path.(Eio.Stdenv.fs env / "super-master-mind.refs") in
13-
let contents = Eio.Path.load path in
10+
let contents = In_channel.with_open_bin "super-master-mind.refs" In_channel.input_all in
1411
let lines = String.split_lines contents in
1512
let refs = Volgo_git_backend.Refs.parse_lines_exn ~lines in
1613
print_dyn

volgo-base-tests.opam

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,6 @@ depends: [
1212
"ocaml" {>= "5.2"}
1313
"base" {>= "v0.17"}
1414
"conf-git"
15-
"eio" {>= "1.0"}
16-
"eio_main" {>= "1.0"}
17-
"fpath" {>= "0.7.3"}
18-
"fpath-sexp0" {>= "0.4.0"}
1915
"pp" {>= "2.0.0"}
2016
"pplumbing-err" {>= "0.0.16"}
2117
"ppx_expect" {>= "v0.17"}

volgo-base.opam

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,8 @@ depends: [
1111
"dune" {>= "3.17"}
1212
"ocaml" {>= "5.2"}
1313
"base" {>= "v0.17"}
14-
"fpath" {>= "0.7.3"}
15-
"fpath-sexp0" {>= "0.4.0"}
1614
"pp" {>= "2.0.0"}
1715
"pplumbing-err" {>= "0.0.16"}
18-
"pplumbing-pp-tty" {>= "0.0.16"}
1916
"ppx_hash" {>= "v0.17"}
2017
"ppxlib" {>= "0.33"}
2118
"volgo" {= version}

volgo-dev.opam

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ depends: [
1515
"cmdliner" {>= "1.3.0"}
1616
"conf-git"
1717
"conf-hg"
18+
"ppx_expect" {>= "v0.17"}
1819
"ppx_js_style" {>= "v0.17"}
1920
"ppxlib" {>= "0.33"}
2021
"vcs-test-helpers" {= version}

volgo-hg-eio.opam

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ bug-reports: "https://github.com/mbarbin/vcs/issues"
1111
depends: [
1212
"dune" {>= "3.17"}
1313
"ocaml" {>= "5.2"}
14-
"conf-hg" {with-test}
1514
"eio" {>= "1.0"}
1615
"fpath" {>= "0.7.3"}
1716
"fpath-sexp0" {>= "0.4.0"}

volgo-hg-unix.opam

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ bug-reports: "https://github.com/mbarbin/vcs/issues"
1111
depends: [
1212
"dune" {>= "3.17"}
1313
"ocaml" {>= "4.14"}
14-
"conf-hg" {with-test}
1514
"fpath" {>= "0.7.3"}
1615
"fpath-sexp0" {>= "0.4.0"}
1716
"pp" {>= "2.0.0"}

volgo-vcs.opam

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ depends: [
1414
"cmdlang" {>= "0.0.9"}
1515
"cmdlang-cmdliner-err-runner" {>= "0.0.16"}
1616
"conf-git" {with-test}
17-
"conf-hg" {with-test}
1817
"dune-build-info" {>= "3.17"}
1918
"fpath" {>= "0.7.3"}
2019
"fpath-sexp0" {>= "0.4.0"}

0 commit comments

Comments
 (0)