Skip to content

Commit cfa7568

Browse files
kit-ty-katekit-ty-kate
authored
Merge pull request #6045 from rjbou/bump2.2.dev
Bump version to 2.3.0~alpha~dev
2 parents ca32ab3 + 97efa7a commit cfa7568

21 files changed

+46
-25
lines changed

‎configure

+9-9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎configure.ac

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dnl The line below must be formatted AC_INIT([opam],[VERSION]) with no extra spaces
2-
AC_INIT([opam],[2.2.0~rc1])
2+
AC_INIT([opam],[2.3.0~alpha~dev])
33
AC_COPYRIGHT(Copyright 2012-2019 OcamlPro SAS)
44

55
AC_CONFIG_MACRO_DIR([m4])

‎master_changes.md

+4
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,10 @@ moved, etc.), please update the _API updates_ part (it helps opam library
1111
users)
1212

1313
## Version
14+
* Bump version to 2.3.0~alpha~dev [#6045 @rjbou]
1415

1516
## Global CLI
17+
* Add cli version 2.3 [#6045 @rjbou]
1618

1719
## Plugins
1820

@@ -99,6 +101,8 @@ users)
99101

100102
## Reftests
101103
### Tests
104+
* cli versioning: untie output from current major version [#6045 @rjbou]
105+
* Set `opam-version` to 2.2 for some conflict message tests based on opam repository to stabilise their output [#6045 @rjbou]
102106

103107
### Engine
104108

‎opam-client.opam

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
opam-version: "2.0"
2-
version: "2.2.0~rc1"
2+
version: "2.3.0~alpha~dev"
33
synopsis: "Client library for opam 2.2"
44
description: """
55
Actions on the opam root, switches, installations, and front-end.

‎opam-core.opam

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
opam-version: "2.0"
2-
version: "2.2.0~rc1"
2+
version: "2.3.0~alpha~dev"
33
synopsis: "Core library for opam 2.2"
44
description: """
55
Small standard library extensions, and generic system interaction modules used by opam.

‎opam-devel.opam

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
opam-version: "2.0"
2-
version: "2.2.0~rc1"
2+
version: "2.3.0~alpha~dev"
33
synopsis: "Bootstrapped development binary for opam 2.2"
44
description: """
55
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.

‎opam-format.opam

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
opam-version: "2.0"
2-
version: "2.2.0~rc1"
2+
version: "2.3.0~alpha~dev"
33
synopsis: "Format library for opam 2.2"
44
description: """
55
Definition of opam datastructures and its file interface.

‎opam-installer.opam

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
opam-version: "2.0"
2-
version: "2.2.0~rc1"
2+
version: "2.3.0~alpha~dev"
33
synopsis: "Installation of files to a prefix, following opam conventions"
44
description: """
55
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.

‎opam-repository.opam

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
opam-version: "2.0"
2-
version: "2.2.0~rc1"
2+
version: "2.3.0~alpha~dev"
33
synopsis: "Repository library for opam 2.2"
44
description: """
55
This library includes repository and remote sources handling, including curl/wget, rsync, git, mercurial, darcs backends.

‎opam-solver.opam

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
opam-version: "2.0"
2-
version: "2.2.0~rc1"
2+
version: "2.3.0~alpha~dev"
33
synopsis: "Solver library for opam 2.2"
44
description: """
55
Solver and Cudf interaction. This library is based on the Cudf and Dose libraries, and handles calls to the external solver from opam.

‎opam-state.opam

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
opam-version: "2.0"
2-
version: "2.2.0~rc1"
2+
version: "2.3.0~alpha~dev"
33
synopsis: "State library for opam 2.2"
44
description: """
55
Handling of the ~/.opam hierarchy, repository and switch states.

‎opam.opam

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
opam-version: "2.0"
2-
version: "2.2.0~rc1"
2+
version: "2.3.0~alpha~dev"
33
synopsis: "Meta-package for Dune"
44
maintainer: "opam-devel@lists.ocaml.org"
55
authors: [

‎src/client/opamArg.mli

+2
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ type validity
2424
val cli2_0: OpamCLIVersion.t
2525
val cli2_1: OpamCLIVersion.t
2626
val cli2_2: OpamCLIVersion.t
27+
val cli2_3: OpamCLIVersion.t
28+
2729
(* [cli_from ?platform ?experimental since] validity flag since [since], and no
2830
removal version. If [experimental] is true, it is marked as is (warning and
2931
documentation update). If [?platform] is not its default [`all], flag is

‎src/client/opamArgTools.ml

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ open OpamCLIVersion.Op
1515
let cli2_0 = OpamCLIVersion.of_string "2.0"
1616
let cli2_1 = OpamCLIVersion.of_string "2.1"
1717
let cli2_2 = OpamCLIVersion.of_string "2.2"
18+
let cli2_3 = OpamCLIVersion.of_string "2.2"
1819

1920
type subplatform = [ `windows | `unix ]
2021
type platform = [ `all | subplatform ]

‎src/client/opamArgTools.mli

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ val cli_original: validity
2828
val cli2_0: OpamCLIVersion.t
2929
val cli2_1: OpamCLIVersion.t
3030
val cli2_2: OpamCLIVersion.t
31+
val cli2_3: OpamCLIVersion.t
3132

3233
val mk_flag:
3334
cli:OpamCLIVersion.Sourced.t -> validity -> section:string -> string list ->

‎tests/reftests/cli-versioning.test

+9-6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
N0REP0
2+
### <opam-version.sh>
3+
opam --version | cut -f -2 -d '.'
4+
### sh opam-version.sh >$ OPAMMAJORVERSION
25
### <pkg:baz.1>
36
opam-version: "2.0"
47
flags: compiler
@@ -7,8 +10,8 @@ opam-version: "2.0"
710
flags: compiler
811
### opam option depext=false
912
Set to 'false' the field depext in global configuration
10-
### opam switch install cli-versioning --empty
11-
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.
13+
### opam switch install cli-versioning --empty | "${OPAMMAJORVERSION}" -> "CURRENTMAJOR"
14+
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.
1215
# Return code 2 #
1316
### OPAMCLI=2.0 opam switch install cli-versioning --empty
1417
[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:
6265
The following actions would be performed:
6366
=== install 1 package
6467
- install baz 2
65-
### opam install baz.2 --unlock-base
66-
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.
68+
### opam install baz.2 --unlock-base | "${OPAMMAJORVERSION}" -> "CURRENTMAJOR"
69+
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.
6770
# Return code 2 #
6871
### # opam option uses mk_command_ret
6972
### opam option foo
@@ -134,8 +137,8 @@ The following actions will be performed:
134137
-> removed env-2-1.1
135138
Done.
136139
### # Environement variables cli versioning
137-
### OPAMBUILDDOC=1 opam var share
138-
[WARNING] OPAMBUILDDOC was ignored because CLI 2.2 was requested and it was removed in 2.1, set OPAMCLI environment variable to 2.0.
140+
### OPAMBUILDDOC=1 opam var share | "${OPAMMAJORVERSION}" -> "CURRENTMAJOR"
141+
[WARNING] OPAMBUILDDOC was ignored because CLI CURRENTMAJOR was requested and it was removed in 2.1, set OPAMCLI environment variable to 2.0.
139142
${BASEDIR}/OPAM/cli-versioning/share
140143
### OPAMCLI=2.0 OPAMBUILDDOC=1 opam config var share
141144
[WARNING] OPAMNODEPEXTS was ignored because CLI 2.0 was requested and it was introduced in 2.1.

‎tests/reftests/empty-conflicts-001.test

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
297366c
22
### OPAMYES=1 OPAMSTRICT=0
33
### OPAMVAR_arch=x86_64 OPAMVAR_os=linux OPAMVAR_os_family=arch OPAMVAR_os_distribution=archarm
4+
### # We need to set this version to keep the test as is
5+
### OPAMVAR_opam_version=2.2.0
46
### opam switch create test ocaml-base-compiler.4.07.1 --fake
57

68
<><> Installing new switch packages <><><><><><><><><><><><><><><><><><><><><><>

‎tests/reftests/empty-conflicts-002.test

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
11ea1cb
22
### OPAMYES=1 OPAMSTRICT=0
33
### OPAMVAR_arch=x86_64 OPAMVAR_os=linux OPAMVAR_os_family=arch OPAMVAR_os_distribution=archarm
4+
### # We need to set this version to keep the test as is
5+
### OPAMVAR_opam_version=2.2.0
46
### opam switch create test ocaml-base-compiler.4.14.0 --fake
57

68
<><> Installing new switch packages <><><><><><><><><><><><><><><><><><><><><><>

‎tests/reftests/empty-conflicts-003.test

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
3235916
22
### OPAMYES=1 OPAMSTRICT=0
33
### OPAMVAR_arch=arm64 OPAMVAR_os=linux OPAMVAR_os_family=arch OPAMVAR_os_distribution=archarm
4+
### # We need to set this version to keep the test as is
5+
### OPAMVAR_opam_version=2.2.0
46
### opam switch create test ocaml-base-compiler.4.14.0 --fake
57

68
<><> Installing new switch packages <><><><><><><><><><><><><><><><><><><><><><>

‎tests/reftests/list-coinstallable.test

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
7371c1d9
22
### : Test for #5399 (opam list --recursive --coinstallable-with <pkg>.<version> returning all versions of <pkg>)
33
### OPAMVAR_arch=arm64 OPAMVAR_os=linux OPAMVAR_os_family=arch OPAMVAR_os_distribution=archarm
4+
### # We need to set this version to keep the test as is
5+
### OPAMVAR_opam_version=2.2.0
46
### opam switch create 4.12.0 --fake
57

68
<><> Installing new switch packages <><><><><><><><><><><><><><><><><><><><><><>

‎tests/reftests/unhelpful-conflicts-001.test

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
c1ba97dafe95c865d37ad4d88f6e57c9ffbe7f0a
22
### OPAMYES=1 OPAMSTRICT=0
33
### OPAMVAR_arch=arm64 OPAMVAR_os=macos OPAMVAR_os_family=homebrew OPAMVAR_os_distribution=homebrew
4+
### # We need to set this version to keep the test as is
5+
### OPAMVAR_opam_version=2.2.0
46
### opam switch create test ocaml-base-compiler.5.0.0~alpha0 --fake
57

68
<><> Installing new switch packages <><><><><><><><><><><><><><><><><><><><><><>

0 commit comments

Comments
 (0)