ocaml · kit-ty-kate · Jul 1, 2024 · Jun 27, 2024 · Jun 21, 2024 · Jun 27, 2024
diff --git a/configure b/configure
diff --git a/configure.ac b/configure.ac
@@ -1,5 +1,5 @@
 dnl The line below must be formatted AC_INIT([opam],[VERSION]) with no extra spaces
-AC_INIT([opam],[2.2.0~rc1])
+AC_INIT([opam],[2.3.0~alpha~dev])
 AC_COPYRIGHT(Copyright 2012-2019 OcamlPro SAS)
 
 AC_CONFIG_MACRO_DIR([m4])

diff --git a/master_changes.md b/master_changes.md
@@ -11,8 +11,10 @@ moved, etc.), please update the _API updates_ part (it helps opam library
 users)
 
 ## Version
+  * Bump version to 2.3.0~alpha~dev [#6045 @rjbou]
 
 ## Global CLI
+  * Add cli version 2.3 [#6045 @rjbou]
 
 ## Plugins
 
@@ -99,6 +101,8 @@ users)
 
 ## Reftests
 ### Tests
+  * cli versioning: untie output from current major version [#6045 @rjbou]
+  * Set `opam-version` to 2.2 for some conflict message tests based on opam repository to stabilise their output [#6045 @rjbou]
 
 ### Engine
 

diff --git a/opam-client.opam b/opam-client.opam
@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.2.0~rc1"
+version: "2.3.0~alpha~dev"
 synopsis: "Client library for opam 2.2"
 description: """
 Actions on the opam root, switches, installations, and front-end.

diff --git a/opam-core.opam b/opam-core.opam
@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.2.0~rc1"
+version: "2.3.0~alpha~dev"
 synopsis: "Core library for opam 2.2"
 description: """
 Small standard library extensions, and generic system interaction modules used by opam.

diff --git a/opam-devel.opam b/opam-devel.opam
@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.2.0~rc1"
+version: "2.3.0~alpha~dev"
 synopsis: "Bootstrapped development binary for opam 2.2"
 description: """
 This package compiles (bootstraps) opam. For consistency and safety of the installation, the binaries are not installed into the PATH, but into lib/opam-devel, from where the user can manually install them system-wide.

diff --git a/opam-format.opam b/opam-format.opam
@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.2.0~rc1"
+version: "2.3.0~alpha~dev"
 synopsis: "Format library for opam 2.2"
 description: """
 Definition of opam datastructures and its file interface.

diff --git a/opam-installer.opam b/opam-installer.opam
@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.2.0~rc1"
+version: "2.3.0~alpha~dev"
 synopsis: "Installation of files to a prefix, following opam conventions"
 description: """
 opam-installer is a small tool that can read *.install files, as defined by opam [1], and execute them to install or remove package files without going through opam.

diff --git a/opam-repository.opam b/opam-repository.opam
@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.2.0~rc1"
+version: "2.3.0~alpha~dev"
 synopsis: "Repository library for opam 2.2"
 description: """
 This library includes repository and remote sources handling, including curl/wget, rsync, git, mercurial, darcs backends.

diff --git a/opam-solver.opam b/opam-solver.opam
@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.2.0~rc1"
+version: "2.3.0~alpha~dev"
 synopsis: "Solver library for opam 2.2"
 description: """
 Solver and Cudf interaction. This library is based on the Cudf and Dose libraries, and handles calls to the external solver from opam.

diff --git a/opam-state.opam b/opam-state.opam
@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.2.0~rc1"
+version: "2.3.0~alpha~dev"
 synopsis: "State library for opam 2.2"
 description: """
 Handling of the ~/.opam hierarchy, repository and switch states.

diff --git a/opam.opam b/opam.opam
@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.2.0~rc1"
+version: "2.3.0~alpha~dev"
 synopsis: "Meta-package for Dune"
 maintainer: "opam-devel@lists.ocaml.org"
 authors: [

diff --git a/src/client/opamArg.mli b/src/client/opamArg.mli
@@ -24,6 +24,8 @@ type validity
 val cli2_0: OpamCLIVersion.t
 val cli2_1: OpamCLIVersion.t
 val cli2_2: OpamCLIVersion.t
+val cli2_3: OpamCLIVersion.t
+
 (* [cli_from ?platform ?experimental since] validity flag since [since], and no
    removal version. If [experimental] is true, it is marked as is (warning and
    documentation update). If [?platform] is not its default [`all], flag is

diff --git a/src/client/opamArgTools.ml b/src/client/opamArgTools.ml
@@ -15,6 +15,7 @@ open OpamCLIVersion.Op
 let cli2_0 = OpamCLIVersion.of_string "2.0"
 let cli2_1 = OpamCLIVersion.of_string "2.1"
 let cli2_2 = OpamCLIVersion.of_string "2.2"
+let cli2_3 = OpamCLIVersion.of_string "2.2"
 
 type subplatform = [ `windows | `unix ]
 type platform = [ `all | subplatform ]

diff --git a/src/client/opamArgTools.mli b/src/client/opamArgTools.mli
@@ -28,6 +28,7 @@ val cli_original: validity
 val cli2_0: OpamCLIVersion.t
 val cli2_1: OpamCLIVersion.t
 val cli2_2: OpamCLIVersion.t
+val cli2_3: OpamCLIVersion.t
 
 val mk_flag:
   cli:OpamCLIVersion.Sourced.t -> validity -> section:string -> string list ->

diff --git a/tests/reftests/cli-versioning.test b/tests/reftests/cli-versioning.test
@@ -1,4 +1,7 @@
 N0REP0
+### <opam-version.sh>
+opam --version | cut -f -2 -d '.'
+### sh opam-version.sh >$ OPAMMAJORVERSION
 ### <pkg:baz.1>
 opam-version: "2.0"
 flags: compiler
@@ -7,8 +10,8 @@ opam-version: "2.0"
 flags: compiler
 ### opam option depext=false
 Set to 'false' the field depext in global configuration
-### opam switch install cli-versioning --empty
-opam: install was removed in version 2.1 of the opam CLI, but version 2.2 has been requested. Use create instead or set OPAMCLI environment variable to 2.0.
+### opam switch install cli-versioning --empty | "${OPAMMAJORVERSION}" -> "CURRENTMAJOR"
+opam: install was removed in version 2.1 of the opam CLI, but version CURRENTMAJOR has been requested. Use create instead or set OPAMCLI environment variable to 2.0.
 # Return code 2 #
 ### OPAMCLI=2.0 opam switch install cli-versioning --empty
 [WARNING] OPAMNODEPEXTS was ignored because CLI 2.0 was requested and it was introduced in 2.1.
@@ -62,8 +65,8 @@ The following actions would be performed:
 The following actions would be performed:
 === install 1 package
   - install baz 2
-### opam install baz.2 --unlock-base
-opam: --unlock-base was removed in version 2.1 of the opam CLI, but version 2.2 has been requested. Use --update-invariant instead or set OPAMCLI environment variable to 2.0.
+### opam install baz.2 --unlock-base | "${OPAMMAJORVERSION}" -> "CURRENTMAJOR"
+opam: --unlock-base was removed in version 2.1 of the opam CLI, but version CURRENTMAJOR has been requested. Use --update-invariant instead or set OPAMCLI environment variable to 2.0.
 # Return code 2 #
 ### # opam option uses mk_command_ret
 ### opam option foo
@@ -134,8 +137,8 @@ The following actions will be performed:
 -> removed   env-2-1.1
 Done.
 ### # Environement variables cli versioning
-### OPAMBUILDDOC=1 opam var share
-[WARNING] OPAMBUILDDOC was ignored because CLI 2.2 was requested and it was removed in 2.1, set OPAMCLI environment variable to 2.0.
+### OPAMBUILDDOC=1 opam var share | "${OPAMMAJORVERSION}" -> "CURRENTMAJOR"
+[WARNING] OPAMBUILDDOC was ignored because CLI CURRENTMAJOR was requested and it was removed in 2.1, set OPAMCLI environment variable to 2.0.
 ${BASEDIR}/OPAM/cli-versioning/share
 ### OPAMCLI=2.0 OPAMBUILDDOC=1 opam config var share
 [WARNING] OPAMNODEPEXTS was ignored because CLI 2.0 was requested and it was introduced in 2.1.

diff --git a/tests/reftests/empty-conflicts-001.test b/tests/reftests/empty-conflicts-001.test
@@ -1,6 +1,8 @@
 297366c
 ### OPAMYES=1 OPAMSTRICT=0
 ### OPAMVAR_arch=x86_64 OPAMVAR_os=linux OPAMVAR_os_family=arch OPAMVAR_os_distribution=archarm
+### # We need to set this version to keep the test as is
+### OPAMVAR_opam_version=2.2.0
 ### opam switch create test ocaml-base-compiler.4.07.1 --fake
 
 <><> Installing new switch packages <><><><><><><><><><><><><><><><><><><><><><>

diff --git a/tests/reftests/empty-conflicts-002.test b/tests/reftests/empty-conflicts-002.test
@@ -1,6 +1,8 @@
 11ea1cb
 ### OPAMYES=1 OPAMSTRICT=0
 ### OPAMVAR_arch=x86_64 OPAMVAR_os=linux OPAMVAR_os_family=arch OPAMVAR_os_distribution=archarm
+### # We need to set this version to keep the test as is
+### OPAMVAR_opam_version=2.2.0
 ### opam switch create test ocaml-base-compiler.4.14.0 --fake
 
 <><> Installing new switch packages <><><><><><><><><><><><><><><><><><><><><><>

diff --git a/tests/reftests/empty-conflicts-003.test b/tests/reftests/empty-conflicts-003.test
@@ -1,6 +1,8 @@
 3235916
 ### OPAMYES=1 OPAMSTRICT=0
 ### OPAMVAR_arch=arm64 OPAMVAR_os=linux OPAMVAR_os_family=arch OPAMVAR_os_distribution=archarm
+### # We need to set this version to keep the test as is
+### OPAMVAR_opam_version=2.2.0
 ### opam switch create test ocaml-base-compiler.4.14.0 --fake
 
 <><> Installing new switch packages <><><><><><><><><><><><><><><><><><><><><><>

diff --git a/tests/reftests/list-coinstallable.test b/tests/reftests/list-coinstallable.test
@@ -1,6 +1,8 @@
 7371c1d9
 ### : Test for #5399 (opam list --recursive --coinstallable-with <pkg>.<version> returning all versions of <pkg>)
 ### OPAMVAR_arch=arm64 OPAMVAR_os=linux OPAMVAR_os_family=arch OPAMVAR_os_distribution=archarm
+### # We need to set this version to keep the test as is
+### OPAMVAR_opam_version=2.2.0
 ### opam switch create 4.12.0 --fake
 
 <><> Installing new switch packages <><><><><><><><><><><><><><><><><><><><><><>

diff --git a/tests/reftests/unhelpful-conflicts-001.test b/tests/reftests/unhelpful-conflicts-001.test
@@ -1,6 +1,8 @@
 c1ba97dafe95c865d37ad4d88f6e57c9ffbe7f0a
 ### OPAMYES=1 OPAMSTRICT=0
 ### OPAMVAR_arch=arm64 OPAMVAR_os=macos OPAMVAR_os_family=homebrew OPAMVAR_os_distribution=homebrew
+### # We need to set this version to keep the test as is
+### OPAMVAR_opam_version=2.2.0
 ### opam switch create test ocaml-base-compiler.5.0.0~alpha0 --fake
 
 <><> Installing new switch packages <><><><><><><><><><><><><><><><><><><><><><>