Skip to content

WIP: Transition to Eio #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 6 commits into
base: master
Choose a base branch
from
Draft

WIP: Transition to Eio #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1fc0088
Migrate from Lwt_log to Logs
Julow Jun 24, 2025
0798e8e
Find implicit forks
Julow Jun 24, 2025
12def38
Add a testsuite
Julow Jun 26, 2025
c28c328
Merge branch 'cram-tests' into to-eio
Julow Jun 26, 2025
6531af2
Automatic changes done with lwt-to-direct-style
Julow Jun 27, 2025
423a9ce
Manual changes
Julow Jun 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions dune-project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
(name ocsipersist)

(generate_opam_files true)
(cram enable)

(maintainers "Jan Rochel <jan@besport.com>")
(authors "Ocsigen team <dev@ocsigen.org>")
Expand All @@ -14,7 +15,7 @@
(description "This is an virtual library defining a unified frontend for a number of key-value storage implementations. Implementations of the following backends currently exist: DBM, PostgreSQL, SQLite.")
(depends
(ocsipersist-lib (= :version))
(lwt (>= 4.2.0)))
eio)
(conflicts
(ocsipersist-dbm (<> :version))
(ocsipersist-pgsql (<> :version))
Expand All @@ -27,7 +28,7 @@
(depends
(ocsipersist (= :version))
(lwt (>= 4.2.0))
lwt_log
logs
dbm))

(package
Expand All @@ -44,7 +45,7 @@
(synopsis "Persistent key/value storage for OCaml - support library")
(description "This library defines signatures and auxiliary tools for defining backends for the Ocsipersist frontent. Ocsipersist is used pervasively in Eliom/Ocsigen to handle sessions and references. It can be used as an extension for ocsigenserver or as a library. Implementations of the following backends currently exist: DBM, PostgreSQL, SQLite.")
(depends
(lwt (>= 4.2.0))))
eio))

(package
(name ocsipersist-pgsql)
Expand All @@ -54,7 +55,7 @@
(ocaml (>= 4.08))
(ocsipersist (= :version))
(lwt (>= 4.2.0))
lwt_log
logs
pgocaml))

(package
Expand All @@ -71,8 +72,8 @@
(synopsis "Persistent key/value storage for OCaml using SQLite")
(description "This library provides a SQLite backend for the unified key/value storage frontend as defined in the ocsipersist package.")
(depends
(lwt (>= 4.2.0))
lwt_log
eio
logs
ocsipersist
sqlite3))

Expand Down
2 changes: 1 addition & 1 deletion ocsipersist-dbm.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ depends: [
"dune" {>= "2.8"}
"ocsipersist" {= version}
"lwt" {>= "4.2.0"}
"lwt_log"
"logs"
"dbm"
"odoc" {with-doc}
]
Expand Down
2 changes: 1 addition & 1 deletion ocsipersist-lib.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ homepage: "https://github.com/ocsigen/ocsipersist"
bug-reports: "https://github.com/ocsigen/ocsipersist/issues"
depends: [
"dune" {>= "2.8"}
"lwt" {>= "4.2.0"}
"eio"
"odoc" {with-doc}
]
build: [
Expand Down
2 changes: 1 addition & 1 deletion ocsipersist-pgsql.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ depends: [
"ocaml" {>= "4.08"}
"ocsipersist" {= version}
"lwt" {>= "4.2.0"}
"lwt_log"
"logs"
"pgocaml"
"odoc" {with-doc}
]
Expand Down
4 changes: 2 additions & 2 deletions ocsipersist-sqlite.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ homepage: "https://github.com/ocsigen/ocsipersist"
bug-reports: "https://github.com/ocsigen/ocsipersist/issues"
depends: [
"dune" {>= "2.8"}
"lwt" {>= "4.2.0"}
"lwt_log"
"eio"
"logs"
"ocsipersist"
"sqlite3"
"odoc" {with-doc}
Expand Down
2 changes: 1 addition & 1 deletion ocsipersist.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ bug-reports: "https://github.com/ocsigen/ocsipersist/issues"
depends: [
"dune" {>= "2.8"}
"ocsipersist-lib" {= version}
"lwt" {>= "4.2.0"}
"eio"
"odoc" {with-doc}
]
conflicts: [
Expand Down
2 changes: 1 addition & 1 deletion src/dbm/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
ocsipersist_settings)
(libraries
dbm
lwt_log
logs
ocsipersist_dbmtypes
ocsipersist_lib
ocsipersist_dbm_settings))
Expand Down
Loading