Merge pull request #49 from lefessan/z-2021-07-15-version-1-1-0

v1.1.0, remove dep to ocplib-json-typed
OCamlPro · Jul 15, 2021 · 458fcb0 · 458fcb0
2 parents 04867ad + 9c64564
commit 458fcb0
Show file tree

Hide file tree

Showing 14 changed files with 45 additions and 29 deletions.
diff --git a/.drom b/.drom
@@ -2,7 +2,7 @@
 
 # hash of toml configuration files
 # used for generation of all files
-0247c34b51b17c57ff1eb5377e8e10e5:.
+c81d53af353e04583f60d16000dd4212:.
 # end context for .
 
 # begin context for .github/workflows/ci.ml
@@ -12,12 +12,12 @@ ac2aab1d8f78befbbfca730668f71e8d:.github/workflows/ci.ml
 
 # begin context for .github/workflows/doc-deploy.yml
 # file .github/workflows/doc-deploy.yml
-39d8b5bf5ac8414404f017cbd8747fd6:.github/workflows/doc-deploy.yml
+0080b75d084db230ee07226b57beacfe:.github/workflows/doc-deploy.yml
 # end context for .github/workflows/doc-deploy.yml
 
 # begin context for .github/workflows/workflow.yml
 # file .github/workflows/workflow.yml
-f9a4f3c2903e7a055f763061537c739c:.github/workflows/workflow.yml
+99716e015fa6e6e25c587b5c1fa19178:.github/workflows/workflow.yml
 # end context for .github/workflows/workflow.yml
 
 # begin context for .gitignore
@@ -47,7 +47,7 @@ a8d1bcd6f62c6b813b77d3ff8959d8d2:.ocamlformat-ignore
 
 # begin context for LICENSE.md
 # file LICENSE.md
-c4286e88f0dca20a879274e23cf2cb8e:LICENSE.md
+d091b81b6155e5fd5d6556fc8bba0094:LICENSE.md
 # end context for LICENSE.md
 
 # begin context for Makefile
@@ -57,7 +57,7 @@ c6724dd15851b4871bf369c1872adcb3:Makefile
 
 # begin context for README.md
 # file README.md
-47e3b841df569eea17c4d7d4773bb0a1:README.md
+49d6f9c062198984e39269b52eebbfd2:README.md
 # end context for README.md
 
 # begin context for docs/doc/index.html
@@ -92,17 +92,17 @@ df544cfaf9078d1bba2f90ed1b5adf5f:dune
 
 # begin context for dune-project
 # file dune-project
-8ae15590a8a4dab75a2910fd7d8d02c1:dune-project
+f0646ab1206865111531fc2f82eebbe3:dune-project
 # end context for dune-project
 
 # begin context for opam-bin.opam
 # file opam-bin.opam
-80e39595939244b93b03ad9126b0a658:opam-bin.opam
+0b38571db145d7f37b58768045752c62:opam-bin.opam
 # end context for opam-bin.opam
 
 # begin context for opam_bin_lib.opam
 # file opam_bin_lib.opam
-ce142468a7bb14b49f717dd694ea93ef:opam_bin_lib.opam
+47302bf706be99c6668beca7bbcd3837:opam_bin_lib.opam
 # end context for opam_bin_lib.opam
 
 # begin context for scripts/after.sh
@@ -137,7 +137,7 @@ eb522bc1bb6523b514040c8801bf5f79:sphinx/index.rst
 
 # begin context for sphinx/license.rst
 # file sphinx/license.rst
-bba8067487813e5ef74a6ecfecfc7ac9:sphinx/license.rst
+cdf74f69fd392ea9a545b06789762a13:sphinx/license.rst
 # end context for sphinx/license.rst
 
 # begin context for src/opam_bin/dune
@@ -162,7 +162,7 @@ f0db4b50e83c8ae42de249ce17b22c42:src/opam_bin/package.toml
 
 # begin context for src/opam_bin_lib/dune
 # file src/opam_bin_lib/dune
-9c4b1437084a63665d6cab800f31f102:src/opam_bin_lib/dune
+bdd17a2637afe45d6932b6a25400f880:src/opam_bin_lib/dune
 # end context for src/opam_bin_lib/dune
 
 # begin context for src/opam_bin_lib/index.mld
@@ -182,7 +182,7 @@ f39e74d2171cc1d492e2eb6352afc765:src/opam_bin_lib/package.toml
 
 # begin context for src/opam_bin_lib/version.mlt
 # file src/opam_bin_lib/version.mlt
-2798b344c6caf4c6b42bb19ecf075eb9:src/opam_bin_lib/version.mlt
+931696dafd7a11058b6091301b489530:src/opam_bin_lib/version.mlt
 # end context for src/opam_bin_lib/version.mlt
 
 # begin context for test/expect-tests/dune

diff --git a/.github/workflows/doc-deploy.yml b/.github/workflows/doc-deploy.yml
@@ -27,13 +27,17 @@ jobs:
         run: |
           sudo apt install -yqq python3-sphinx python3-sphinx-rtd-theme
           opam install -y dune odoc
+
+      # define opam-repo = "git+https://" to add an extra opam repo
+
       - run: opam pin add . -y --no-action
       - run: opam depext -y opam-bin opam_bin_lib
         if: steps.cache-opam.outputs.cache-hit != 'true'
       - run: opam install -y ./*.opam --deps-only --with-test
         if: steps.cache-opam.outputs.cache-hit != 'true'
       - run: opam upgrade --fixup
         if: steps.cache-opam.outputs.cache-hit == 'true'
+
       - name: build-doc
         run: |
           make doc

diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -53,16 +53,18 @@ jobs:
           git config --global user.name github-actions
           git config --global user.email github-actions-bot@users.noreply.github.com
 
+      # define opam-repo = "git+https://" to add an extra opam repo
+
       - run: opam pin add . -y --no-action
 
       - run: opam depext -y opam-bin opam_bin_lib
-        if: steps.cache-opam.outputs.cache-hit != 'true'
+#        if: steps.cache-opam.outputs.cache-hit != 'true'
 
       - run: opam install -y ./*.opam --deps-only --with-test
-        if: steps.cache-opam.outputs.cache-hit != 'true'
+#        if: steps.cache-opam.outputs.cache-hit != 'true'
 
-      - run: opam upgrade --fixup
-        if: steps.cache-opam.outputs.cache-hit == 'true'
+#      - run: opam upgrade --fixup
+#        if: steps.cache-opam.outputs.cache-hit == 'true'
 
       - run: dos2unix scripts/*.sh
         if: matrix.os == 'windows-latest'

diff --git a/CHANGES.md b/CHANGES.md
@@ -1,4 +1,15 @@
 
+## v1.1.0 (2021-07-15 )
+
+* Improvements on --enable-share
+* Remove link to typerex.org
+* Add `opam-bin clean unused` to remove unused shared files
+
+## v1.0.0 ( 2020-10-28 )
+
+* Variable OPAM_BIN_EXCLUDE and config option `exclude_dirs` to list files
+  to skip while computing checksums
+
 ## v0.9.5 ( 2020-09-14 )
 
 * Fix a bug preventing creation of binary packages when sharing is disabled

diff --git a/LICENSE.md b/LICENSE.md
@@ -170,7 +170,7 @@ If you develop a new library, and you want it to be of the greatest possible use
 To apply these terms, attach the following notices to the library. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found.
 
 one line to give the library's name and an idea of what it does.
-Copyright (C) year  name of author
+Copyright (C) years  name of author
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public

diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 
-[![Actions Status](https://github.com/ocamlpro/opam-bin/workflows/Main%20Workflow/badge.svg)](https://github.com/ocamlpro/opam-bin/actions)
+[![Actions Status](https://github.com/ocamlpro/opam-bin/workflows/Main%20Workflow/badge.svg)](https://github.com/ocamlpro/opam-bin/actions)[![Actions Status](https://github.com/ocamlpro/opam-bin/workflows/doc-deploy/badge.svg)](https://github.com/ocamlpro/opam-bin/actions)
 [![Release](https://img.shields.io/github/release/ocamlpro/opam-bin.svg)](https://github.com/ocamlpro/opam-bin/releases)
 
 # opam-bin

diff --git a/drom.toml b/drom.toml
@@ -11,7 +11,7 @@ min-edition = "4.07.0"
 name = "opam-bin"
 sphinx-target = "."
 synopsis = "The opam-bin tool is a simple framework to use `opam` with binary packages"
-version = "1.0.0"
+version = "1.1.0"
 windows-ci = true
 
 # keys that you could also define:

diff --git a/dune-project b/dune-project
@@ -3,7 +3,7 @@
 (name opam-bin)
 (allow_approximate_merlin)
 (generate_opam_files false)
-(version 1.0.0)
+(version 1.1.0)
 (formatting (enabled_for ocaml reason))
 
 (package
@@ -17,7 +17,8 @@
    ppx_expect
    odoc
    ocamlformat
- ))
+  )
+ )
 
 (package
  (name opam_bin_lib)
@@ -26,7 +27,6 @@
  (depends
    (ocaml (>= 4.07.0))
    (re ( > 1.0 ))
-   (ocplib-json-typed (and (>= 0.7.0) (< 1.0.0)))
    (ezjsonm (and (>= 1.0.0) (< 2.0.0)))
    (ez_opam_file (and (>= 0.1.0) (< 1.0.0)))
    (ez_file (and (>= 0.2.0) (< 1.0.0)))
@@ -36,5 +36,6 @@
    ppx_expect
    odoc
    ocamlformat
- ))
+  )
+ )
 
diff --git a/opam-bin.opam b/opam-bin.opam
@@ -2,7 +2,7 @@
 # Do not modify, or add to the `skip` field of `drom.toml`.
 opam-version: "2.0"
 name: "opam-bin"
-version: "1.0.0"
+version: "1.1.0"
 license: "LGPL-2.1-only with OCaml-LGPL-linking-exception"
 synopsis:
   "The opam-bin tool is a simple framework to use `opam` with binary packages"

diff --git a/opam_bin_lib.opam b/opam_bin_lib.opam
@@ -2,7 +2,7 @@
 # Do not modify, or add to the `skip` field of `drom.toml`.
 opam-version: "2.0"
 name: "opam_bin_lib"
-version: "1.0.0"
+version: "1.1.0"
 license: "LGPL-2.1-only with OCaml-LGPL-linking-exception"
 synopsis:
   "The opam-bin tool is a simple framework to use `opam` with binary packages"
@@ -39,7 +39,6 @@ depends: [
   "ocaml" {>= "4.07.0"}
   "dune" {>= "2.6.0"}
   "re" {> "1.0"}
-  "ocplib-json-typed" {>= "0.7.0" & < "1.0.0"}
   "ezjsonm" {>= "1.0.0" & < "2.0.0"}
   "ez_opam_file" {>= "0.1.0" & < "1.0.0"}
   "ez_file" {>= "0.2.0" & < "1.0.0"}

diff --git a/sphinx/license.rst b/sphinx/license.rst
@@ -173,7 +173,7 @@ If you develop a new library, and you want it to be of the greatest possible use
 To apply these terms, attach the following notices to the library. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found.
 
 one line to give the library's name and an idea of what it does.
-Copyright (C) year  name of author
+Copyright (C) years  name of author
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public

diff --git a/src/opam_bin_lib/dune b/src/opam_bin_lib/dune
@@ -4,7 +4,7 @@
   (name opam_bin_lib)
   (public_name opam_bin_lib)
   (wrapped true)
-  (libraries re ocplib-json-typed ezjsonm ez_opam_file ez_file ez_config ez_cmdliner )
+  (libraries re ezjsonm ez_opam_file ez_file ez_config ez_cmdliner )
 
 
   )

diff --git a/src/opam_bin_lib/package.toml b/src/opam_bin_lib/package.toml
@@ -43,7 +43,6 @@ ez_cmdliner = "0.1.0"
 ez_config = "0.1.0"
 ez_file = "0.2.0"
 ezjsonm = "1.0.0"
-ocplib-json-typed = "0.7.0"
 ez_opam_file = "0.1.0"
 re = ">1.0"
 

diff --git a/src/opam_bin_lib/version.mlt b/src/opam_bin_lib/version.mlt
@@ -13,7 +13,7 @@ let query cmd =
 
 let commit_hash = query "git show -s --pretty=format:%H"
 let commit_date = query "git show -s --pretty=format:%ci"
-let version = "1.0.0"
+let version = "1.1.0"
 let version =
   match commit_hash with
   | Some commit_hash ->