From ca8d9f83259b9aa28f0c85f2571a4e9394ddbdf8 Mon Sep 17 00:00:00 2001 From: Jon Ludlam Date: Thu, 10 Jul 2025 10:11:48 +0100 Subject: [PATCH 1/2] Prepare for 3.1.0 release --- CHANGES.md | 2 +- odoc-driver.opam | 1 - odoc-md.opam | 1 - odoc-parser.opam | 1 - odoc.opam | 1 - sherlodoc.opam | 1 - 6 files changed, 1 insertion(+), 6 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 69dd57b40a..83423f30cd 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,4 +1,4 @@ -# Unreleased +# 3.1.0 ### Added - Exposed sherlodoc libraries for use in other projects (@jonludlam, #1349) diff --git a/odoc-driver.opam b/odoc-driver.opam index 88cf393f6c..477a6beea0 100644 --- a/odoc-driver.opam +++ b/odoc-driver.opam @@ -5,7 +5,6 @@ homepage: "https://github.com/ocaml/odoc" doc: "https://ocaml.github.io/odoc/" bug-reports: "https://github.com/ocaml/odoc/issues" license: "ISC" -flags: [ avoid-version ] maintainer: [ "Daniel Bünzli " diff --git a/odoc-md.opam b/odoc-md.opam index 9711940046..4cbc8048e6 100644 --- a/odoc-md.opam +++ b/odoc-md.opam @@ -5,7 +5,6 @@ homepage: "https://github.com/ocaml/odoc" doc: "https://ocaml.github.io/odoc/" bug-reports: "https://github.com/ocaml/odoc/issues" license: "ISC" -flags: [ avoid-version ] maintainer: [ "Jon Ludlam " diff --git a/odoc-parser.opam b/odoc-parser.opam index b637e5477d..de29feca3c 100644 --- a/odoc-parser.opam +++ b/odoc-parser.opam @@ -12,7 +12,6 @@ homepage: "https://github.com/ocaml/odoc" bug-reports: "https://github.com/ocaml/odoc/issues" dev-repo: "git+https://github.com/ocaml/odoc.git" doc: "https://ocaml.github.io/odoc/odoc_parser" -flags: [ avoid-version ] depends: [ "dune" {>= "3.18"} "ocaml" {>= "4.08.0" & < "5.5"} diff --git a/odoc.opam b/odoc.opam index e6f1836fba..4538986ebf 100644 --- a/odoc.opam +++ b/odoc.opam @@ -5,7 +5,6 @@ homepage: "https://github.com/ocaml/odoc" doc: "https://ocaml.github.io/odoc/" bug-reports: "https://github.com/ocaml/odoc/issues" license: "ISC" -flags: [ avoid-version ] maintainer: [ "Daniel Bünzli " diff --git a/sherlodoc.opam b/sherlodoc.opam index d014ce8e6a..9026d5664a 100644 --- a/sherlodoc.opam +++ b/sherlodoc.opam @@ -7,7 +7,6 @@ license: "MIT" homepage: "https://github.com/ocaml/odoc" doc: "https://ocaml.github.io/odoc/" bug-reports: "https://github.com/ocaml/odoc/issues" -flags: [ avoid-version ] depends: [ "dune" {>= "3.7"} "ocaml" {>= "4.0.8"} From 9b1c4d8729a6c7a812eef7e4af03c4c9e72c0d5c Mon Sep 17 00:00:00 2001 From: Jon Ludlam Date: Thu, 10 Jul 2025 10:19:01 +0100 Subject: [PATCH 2/2] Add explicit transitive dependency to odoc-md.opam --- odoc-md.opam | 1 + 1 file changed, 1 insertion(+) diff --git a/odoc-md.opam b/odoc-md.opam index 4cbc8048e6..0ebfc20139 100644 --- a/odoc-md.opam +++ b/odoc-md.opam @@ -29,6 +29,7 @@ depends: [ "ocaml" {>= "4.14.0"} "odoc" {= version} "dune" {>= "3.18.0"} + "cmdliner" {>= "1.3.0"} "cmarkit" ]