Merge pull request #15 from mbarbin/pp-log

Move some libraries to standalone repo pp-log
mbarbin · Nov 10, 2024 · 7d7b1ed · 7d7b1ed
2 parents f6438fa + e388261
commit 7d7b1ed
Show file tree

Hide file tree

Showing 38 changed files with 23 additions and 2,558 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,8 +1,12 @@
 name: ci
 
 on:
-  - pull_request
-  - push
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - "**" # This will match pull requests targeting any branch
 
 jobs:
   build:
@@ -27,8 +31,8 @@ jobs:
           opam-repositories: |
             default: https://github.com/ocaml/opam-repository.git
             mbarbin: https://github.com/mbarbin/opam-repository.git
-#           janestreet-bleeding: https://github.com/janestreet/opam-repository.git
-#           janestreet-bleeding-external: https://github.com/janestreet/opam-repository.git#external-packages
+      #     janestreet-bleeding: https://github.com/janestreet/opam-repository.git
+      #     janestreet-bleeding-external: https://github.com/janestreet/opam-repository.git#external-packages
 
       - name: Install dependencies
         run: opam install . --deps-only --with-doc --with-test --with-dev-setup
@@ -38,8 +42,8 @@ jobs:
 
       - name: Run tests
         run: |
-             mkdir $BISECT_DIR
-             opam exec -- dune runtest --instrument-with bisect_ppx
+          mkdir $BISECT_DIR
+          opam exec -- dune runtest --instrument-with bisect_ppx
         env:
           BISECT_DIR: ${{ runner.temp }}/_bisect_ppx_data
           BISECT_FILE: ${{ runner.temp }}/_bisect_ppx_data/data

diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,9 @@
+## 0.0.7 (2024-11-10)
+
+### Removed
+
+- Moved `err`, `err-cli` and `cmdlang-cmdliner-runner` to [pp-log](https://github.com/mbarbin/pp-log).
+
 ## 0.0.6 (2024-10-24)
 
 ### Changed

diff --git a/cmdlang-cmdliner-runner.opam b/cmdlang-cmdliner-runner.opam
diff --git a/cmdlang-tests.opam b/cmdlang-tests.opam
@@ -15,15 +15,12 @@ depends: [
   "bisect_ppx" {with-dev-setup & >= "2.8.3"}
   "climate" {>= "0.1.0~" & < "0.2"}
   "cmdlang" {= version}
-  "cmdlang-cmdliner-runner" {= version}
   "cmdlang-to-base" {= version}
   "cmdlang-to-climate" {= version}
   "cmdlang-to-cmdliner" {= version}
   "cmdliner" {>= "1.3.0"}
   "core" {>= "v0.17" & < "v0.18"}
   "core_unix" {>= "v0.17" & < "v0.18"}
-  "err" {= version}
-  "err-cli" {= version}
   "expect_test_helpers_core" {>= "v0.17" & < "v0.18"}
   "loc" {>= "0.2.0"}
   "mdx" {>= "2.4"}

diff --git a/doc/docs/reference/odoc.md b/doc/docs/reference/odoc.md
@@ -21,13 +21,3 @@ We plan to release the following packages soon to allow interested parties to ex
 | cmdlang-to-base      |   planned        |
 
 We also plan to release the translation to `core.command`. However, this will require additional work. Specifically, we aim to complete the coverage of that part of the code and exercise the translation using special configuration options in a tutorial.
-
-### To be determined
-
-| package                   | released to opam |
-|---------------------------|:----------------:|
-| err                       |   TBD            |
-| err-cli                   |   TBD            |
-| cmdlang-cmdliner-runner   |   TBD            |
-
-These packages are more experimental and opinionated in nature. They will require further consideration and potential redesign before being released.
diff --git a/dune-project b/dune-project
@@ -24,45 +24,6 @@
   (ocaml
    (>= 4.14))))
 
-(package
- (name err)
- (synopsis "Error Handling Standard Based on Human Readable Messages")
- (depends
-  (ocaml
-   (>= 5.2))
-  (loc
-   (>= 0.2.0))
-  (sexplib0
-   (and
-    (>= v0.17)
-    (< v0.18)))
-  (stdune
-   (>= 3.16))))
-
-(package
- (name err-cli)
- (synopsis
-  "Command line interface configuration for [Err] based on [Cmdlang]")
- (depends
-  (ocaml
-   (>= 5.2))
-  (cmdlang
-   (= :version))
-  (err
-   (= :version))
-  (fmt
-   (>= 0.9.0))
-  (loc
-   (>= 0.2.0))
-  (logs
-   (>= 0.7.0))
-  (sexplib0
-   (and
-    (>= v0.17)
-    (< v0.18)))
-  (stdune
-   (>= 3.16))))
-
 (package
  (name cmdlang-to-base)
  (synopsis "Convert cmdlang Parsers to core.command")
@@ -142,23 +103,6 @@
   (cmdlang
    (= :version))))
 
-(package
- (name cmdlang-cmdliner-runner)
- (synopsis "A cmdlang runner using cmdliner and err")
- (depends
-  (ocaml
-   (>= 4.14))
-  (cmdlang
-   (= :version))
-  (cmdlang-to-cmdliner
-   (= :version))
-  (cmdliner
-   (and
-    (>= 1.3.0)
-    (< 1.4)))
-  (err
-   (= :version))))
-
 (package
  (name cmdlang-tests)
  (synopsis "Tests for cmdlang")
@@ -183,8 +127,6 @@
     (< 0.2)))
   (cmdlang
    (= :version))
-  (cmdlang-cmdliner-runner
-   (= :version))
   (cmdlang-to-base
    (= :version))
   (cmdlang-to-climate
@@ -201,10 +143,6 @@
    (and
     (>= v0.17)
     (< v0.18)))
-  (err
-   (= :version))
-  (err-cli
-   (= :version))
   (expect_test_helpers_core
    (and
     (>= v0.17)

diff --git a/err-cli.opam b/err-cli.opam
diff --git a/err.opam b/err.opam
diff --git a/lib/cmdlang_cmdliner_runner/src/cmdlang_cmdliner_runner.ml b/lib/cmdlang_cmdliner_runner/src/cmdlang_cmdliner_runner.ml
diff --git a/lib/cmdlang_cmdliner_runner/src/cmdlang_cmdliner_runner.mli b/lib/cmdlang_cmdliner_runner/src/cmdlang_cmdliner_runner.mli
diff --git a/lib/cmdlang_cmdliner_runner/src/dune b/lib/cmdlang_cmdliner_runner/src/dune
diff --git a/lib/cmdlang_cmdliner_runner/test/dune b/lib/cmdlang_cmdliner_runner/test/dune
diff --git a/lib/err/src/dune b/lib/err/src/dune