diff --git a/scripts/update_opam_repo.sh b/scripts/update_opam_repo.sh index c846bcd7d..f5ffab185 100755 --- a/scripts/update_opam_repo.sh +++ b/scripts/update_opam_repo.sh @@ -42,7 +42,7 @@ cleanup () { rm -rf "$tmp_dir" rm -rf Dockerfile } -# trap cleanup EXIT INT +trap cleanup EXIT INT script_dir="$(cd "$(dirname "$0")" && echo "$(pwd -P)/")" src_dir="$(dirname "$script_dir")" @@ -71,12 +71,12 @@ for opam in $opams; do ## install`), so we manually remove the tag the most ## ugliest-possible way... - sed -e "s/{ *test *}//" \ - -e "s/test \& //" \ - -e "s/\& test//" \ - -e "s/{ *doc *}//" \ - -e "s/doc \& //" \ - -e "s/\& doc//" \ + sed -e "s/{ *with-test *}//" \ + -e "s/with-test \& //" \ + -e "s/\& with-test//" \ + -e "s/{ *with-doc *}//" \ + -e "s/with-doc \& //" \ + -e "s/\& with-doc//" \ $opam > "$tmp_dir"/packages/$package/$package.dev/opam done diff --git a/src/bin_client/tezos-client.opam b/src/bin_client/tezos-client.opam index 265f9fdbe..283172315 100644 --- a/src/bin_client/tezos-client.opam +++ b/src/bin_client/tezos-client.opam @@ -1,10 +1,9 @@ -opam-version: "1.2" -version: "dev" +opam-version: "2.0" maintainer: "contact@tezos.com" authors: [ "Tezos devteam" ] homepage: "https://www.tezos.com/" bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "https://gitlab.com/tezos/tezos.git" +dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "ocamlfind" { build } @@ -18,12 +17,12 @@ depends: [ "tezos-baking-alpha-commands" "tezos-client-base-unix" "tezos-signer-backends" - "tezos-node" { test } - "tezos-protocol-compiler" { test } + "tezos-node" { with-test } + "tezos-protocol-compiler" { with-test } ] build: [ [ "dune" "build" "-p" name "-j" jobs ] ] -build-test: [ +run-test: [ [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/src/bin_node/tezos-node.opam b/src/bin_node/tezos-node.opam index e832be8ba..a8ce12b72 100644 --- a/src/bin_node/tezos-node.opam +++ b/src/bin_node/tezos-node.opam @@ -1,10 +1,9 @@ -opam-version: "1.2" -version: "dev" +opam-version: "2.0" maintainer: "contact@tezos.com" authors: [ "Tezos devteam" ] homepage: "https://www.tezos.com/" bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "https://gitlab.com/tezos/tezos.git" +dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "ocamlfind" { build } @@ -23,6 +22,6 @@ depends: [ build: [ [ "dune" "build" "-p" name "-j" jobs ] ] -build-test: [ +run-test: [ [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/src/bin_signer/tezos-signer.opam b/src/bin_signer/tezos-signer.opam index 9b40fd099..1375d511b 100644 --- a/src/bin_signer/tezos-signer.opam +++ b/src/bin_signer/tezos-signer.opam @@ -1,10 +1,9 @@ -opam-version: "1.2" -version: "dev" +opam-version: "2.0" maintainer: "contact@tezos.com" authors: [ "Tezos devteam" ] homepage: "https://www.tezos.com/" bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "https://gitlab.com/tezos/tezos.git" +dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "ocamlfind" { build } @@ -21,6 +20,6 @@ depends: [ build: [ [ "dune" "build" "-p" name "-j" jobs ] ] -build-test: [ +run-test: [ [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/src/lib_base/tezos-base.opam b/src/lib_base/tezos-base.opam index 5cd6779e4..058b04909 100644 --- a/src/lib_base/tezos-base.opam +++ b/src/lib_base/tezos-base.opam @@ -1,10 +1,9 @@ -opam-version: "1.2" -version: "dev" +opam-version: "2.0" maintainer: "contact@tezos.com" authors: [ "Tezos devteam" ] homepage: "https://www.tezos.com/" bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "https://gitlab.com/tezos/tezos.git" +dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "ocamlfind" { build } @@ -24,6 +23,6 @@ depends: [ build: [ [ "dune" "build" "-p" name "-j" jobs ] ] -build-test: [ +run-test: [ [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/src/lib_clic/tezos-clic.opam b/src/lib_clic/tezos-clic.opam index d4190850b..7e3f1bbaf 100644 --- a/src/lib_clic/tezos-clic.opam +++ b/src/lib_clic/tezos-clic.opam @@ -1,10 +1,9 @@ -opam-version: "1.2" -version: "dev" +opam-version: "2.0" maintainer: "contact@tezos.com" authors: [ "Tezos devteam" ] homepage: "https://www.tezos.com/" bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "https://gitlab.com/tezos/tezos.git" +dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "ocamlfind" { build } @@ -15,6 +14,6 @@ depends: [ build: [ [ "dune" "build" "-p" name "-j" jobs ] ] -build-test: [ +run-test: [ [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/src/lib_client_base/tezos-client-base.opam b/src/lib_client_base/tezos-client-base.opam index df94a3686..803f358f0 100644 --- a/src/lib_client_base/tezos-client-base.opam +++ b/src/lib_client_base/tezos-client-base.opam @@ -1,10 +1,9 @@ -opam-version: "1.2" -version: "dev" +opam-version: "2.0" maintainer: "contact@tezos.com" authors: [ "Tezos devteam" ] homepage: "https://www.tezos.com/" bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "https://gitlab.com/tezos/tezos.git" +dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "ocamlfind" { build } @@ -21,6 +20,6 @@ depends: [ build: [ [ "dune" "build" "-p" name "-j" jobs ] ] -build-test: [ +run-test: [ [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/src/lib_client_base_unix/tezos-client-base-unix.opam b/src/lib_client_base_unix/tezos-client-base-unix.opam index d7be6178b..fa4cf1547 100644 --- a/src/lib_client_base_unix/tezos-client-base-unix.opam +++ b/src/lib_client_base_unix/tezos-client-base-unix.opam @@ -1,10 +1,9 @@ -opam-version: "1.2" -version: "dev" +opam-version: "2.0" maintainer: "contact@tezos.com" authors: [ "Tezos devteam" ] homepage: "https://www.tezos.com/" bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "https://gitlab.com/tezos/tezos.git" +dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "ocamlfind" { build } @@ -19,6 +18,6 @@ depends: [ build: [ [ "dune" "build" "-p" name "-j" jobs ] ] -build-test: [ +run-test: [ [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/src/lib_client_commands/tezos-client-commands.opam b/src/lib_client_commands/tezos-client-commands.opam index 9f075fd49..55df05989 100644 --- a/src/lib_client_commands/tezos-client-commands.opam +++ b/src/lib_client_commands/tezos-client-commands.opam @@ -1,10 +1,9 @@ -opam-version: "1.2" -version: "dev" +opam-version: "2.0" maintainer: "contact@tezos.com" authors: [ "Tezos devteam" ] homepage: "https://www.tezos.com/" bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "https://gitlab.com/tezos/tezos.git" +dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "ocamlfind" { build } @@ -18,6 +17,6 @@ depends: [ build: [ [ "dune" "build" "-p" name "-j" jobs ] ] -build-test: [ +run-test: [ [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/src/lib_crypto/tezos-crypto.opam b/src/lib_crypto/tezos-crypto.opam index 2b62c6833..4051d4e1f 100644 --- a/src/lib_crypto/tezos-crypto.opam +++ b/src/lib_crypto/tezos-crypto.opam @@ -1,10 +1,9 @@ -opam-version: "1.2" -version: "dev" +opam-version: "2.0" maintainer: "contact@tezos.com" authors: [ "Tezos devteam" ] homepage: "https://www.tezos.com/" bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "https://gitlab.com/tezos/tezos.git" +dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "ocamlfind" { build } @@ -20,11 +19,11 @@ depends: [ "zarith" "secp256k1" "uecc" - "alcotest" { test & >= "0.8.3" } + "alcotest" { with-test & >= "0.8.3" } ] build: [ [ "dune" "build" "-p" name "-j" jobs ] ] -build-test: [ +run-test: [ [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/src/lib_data_encoding/tezos-data-encoding.opam b/src/lib_data_encoding/tezos-data-encoding.opam index c39bb007e..fd585a55d 100644 --- a/src/lib_data_encoding/tezos-data-encoding.opam +++ b/src/lib_data_encoding/tezos-data-encoding.opam @@ -1,10 +1,9 @@ -opam-version: "1.2" -version: "dev" +opam-version: "2.0" maintainer: "contact@tezos.com" authors: [ "Tezos devteam" ] homepage: "https://www.tezos.com/" bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "https://gitlab.com/tezos/tezos.git" +dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "ocamlfind" { build } @@ -14,12 +13,12 @@ depends: [ "ocplib-json-typed" "ocplib-json-typed-bson" "ocplib-endian" - "alcotest" { test } - "crowbar" { test } + "alcotest" { with-test } + "crowbar" { with-test } ] build: [ [ "dune" "build" "-p" name "-j" jobs ] ] -build-test: [ +run-test: [ [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/src/lib_error_monad/tezos-error-monad.opam b/src/lib_error_monad/tezos-error-monad.opam index a8f1fcf0c..dba13879f 100644 --- a/src/lib_error_monad/tezos-error-monad.opam +++ b/src/lib_error_monad/tezos-error-monad.opam @@ -1,10 +1,9 @@ -opam-version: "1.2" -version: "dev" +opam-version: "2.0" maintainer: "contact@tezos.com" authors: [ "Tezos devteam" ] homepage: "https://www.tezos.com/" bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "https://gitlab.com/tezos/tezos.git" +dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "ocamlfind" { build } @@ -16,6 +15,6 @@ depends: [ build: [ [ "dune" "build" "-p" name "-j" jobs ] ] -build-test: [ +run-test: [ [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/src/lib_micheline/tezos-micheline.opam b/src/lib_micheline/tezos-micheline.opam index 3b30d92f8..2dfbb7711 100644 --- a/src/lib_micheline/tezos-micheline.opam +++ b/src/lib_micheline/tezos-micheline.opam @@ -1,10 +1,9 @@ -opam-version: "1.2" -version: "dev" +opam-version: "2.0" maintainer: "contact@tezos.com" authors: [ "Tezos devteam" ] homepage: "https://www.tezos.com/" bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "https://gitlab.com/tezos/tezos.git" +dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "ocamlfind" { build } @@ -16,6 +15,6 @@ depends: [ build: [ [ "dune" "build" "-p" name "-j" jobs ] ] -build-test: [ +run-test: [ [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/src/lib_p2p/tezos-p2p.opam b/src/lib_p2p/tezos-p2p.opam index 3e332f7fb..65fa125f4 100644 --- a/src/lib_p2p/tezos-p2p.opam +++ b/src/lib_p2p/tezos-p2p.opam @@ -1,10 +1,9 @@ -opam-version: "1.2" -version: "dev" +opam-version: "2.0" maintainer: "contact@tezos.com" authors: [ "Tezos devteam" ] homepage: "https://www.tezos.com/" bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "https://gitlab.com/tezos/tezos.git" +dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "ocamlfind" { build } @@ -12,11 +11,11 @@ depends: [ "tezos-base" "tezos-stdlib-unix" "tezos-shell-services" - "alcotest-lwt" { test } + "alcotest-lwt" { with-test } ] build: [ [ "dune" "build" "-p" name "-j" jobs ] ] -build-test: [ +run-test: [ [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/src/lib_protocol_compiler/tezos-protocol-compiler.opam b/src/lib_protocol_compiler/tezos-protocol-compiler.opam index 9521c7f22..f7a494c94 100644 --- a/src/lib_protocol_compiler/tezos-protocol-compiler.opam +++ b/src/lib_protocol_compiler/tezos-protocol-compiler.opam @@ -1,12 +1,13 @@ -opam-version: "1.2" -version: "dev" +opam-version: "2.0" maintainer: "contact@tezos.com" authors: [ "Tezos devteam" ] homepage: "https://www.tezos.com/" bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "https://gitlab.com/tezos/tezos.git" +dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ + ## ocaml should be in sync with `script/version.sh` + "ocaml" { = "4.06.1" } "ocamlfind" { build } "dune" { build & >= "1.0.1" } "base-unix" @@ -19,8 +20,6 @@ depends: [ build: [ [ "dune" "build" "-p" name "-j" jobs ] ] -build-test: [ +run-test: [ [ "dune" "runtest" "-p" name "-j" jobs ] ] -## ocaml-version should be in sync with `script/version.sh` -available: [ ocaml-version = "4.06.1" ] diff --git a/src/lib_protocol_environment/tezos-protocol-environment-shell.opam b/src/lib_protocol_environment/tezos-protocol-environment-shell.opam index 8b81cb70c..8a4934186 100644 --- a/src/lib_protocol_environment/tezos-protocol-environment-shell.opam +++ b/src/lib_protocol_environment/tezos-protocol-environment-shell.opam @@ -1,10 +1,9 @@ -opam-version: "1.2" -version: "dev" +opam-version: "2.0" maintainer: "contact@tezos.com" authors: [ "Tezos devteam" ] homepage: "https://www.tezos.com/" bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "https://gitlab.com/tezos/tezos.git" +dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "ocamlfind" { build } @@ -16,6 +15,6 @@ depends: [ build: [ [ "dune" "build" "-p" name "-j" jobs ] ] -build-test: [ +run-test: [ [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/src/lib_protocol_environment/tezos-protocol-environment-sigs.opam b/src/lib_protocol_environment/tezos-protocol-environment-sigs.opam index 12888518b..ac88e68d3 100644 --- a/src/lib_protocol_environment/tezos-protocol-environment-sigs.opam +++ b/src/lib_protocol_environment/tezos-protocol-environment-sigs.opam @@ -1,19 +1,18 @@ -opam-version: "1.2" -version: "dev" +opam-version: "2.0" maintainer: "contact@tezos.com" authors: [ "Tezos devteam" ] homepage: "https://www.tezos.com/" bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "https://gitlab.com/tezos/tezos.git" +dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "ocamlfind" { build } "dune" { build & >= "1.0.1" } - "tezos-stdlib" { test } + "tezos-stdlib" { with-test } ] build: [ [ "dune" "build" "-p" name "-j" jobs ] ] -build-test: [ +run-test: [ [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/src/lib_protocol_environment/tezos-protocol-environment.opam b/src/lib_protocol_environment/tezos-protocol-environment.opam index 346a5f076..a3350d924 100644 --- a/src/lib_protocol_environment/tezos-protocol-environment.opam +++ b/src/lib_protocol_environment/tezos-protocol-environment.opam @@ -1,21 +1,20 @@ -opam-version: "1.2" -version: "dev" +opam-version: "2.0" maintainer: "contact@tezos.com" authors: [ "Tezos devteam" ] homepage: "https://www.tezos.com/" bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "https://gitlab.com/tezos/tezos.git" +dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "ocamlfind" { build } "dune" { build & >= "1.0.1" } "tezos-base" "tezos-protocol-environment-sigs" - "alcotest-lwt" { test } + "alcotest-lwt" { with-test } ] build: [ [ "dune" "build" "-p" name "-j" jobs ] ] -build-test: [ +run-test: [ [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/src/lib_protocol_updater/tezos-protocol-updater.opam b/src/lib_protocol_updater/tezos-protocol-updater.opam index 88bc5f9c4..49cd2a8d2 100644 --- a/src/lib_protocol_updater/tezos-protocol-updater.opam +++ b/src/lib_protocol_updater/tezos-protocol-updater.opam @@ -1,10 +1,9 @@ -opam-version: "1.2" -version: "dev" +opam-version: "2.0" maintainer: "contact@tezos.com" authors: [ "Tezos devteam" ] homepage: "https://www.tezos.com/" bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "https://gitlab.com/tezos/tezos.git" +dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "ocamlfind" { build } @@ -20,6 +19,6 @@ depends: [ build: [ [ "dune" "build" "-p" name "-j" jobs ] ] -build-test: [ +run-test: [ [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/src/lib_rpc/tezos-rpc.opam b/src/lib_rpc/tezos-rpc.opam index 81aa1a565..74ea0e878 100644 --- a/src/lib_rpc/tezos-rpc.opam +++ b/src/lib_rpc/tezos-rpc.opam @@ -1,10 +1,9 @@ -opam-version: "1.2" -version: "dev" +opam-version: "2.0" maintainer: "contact@tezos.com" authors: [ "Tezos devteam" ] homepage: "https://www.tezos.com/" bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "https://gitlab.com/tezos/tezos.git" +dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "ocamlfind" { build } @@ -17,6 +16,6 @@ depends: [ build: [ [ "dune" "build" "-p" name "-j" jobs ] ] -build-test: [ +run-test: [ [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/src/lib_rpc_http/tezos-rpc-http.opam b/src/lib_rpc_http/tezos-rpc-http.opam index f2e961f9d..eebcc0c9b 100644 --- a/src/lib_rpc_http/tezos-rpc-http.opam +++ b/src/lib_rpc_http/tezos-rpc-http.opam @@ -1,10 +1,9 @@ -opam-version: "1.2" -version: "dev" +opam-version: "2.0" maintainer: "contact@tezos.com" authors: [ "Tezos devteam" ] homepage: "https://www.tezos.com/" bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "https://gitlab.com/tezos/tezos.git" +dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "ocamlfind" { build } @@ -16,6 +15,6 @@ depends: [ build: [ [ "dune" "build" "-p" name "-j" jobs ] ] -build-test: [ +run-test: [ [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/src/lib_shell/tezos-shell.opam b/src/lib_shell/tezos-shell.opam index 72d7a06bb..076fe6780 100644 --- a/src/lib_shell/tezos-shell.opam +++ b/src/lib_shell/tezos-shell.opam @@ -1,10 +1,9 @@ -opam-version: "1.2" -version: "dev" +opam-version: "2.0" maintainer: "contact@tezos.com" authors: [ "Tezos devteam" ] homepage: "https://www.tezos.com/" bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "https://gitlab.com/tezos/tezos.git" +dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "ocamlfind" { build } @@ -15,14 +14,14 @@ depends: [ "tezos-shell-services" "tezos-protocol-updater" "tezos-validation" - "alcotest-lwt" { test } - "tezos-embedded-protocol-demo" { test } - "tezos-protocol-environment" { test } - "tezos-protocol-alpha" { test } + "alcotest-lwt" { with-test } + "tezos-embedded-protocol-demo" { with-test } + "tezos-protocol-environment" { with-test } + "tezos-protocol-alpha" { with-test } ] build: [ [ "dune" "build" "-p" name "-j" jobs ] ] -build-test: [ +run-test: [ [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/src/lib_shell_services/tezos-shell-services.opam b/src/lib_shell_services/tezos-shell-services.opam index cf7d941d2..d8ddbe960 100644 --- a/src/lib_shell_services/tezos-shell-services.opam +++ b/src/lib_shell_services/tezos-shell-services.opam @@ -1,10 +1,9 @@ -opam-version: "1.2" -version: "dev" +opam-version: "2.0" maintainer: "contact@tezos.com" authors: [ "Tezos devteam" ] homepage: "https://www.tezos.com/" bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "https://gitlab.com/tezos/tezos.git" +dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "ocamlfind" { build } @@ -14,6 +13,6 @@ depends: [ build: [ [ "dune" "build" "-p" name "-j" jobs ] ] -build-test: [ +run-test: [ [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/src/lib_signer_backends/tezos-signer-backends.opam b/src/lib_signer_backends/tezos-signer-backends.opam index 00d94a533..05fa561c1 100644 --- a/src/lib_signer_backends/tezos-signer-backends.opam +++ b/src/lib_signer_backends/tezos-signer-backends.opam @@ -1,10 +1,9 @@ -opam-version: "1.2" -version: "dev" +opam-version: "2.0" maintainer: "contact@tezos.com" authors: [ "Tezos devteam" ] homepage: "https://www.tezos.com/" bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "https://gitlab.com/tezos/tezos.git" +dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "ocamlfind" { build } @@ -17,12 +16,12 @@ depends: [ "pbkdf" "bip39" "ledgerwallet-tezos" - "alcotest" {test & >= "0.8.1"} - "alcotest-lwt" {test & >= "0.8.0"} + "alcotest" {with-test & >= "0.8.1"} + "alcotest-lwt" {with-test & >= "0.8.0"} ] build: [ [ "dune" "build" "-p" name "-j" jobs ] ] -build-test: [ +run-test: [ [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/src/lib_signer_services/tezos-signer-services.opam b/src/lib_signer_services/tezos-signer-services.opam index f4621f35a..decc2863c 100644 --- a/src/lib_signer_services/tezos-signer-services.opam +++ b/src/lib_signer_services/tezos-signer-services.opam @@ -1,10 +1,9 @@ -opam-version: "1.2" -version: "dev" +opam-version: "2.0" maintainer: "contact@tezos.com" authors: [ "Tezos devteam" ] homepage: "https://www.tezos.com/" bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "https://gitlab.com/tezos/tezos.git" +dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "ocamlfind" { build } @@ -16,6 +15,6 @@ depends: [ build: [ [ "dune" "build" "-p" name "-j" jobs ] ] -build-test: [ +run-test: [ [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/src/lib_stdlib/tezos-stdlib.opam b/src/lib_stdlib/tezos-stdlib.opam index fc65c1c2d..75ff3f6ce 100644 --- a/src/lib_stdlib/tezos-stdlib.opam +++ b/src/lib_stdlib/tezos-stdlib.opam @@ -1,10 +1,9 @@ -opam-version: "1.2" -version: "dev" +opam-version: "2.0" maintainer: "contact@tezos.com" authors: [ "Tezos devteam" ] homepage: "https://www.tezos.com/" bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "https://gitlab.com/tezos/tezos.git" +dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "ocamlfind" { build } @@ -15,12 +14,12 @@ depends: [ "re" "lwt" "zarith" - "alcotest" { test } - "ocp-indent" { test } + "alcotest" { with-test } + "ocp-indent" { with-test } ] build: [ [ "dune" "build" "-p" name "-j" jobs ] ] -build-test: [ +run-test: [ [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/src/lib_stdlib_unix/tezos-stdlib-unix.opam b/src/lib_stdlib_unix/tezos-stdlib-unix.opam index 65c368055..b70718cfc 100644 --- a/src/lib_stdlib_unix/tezos-stdlib-unix.opam +++ b/src/lib_stdlib_unix/tezos-stdlib-unix.opam @@ -1,10 +1,9 @@ -opam-version: "1.2" -version: "dev" +opam-version: "2.0" maintainer: "contact@tezos.com" authors: [ "Tezos devteam" ] homepage: "https://www.tezos.com/" bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "https://gitlab.com/tezos/tezos.git" +dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "ocamlfind" { build } @@ -17,6 +16,6 @@ depends: [ build: [ [ "dune" "build" "-p" name "-j" jobs ] ] -build-test: [ +run-test: [ [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/src/lib_storage/tezos-storage.opam b/src/lib_storage/tezos-storage.opam index 5dbe8b6ec..4b7ee9007 100644 --- a/src/lib_storage/tezos-storage.opam +++ b/src/lib_storage/tezos-storage.opam @@ -1,10 +1,9 @@ -opam-version: "1.2" -version: "dev" +opam-version: "2.0" maintainer: "contact@tezos.com" authors: [ "Tezos devteam" ] homepage: "https://www.tezos.com/" bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "https://gitlab.com/tezos/tezos.git" +dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "ocamlfind" { build } @@ -12,12 +11,12 @@ depends: [ "tezos-base" "lmdb" "irmin-lmdb" - "tezos-stdlib-unix" { test } - "alcotest-lwt" { test } + "tezos-stdlib-unix" { with-test } + "alcotest-lwt" { with-test } ] build: [ [ "dune" "build" "-p" name "-j" jobs ] ] -build-test: [ +run-test: [ [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/src/lib_validation/tezos-validation.opam b/src/lib_validation/tezos-validation.opam index cc400a290..331c8782b 100644 --- a/src/lib_validation/tezos-validation.opam +++ b/src/lib_validation/tezos-validation.opam @@ -1,10 +1,9 @@ -opam-version: "1.2" -version: "dev" +opam-version: "2.0" maintainer: "contact@tezos.com" authors: [ "Tezos devteam" ] homepage: "https://www.tezos.com/" bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "https://gitlab.com/tezos/tezos.git" +dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "ocamlfind" { build } @@ -17,6 +16,6 @@ depends: [ build: [ [ "dune" "build" "-p" name "-j" jobs ] ] -build-test: [ +run-test: [ [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/src/proto_alpha/bin_accuser/tezos-accuser-alpha.opam b/src/proto_alpha/bin_accuser/tezos-accuser-alpha.opam index 2802b018a..1ef835858 100644 --- a/src/proto_alpha/bin_accuser/tezos-accuser-alpha.opam +++ b/src/proto_alpha/bin_accuser/tezos-accuser-alpha.opam @@ -1,10 +1,9 @@ -opam-version: "1.2" -version: "dev" +opam-version: "2.0" maintainer: "contact@tezos.com" authors: [ "Tezos devteam" ] homepage: "https://www.tezos.com/" bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "https://gitlab.com/tezos/tezos.git" +dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "ocamlfind" { build } diff --git a/src/proto_alpha/bin_baker/tezos-baker-alpha.opam b/src/proto_alpha/bin_baker/tezos-baker-alpha.opam index 2802b018a..1ef835858 100644 --- a/src/proto_alpha/bin_baker/tezos-baker-alpha.opam +++ b/src/proto_alpha/bin_baker/tezos-baker-alpha.opam @@ -1,10 +1,9 @@ -opam-version: "1.2" -version: "dev" +opam-version: "2.0" maintainer: "contact@tezos.com" authors: [ "Tezos devteam" ] homepage: "https://www.tezos.com/" bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "https://gitlab.com/tezos/tezos.git" +dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "ocamlfind" { build } diff --git a/src/proto_alpha/bin_endorser/tezos-endorser-alpha.opam b/src/proto_alpha/bin_endorser/tezos-endorser-alpha.opam index 2802b018a..1ef835858 100644 --- a/src/proto_alpha/bin_endorser/tezos-endorser-alpha.opam +++ b/src/proto_alpha/bin_endorser/tezos-endorser-alpha.opam @@ -1,10 +1,9 @@ -opam-version: "1.2" -version: "dev" +opam-version: "2.0" maintainer: "contact@tezos.com" authors: [ "Tezos devteam" ] homepage: "https://www.tezos.com/" bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "https://gitlab.com/tezos/tezos.git" +dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "ocamlfind" { build } diff --git a/src/proto_alpha/lib_client/tezos-client-alpha.opam b/src/proto_alpha/lib_client/tezos-client-alpha.opam index 424960f26..8aa6a6887 100644 --- a/src/proto_alpha/lib_client/tezos-client-alpha.opam +++ b/src/proto_alpha/lib_client/tezos-client-alpha.opam @@ -1,10 +1,9 @@ -opam-version: "1.2" -version: "dev" +opam-version: "2.0" maintainer: "contact@tezos.com" authors: [ "Tezos devteam" ] homepage: "https://www.tezos.com/" bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "https://gitlab.com/tezos/tezos.git" +dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "ocamlfind" { build } diff --git a/src/proto_alpha/lib_client_commands/tezos-client-alpha-commands.opam b/src/proto_alpha/lib_client_commands/tezos-client-alpha-commands.opam index 372ee0835..bc50bfd23 100644 --- a/src/proto_alpha/lib_client_commands/tezos-client-alpha-commands.opam +++ b/src/proto_alpha/lib_client_commands/tezos-client-alpha-commands.opam @@ -1,10 +1,9 @@ -opam-version: "1.2" -version: "dev" +opam-version: "2.0" maintainer: "contact@tezos.com" authors: [ "Tezos devteam" ] homepage: "https://www.tezos.com/" bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "https://gitlab.com/tezos/tezos.git" +dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "ocamlfind" { build } diff --git a/src/proto_alpha/lib_delegate/tezos-accuser-alpha-commands.opam b/src/proto_alpha/lib_delegate/tezos-accuser-alpha-commands.opam index 5bb92a002..9eb56574c 100644 --- a/src/proto_alpha/lib_delegate/tezos-accuser-alpha-commands.opam +++ b/src/proto_alpha/lib_delegate/tezos-accuser-alpha-commands.opam @@ -1,10 +1,9 @@ -opam-version: "1.2" -version: "dev" +opam-version: "2.0" maintainer: "contact@tezos.com" authors: [ "Tezos devteam" ] homepage: "https://www.tezos.com/" bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "https://gitlab.com/tezos/tezos.git" +dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "ocamlfind" { build } @@ -17,7 +16,7 @@ depends: [ "tezos-client-commands" "tezos-client-alpha" "tezos-baking-alpha" - "tezos-signer-backends" { test } + "tezos-signer-backends" { with-test } ] build: [ [ "dune" "build" "-p" name "-j" jobs ] diff --git a/src/proto_alpha/lib_delegate/tezos-baker-alpha-commands.opam b/src/proto_alpha/lib_delegate/tezos-baker-alpha-commands.opam index 5bb92a002..9eb56574c 100644 --- a/src/proto_alpha/lib_delegate/tezos-baker-alpha-commands.opam +++ b/src/proto_alpha/lib_delegate/tezos-baker-alpha-commands.opam @@ -1,10 +1,9 @@ -opam-version: "1.2" -version: "dev" +opam-version: "2.0" maintainer: "contact@tezos.com" authors: [ "Tezos devteam" ] homepage: "https://www.tezos.com/" bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "https://gitlab.com/tezos/tezos.git" +dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "ocamlfind" { build } @@ -17,7 +16,7 @@ depends: [ "tezos-client-commands" "tezos-client-alpha" "tezos-baking-alpha" - "tezos-signer-backends" { test } + "tezos-signer-backends" { with-test } ] build: [ [ "dune" "build" "-p" name "-j" jobs ] diff --git a/src/proto_alpha/lib_delegate/tezos-baking-alpha-commands.opam b/src/proto_alpha/lib_delegate/tezos-baking-alpha-commands.opam index 5bb92a002..9eb56574c 100644 --- a/src/proto_alpha/lib_delegate/tezos-baking-alpha-commands.opam +++ b/src/proto_alpha/lib_delegate/tezos-baking-alpha-commands.opam @@ -1,10 +1,9 @@ -opam-version: "1.2" -version: "dev" +opam-version: "2.0" maintainer: "contact@tezos.com" authors: [ "Tezos devteam" ] homepage: "https://www.tezos.com/" bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "https://gitlab.com/tezos/tezos.git" +dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "ocamlfind" { build } @@ -17,7 +16,7 @@ depends: [ "tezos-client-commands" "tezos-client-alpha" "tezos-baking-alpha" - "tezos-signer-backends" { test } + "tezos-signer-backends" { with-test } ] build: [ [ "dune" "build" "-p" name "-j" jobs ] diff --git a/src/proto_alpha/lib_delegate/tezos-baking-alpha.opam b/src/proto_alpha/lib_delegate/tezos-baking-alpha.opam index df3a14279..7ca8b47c2 100644 --- a/src/proto_alpha/lib_delegate/tezos-baking-alpha.opam +++ b/src/proto_alpha/lib_delegate/tezos-baking-alpha.opam @@ -1,10 +1,9 @@ -opam-version: "1.2" -version: "dev" +opam-version: "2.0" maintainer: "contact@tezos.com" authors: [ "Tezos devteam" ] homepage: "https://www.tezos.com/" bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "https://gitlab.com/tezos/tezos.git" +dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "ocamlfind" { build } @@ -16,14 +15,14 @@ depends: [ "tezos-client-base" "tezos-client-commands" "tezos-client-alpha" - "tezos-node" { test } - "tezos-client-genesis" { test } - "tezos-client-base-unix" { test } - "alcotest-lwt" { test } + "tezos-node" { with-test } + "tezos-client-genesis" { with-test } + "tezos-client-base-unix" { with-test } + "alcotest-lwt" { with-test } ] build: [ [ "dune" "build" "-p" name "-j" jobs ] ] -build-test: [ +run-test: [ [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/src/proto_alpha/lib_delegate/tezos-endorser-alpha-commands.opam b/src/proto_alpha/lib_delegate/tezos-endorser-alpha-commands.opam index 5bb92a002..9eb56574c 100644 --- a/src/proto_alpha/lib_delegate/tezos-endorser-alpha-commands.opam +++ b/src/proto_alpha/lib_delegate/tezos-endorser-alpha-commands.opam @@ -1,10 +1,9 @@ -opam-version: "1.2" -version: "dev" +opam-version: "2.0" maintainer: "contact@tezos.com" authors: [ "Tezos devteam" ] homepage: "https://www.tezos.com/" bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "https://gitlab.com/tezos/tezos.git" +dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "ocamlfind" { build } @@ -17,7 +16,7 @@ depends: [ "tezos-client-commands" "tezos-client-alpha" "tezos-baking-alpha" - "tezos-signer-backends" { test } + "tezos-signer-backends" { with-test } ] build: [ [ "dune" "build" "-p" name "-j" jobs ] diff --git a/src/proto_alpha/lib_protocol/tezos-embedded-protocol-alpha.opam b/src/proto_alpha/lib_protocol/tezos-embedded-protocol-alpha.opam index 1d001fdbb..55f4c1ffd 100644 --- a/src/proto_alpha/lib_protocol/tezos-embedded-protocol-alpha.opam +++ b/src/proto_alpha/lib_protocol/tezos-embedded-protocol-alpha.opam @@ -1,10 +1,9 @@ -opam-version: "1.2" -version: "dev" +opam-version: "2.0" maintainer: "contact@tezos.com" authors: [ "Tezos devteam" ] homepage: "https://www.tezos.com/" bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "https://gitlab.com/tezos/tezos.git" +dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "ocamlfind" { build } @@ -19,6 +18,6 @@ build: [ [ "sed" "-i" "s/let predefined_version = None/let predefined_version = Some \"alpha\"/" "src/dune" ] [ "dune" "build" "-p" name "-j" jobs ] ] -build-test: [ +run-test: [ [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/src/proto_alpha/lib_protocol/tezos-protocol-alpha.opam b/src/proto_alpha/lib_protocol/tezos-protocol-alpha.opam index 0197d10ae..b9ea2c80f 100644 --- a/src/proto_alpha/lib_protocol/tezos-protocol-alpha.opam +++ b/src/proto_alpha/lib_protocol/tezos-protocol-alpha.opam @@ -1,21 +1,20 @@ -opam-version: "1.2" -version: "dev" +opam-version: "2.0" maintainer: "contact@tezos.com" authors: [ "Tezos devteam" ] homepage: "https://www.tezos.com/" bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "https://gitlab.com/tezos/tezos.git" +dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "ocamlfind" { build } "dune" { build & >= "1.0.1" } "tezos-base" "tezos-protocol-compiler" - "alcotest-lwt" { test } - "tezos-stdlib-unix" { test } - "tezos-protocol-environment" { test } - "tezos-shell-services" { test } - "bip39" { test } + "alcotest-lwt" { with-test } + "tezos-stdlib-unix" { with-test } + "tezos-protocol-environment" { with-test } + "tezos-shell-services" { with-test } + "bip39" { with-test } ] build: [ [ "rm" "dune" "src/dune" ] @@ -23,6 +22,6 @@ build: [ [ "sed" "-i" "s/let predefined_version = None/let predefined_version = Some \"alpha\"/" "dune" ] [ "dune" "build" "-p" name "-j" jobs ] ] -build-test: [ +run-test: [ [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/src/proto_demo/lib_protocol/tezos-embedded-protocol-demo.opam b/src/proto_demo/lib_protocol/tezos-embedded-protocol-demo.opam index 14ec9a7c5..e8dafcbdb 100644 --- a/src/proto_demo/lib_protocol/tezos-embedded-protocol-demo.opam +++ b/src/proto_demo/lib_protocol/tezos-embedded-protocol-demo.opam @@ -1,10 +1,9 @@ -opam-version: "1.2" -version: "dev" +opam-version: "2.0" maintainer: "contact@tezos.com" authors: [ "Tezos devteam" ] homepage: "https://www.tezos.com/" bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "https://gitlab.com/tezos/tezos.git" +dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "ocamlfind" { build } @@ -18,6 +17,6 @@ build: [ [ "sed" "-i" "s/let predefined_version = None/let predefined_version = Some \"demo\"/" "src/dune" ] [ "dune" "build" "-p" name "-j" jobs ] ] -build-test: [ +run-test: [ [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/src/proto_demo/lib_protocol/tezos-protocol-demo.opam b/src/proto_demo/lib_protocol/tezos-protocol-demo.opam index fda0c087d..ffed72264 100644 --- a/src/proto_demo/lib_protocol/tezos-protocol-demo.opam +++ b/src/proto_demo/lib_protocol/tezos-protocol-demo.opam @@ -1,10 +1,9 @@ -opam-version: "1.2" -version: "dev" +opam-version: "2.0" maintainer: "contact@tezos.com" authors: [ "Tezos devteam" ] homepage: "https://www.tezos.com/" bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "https://gitlab.com/tezos/tezos.git" +dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "ocamlfind" { build } @@ -17,6 +16,6 @@ build: [ [ "sed" "-i" "s/let predefined_version = None/let predefined_version = Some \"demo\"/" "dune" ] [ "dune" "build" "-p" name "-j" jobs ] ] -build-test: [ +run-test: [ [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/src/proto_genesis/lib_client/tezos-client-genesis.opam b/src/proto_genesis/lib_client/tezos-client-genesis.opam index 4c67738fb..25cb6084e 100644 --- a/src/proto_genesis/lib_client/tezos-client-genesis.opam +++ b/src/proto_genesis/lib_client/tezos-client-genesis.opam @@ -1,10 +1,9 @@ -opam-version: "1.2" -version: "dev" +opam-version: "2.0" maintainer: "contact@tezos.com" authors: [ "Tezos devteam" ] homepage: "https://www.tezos.com/" bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "https://gitlab.com/tezos/tezos.git" +dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "ocamlfind" { build } @@ -19,6 +18,6 @@ depends: [ build: [ [ "dune" "build" "-p" name "-j" jobs ] ] -build-test: [ +run-test: [ [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/src/proto_genesis/lib_protocol/tezos-embedded-protocol-genesis.opam b/src/proto_genesis/lib_protocol/tezos-embedded-protocol-genesis.opam index 63f1fc3db..de3328cd4 100644 --- a/src/proto_genesis/lib_protocol/tezos-embedded-protocol-genesis.opam +++ b/src/proto_genesis/lib_protocol/tezos-embedded-protocol-genesis.opam @@ -1,10 +1,9 @@ -opam-version: "1.2" -version: "dev" +opam-version: "2.0" maintainer: "contact@tezos.com" authors: [ "Tezos devteam" ] homepage: "https://www.tezos.com/" bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "https://gitlab.com/tezos/tezos.git" +dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "ocamlfind" { build } @@ -18,6 +17,6 @@ build: [ [ "sed" "-i" "s/let predefined_version = None/let predefined_version = Some \"genesis\"/" "src/dune" ] [ "dune" "build" "-p" name "-j" jobs ] ] -build-test: [ +run-test: [ [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/src/proto_genesis/lib_protocol/tezos-protocol-genesis.opam b/src/proto_genesis/lib_protocol/tezos-protocol-genesis.opam index 24fdfda67..8d888e94f 100644 --- a/src/proto_genesis/lib_protocol/tezos-protocol-genesis.opam +++ b/src/proto_genesis/lib_protocol/tezos-protocol-genesis.opam @@ -1,10 +1,9 @@ -opam-version: "1.2" -version: "dev" +opam-version: "2.0" maintainer: "contact@tezos.com" authors: [ "Tezos devteam" ] homepage: "https://www.tezos.com/" bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "https://gitlab.com/tezos/tezos.git" +dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "ocamlfind" { build } @@ -17,6 +16,6 @@ build: [ [ "sed" "-i" "s/let predefined_version = None/let predefined_version = Some \"genesis\"/" "dune" ] [ "dune" "build" "-p" name "-j" jobs ] ] -build-test: [ +run-test: [ [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/vendors/irmin-lmdb/irmin-lmdb.opam b/vendors/irmin-lmdb/irmin-lmdb.opam index 4e83e5751..4a0d64f0c 100644 --- a/vendors/irmin-lmdb/irmin-lmdb.opam +++ b/vendors/irmin-lmdb/irmin-lmdb.opam @@ -1,22 +1,20 @@ -opam-version: "1.2" +opam-version: "2.0" maintainer: "gregoire.henry@tezos.com" authors: ["Grégoire Henry"] license: "ISC" homepage: "https://gitlab.com/tezos/irmin-lmdb" bug-reports: "https://gitlab.com/tezos/irmin-lmdb/issues" -dev-repo: "https://gitlab.com/tezos/irmin-lmdb.git" +dev-repo: "git+https://gitlab.com/tezos/irmin-lmdb.git" doc: "https://tezos.gitlab.io/irmin-lmdb/" build: [ ["dune" "subst"] {pinned} ["dune" "build" "-p" name "-j" jobs] ] -build-test: ["dune" "runtest" "-p" name] +run-test: ["dune" "runtest" "-p" name] depends: [ "dune" {build & >= "1.0.1"} "irmin" {>= "1.4.0"} "lmdb" {>= "0.1"} ] - -available: [ocaml-version >= "4.01.0"] diff --git a/vendors/ocaml-bip39/bip39.opam b/vendors/ocaml-bip39/bip39.opam index 7a7137b2c..a0a3f54d4 100644 --- a/vendors/ocaml-bip39/bip39.opam +++ b/vendors/ocaml-bip39/bip39.opam @@ -1,4 +1,4 @@ -opam-version: "1.2" +opam-version: "2.0" name: "bip39" version: "1.0" maintainer: "Vincent Bernardoff " @@ -6,10 +6,9 @@ authors: ["Vincent Bernardoff "] homepage: "https://github.com/vbmithr/ocaml-bip39" doc: "https://vbmithr.github.io/ocaml-bip39/doc" license: "ISC" -dev-repo: "https://github.com/vbmithr/ocaml-bip39.git" +dev-repo: "git+https://github.com/vbmithr/ocaml-bip39.git" bug-reports: "https://github.com/vbmithr/ocaml-bip39/issues" tags: [] -available: [ ocaml-version >= "4.03.0" ] build: [ "dune" "build" "-j" jobs "-p" name "@install" ] depends: [ "dune" {build & >= "1.0.1"} @@ -18,6 +17,6 @@ depends: [ "hacl" "bigstring" {>= "0.2"} "pbkdf" {>= "0.2.0"} - "hex" {test & >= "1.2.0"} - "alcotest" {test & >= "0.8.1"} + "hex" {with-test & >= "1.2.0"} + "alcotest" {with-test & >= "0.8.1"} ] diff --git a/vendors/ocaml-blake2/blake2.opam b/vendors/ocaml-blake2/blake2.opam index 678540e89..425fab464 100644 --- a/vendors/ocaml-blake2/blake2.opam +++ b/vendors/ocaml-blake2/blake2.opam @@ -1,22 +1,16 @@ -opam-version: "1.2" +opam-version: "2.0" name: "blake2" -version: "dev" authors: "Vincent Bernardoff " maintainer: "Vincent Bernardoff " license: "ISC" homepage: "https://github.com/vbmithr/ocaml-blake2" bug-reports: "https://github.com/vbmithr/ocaml-blake2/issues" dev-repo: "git://github.com/vbmithr/ocaml-blake2" - -available: [ - ocaml-version >= "4.02.0" -] - build: [ "dune" "build" "-j" jobs "-p" name "@install" ] -build-test: [ "dune" "runtest" "-p" name "-j" jobs ] +run-test: [ "dune" "runtest" "-p" name "-j" jobs ] depends: [ "dune" {build & >= "1.0.1"} "bigstring" {>= "0.1.1"} - "alcotest" { test } - "hex" {test & >= "1.2.0"} + "alcotest" { with-test } + "hex" {with-test & >= "1.2.0"} ] diff --git a/vendors/ocaml-hacl/hacl.opam b/vendors/ocaml-hacl/hacl.opam index 2334934d0..7426fa14b 100644 --- a/vendors/ocaml-hacl/hacl.opam +++ b/vendors/ocaml-hacl/hacl.opam @@ -1,22 +1,20 @@ -opam-version: "1.2" +opam-version: "2.0" name: "hacl" -version: "dev" authors: [ "Vincent Bernardoff " "Marco Stronati " ] maintainer: "Vincent Bernardoff " homepage: "https://gitlab.com/tezos/tezos" bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "https://gitlab.com/tezos/tezos.git" +dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" {build & >= "1.0.1"} "bigstring" {>= "0.1.1"} "ocplib-endian" {>= "1.0"} "zarith" {>= "1.7"} - "alcotest" {test & >= "0.8.1"} - "hex" {test & >= "1.2.0"} + "alcotest" {with-test & >= "0.8.1"} + "hex" {with-test & >= "1.2.0"} "base" "stdio" ] build: [ "dune" "build" "-j" jobs "-p" name "@install" ] -build-test: [ "dune" "runtest" "-p" name "-j" jobs ] -available: [ ocaml-version >= "4.02.0" ] +run-test: [ "dune" "runtest" "-p" name "-j" jobs ] diff --git a/vendors/ocaml-ledger-wallet/ledgerwallet-tezos.opam b/vendors/ocaml-ledger-wallet/ledgerwallet-tezos.opam index bf642ca39..0aa14204c 100644 --- a/vendors/ocaml-ledger-wallet/ledgerwallet-tezos.opam +++ b/vendors/ocaml-ledger-wallet/ledgerwallet-tezos.opam @@ -1,19 +1,13 @@ -opam-version: "1.2" +opam-version: "2.0" name: "ledgerwallet-tezos" -version: "dev" authors: "Vincent Bernardoff " maintainer: "Vincent Bernardoff " license: "ISC" homepage: "https://github.com/vbmithr/ocaml-ledger-wallet" bug-reports: "https://github.com/vbmithr/ocaml-ledger-wallet/issues" dev-repo: "git://github.com/vbmithr/ocaml-ledger-wallet" - -available: [ - ocaml-version >= "4.02.0" -] - build: [ "dune" "build" "-j" jobs "-p" name "@install" ] -build-test: [ "dune" "runtest" "-p" name "-j" jobs ] +run-test: [ "dune" "runtest" "-p" name "-j" jobs ] depends: [ "dune" {build & >= "1.0.1"} "ledgerwallet" {= "dev"} diff --git a/vendors/ocaml-ledger-wallet/ledgerwallet.opam b/vendors/ocaml-ledger-wallet/ledgerwallet.opam index 8c5d2d96a..d91eb946c 100644 --- a/vendors/ocaml-ledger-wallet/ledgerwallet.opam +++ b/vendors/ocaml-ledger-wallet/ledgerwallet.opam @@ -1,19 +1,14 @@ -opam-version: "1.2" -name: "ledgerwallet" +opam-version: "2.0" version: "dev" +name: "ledgerwallet" authors: "Vincent Bernardoff " maintainer: "Vincent Bernardoff " license: "ISC" homepage: "https://github.com/vbmithr/ocaml-ledger-wallet" bug-reports: "https://github.com/vbmithr/ocaml-ledger-wallet/issues" dev-repo: "git://github.com/vbmithr/ocaml-ledger-wallet" - -available: [ - ocaml-version >= "4.02.0" -] - build: [ "dune" "build" "-j" jobs "-p" name "@install" ] -build-test: [ "dune" "runtest" "-p" name "-j" jobs ] +run-test: [ "dune" "runtest" "-p" name "-j" jobs ] depends: [ "dune" {build & >= "1.0.1"} "rresult" {>= "0.5.0"} diff --git a/vendors/ocaml-lmdb/lmdb.opam b/vendors/ocaml-lmdb/lmdb.opam index 6f4dcf64f..d07b59550 100644 --- a/vendors/ocaml-lmdb/lmdb.opam +++ b/vendors/ocaml-lmdb/lmdb.opam @@ -1,4 +1,4 @@ -opam-version: "1.2" +opam-version: "2.0" name: "lmdb" version: "0.1" authors: "Vincent Bernardoff " @@ -7,15 +7,10 @@ license: "ISC" homepage: "https://github.com/vbmithr/ocaml-lmdb" bug-reports: "https://github.com/vbmithr/ocaml-lmdb/issues" dev-repo: "git://github.com/vbmithr/ocaml-lmdb" - -available: [ - ocaml-version >= "4.02.0" -] - build: [ "dune" "build" "-j" jobs "-p" name "@install" ] depends: [ "dune" {build & >= "1.0.1"} "rresult" {>= "0.5.0"} - "cstruct" {test & >= "3.2.1"} - "alcotest" {test & >= "0.8.1"} + "cstruct" {with-test & >= "3.2.1"} + "alcotest" {with-test & >= "0.8.1"} ] diff --git a/vendors/ocaml-pbkdf/pbkdf.opam b/vendors/ocaml-pbkdf/pbkdf.opam index 9a9a9cd24..2864e2c48 100644 --- a/vendors/ocaml-pbkdf/pbkdf.opam +++ b/vendors/ocaml-pbkdf/pbkdf.opam @@ -1,20 +1,20 @@ -opam-version: "1.2" +opam-version: "2.0" name: "pbkdf" version: "0.3.0" homepage: "https://github.com/abeaumont/ocaml-pbkdf" -dev-repo: "https://github.com/abeaumont/ocaml-pbkdf.git" +dev-repo: "git+https://github.com/abeaumont/ocaml-pbkdf.git" bug-reports: "https://github.com/abeaumont/ocaml-pbkdf/issues" authors: ["Alfredo Beaumont " "Sonia Meruelo "] maintainer: ["Alfredo Beaumont "] license: "BSD2" build: [ "dune" "build" "-j" jobs "-p" name "@install" ] -build-test: [ "dune" "runtest" "-p" name "-j" jobs ] +run-test: [ "dune" "runtest" "-p" name "-j" jobs ] depends: [ "dune" { build & >= "1.0.1" } "hacl" "bigstring" {>= "0.2"} "ocplib-endian" {>= "1.0"} - "alcotest" {test & >= "0.8.1"} - "hex" {test & >= "1.2.0"} + "alcotest" {with-test & >= "0.8.1"} + "hex" {with-test & >= "1.2.0"} ] diff --git a/vendors/ocaml-secp256k1/secp256k1.opam b/vendors/ocaml-secp256k1/secp256k1.opam index 70a8a7038..6b08e2bb3 100644 --- a/vendors/ocaml-secp256k1/secp256k1.opam +++ b/vendors/ocaml-secp256k1/secp256k1.opam @@ -1,4 +1,4 @@ -opam-version: "1.2" +opam-version: "2.0" name: "secp256k1" version: "0.1" authors: "Vincent Bernardoff " @@ -6,11 +6,6 @@ maintainer: "Vincent Bernardoff " homepage: "https://github.com/vbmithr/ocaml-secp256k1-internal" bug-reports: "https://github.com/vbmithr/ocaml-secp256k1-internal/issues" dev-repo: "git://github.com/vbmithr/ocaml-secp256k1-internal" - -available: [ - ocaml-version >= "4.03.0" -] - build: [ "dune" "build" "-j" jobs "-p" name "@install" ] depends: [ "conf-gmp" {build} diff --git a/vendors/ocaml-uecc/uecc.opam b/vendors/ocaml-uecc/uecc.opam index a3f78c927..5444a95fe 100644 --- a/vendors/ocaml-uecc/uecc.opam +++ b/vendors/ocaml-uecc/uecc.opam @@ -1,4 +1,4 @@ -opam-version: "1.2" +opam-version: "2.0" name: "uecc" version: "1.0" authors: "Vincent Bernardoff " @@ -7,17 +7,12 @@ license: "ISC" homepage: "https://github.com/vbmithr/ocaml-uecc" bug-reports: "https://github.com/vbmithr/ocaml-uecc/issues" dev-repo: "git://github.com/vbmithr/ocaml-uecc" - -available: [ - ocaml-version >= "4.02.0" -] - build: [ "dune" "build" "-j" jobs "-p" name "@install" ] -build-test: [ "dune" "runtest" "-p" name "-j" jobs ] +run-test: [ "dune" "runtest" "-p" name "-j" jobs ] depends: [ "dune" {build & >= "1.0.1"} "bigstring" {>= "0.1.1"} - "alcotest" {test & >= "0.8.1"} - "cstruct" {test & >= "3.2.1"} - "hex" {test} + "alcotest" {with-test & >= "0.8.1"} + "cstruct" {with-test & >= "3.2.1"} + "hex" {with-test} ] diff --git a/vendors/ocplib-json-typed/lib_json_typed/ocplib-json-typed.opam b/vendors/ocplib-json-typed/lib_json_typed/ocplib-json-typed.opam index 1c2fb10f1..ef269e679 100644 --- a/vendors/ocplib-json-typed/lib_json_typed/ocplib-json-typed.opam +++ b/vendors/ocplib-json-typed/lib_json_typed/ocplib-json-typed.opam @@ -1,4 +1,4 @@ -opam-version: "1.2" +opam-version: "2.0" name: "ocplib-json-typed" version: "0.6" maintainer: "Benjamin Canou " @@ -6,11 +6,9 @@ authors: "Benjamin Canou " homepage: "https://github.com/ocamlpro/ocplib-json-typed" bug-reports: "https://github.com/ocamlpro/ocplib-json-typed/issues" license: "LGPLv3 w/ linking exception" -dev-repo: "https://github.com/ocamlpro/ocplib-json-typed.git" -available: [ ocaml-version >= "4.02.0" ] - +dev-repo: "git+https://github.com/ocamlpro/ocplib-json-typed.git" build: [ "dune" "build" "-j" jobs "-p" name "@install" ] -build-test: [ "dune" "runtest" "-p" name "-j" jobs ] +run-test: [ "dune" "runtest" "-p" name "-j" jobs ] depends: [ "dune" {build & >= "1.0.1"} "uri" {>= "1.9.0" } diff --git a/vendors/ocplib-json-typed/lib_json_typed_browser/ocplib-json-typed-browser.opam b/vendors/ocplib-json-typed/lib_json_typed_browser/ocplib-json-typed-browser.opam index 6a0e28d1c..98017e608 100644 --- a/vendors/ocplib-json-typed/lib_json_typed_browser/ocplib-json-typed-browser.opam +++ b/vendors/ocplib-json-typed/lib_json_typed_browser/ocplib-json-typed-browser.opam @@ -1,4 +1,4 @@ -opam-version: "1.2" +opam-version: "2.0" name: "ocplib-json-typed-browser" version: "0.6" maintainer: "Benjamin Canou " @@ -6,11 +6,9 @@ authors: "Benjamin Canou " homepage: "https://github.com/ocamlpro/ocplib-json-typed" bug-reports: "https://github.com/ocamlpro/ocplib-json-typed/issues" license: "LGPLv3 w/ linking exception" -dev-repo: "https://github.com/ocamlpro/ocplib-json-typed.git" -available: [ ocaml-version >= "4.02.0" ] - +dev-repo: "git+https://github.com/ocamlpro/ocplib-json-typed.git" build: [ "dune" "build" "-j" jobs "-p" name "@install" ] -build-test: [ "dune" "runtest" "-p" name "-j" jobs ] +run-test: [ "dune" "runtest" "-p" name "-j" jobs ] depends: [ "dune" {build & >= "1.0.1"} "ocplib-json-typed" {= "0.6" } diff --git a/vendors/ocplib-json-typed/lib_json_typed_bson/ocplib-json-typed-bson.opam b/vendors/ocplib-json-typed/lib_json_typed_bson/ocplib-json-typed-bson.opam index bd42db75d..c9d257b3a 100644 --- a/vendors/ocplib-json-typed/lib_json_typed_bson/ocplib-json-typed-bson.opam +++ b/vendors/ocplib-json-typed/lib_json_typed_bson/ocplib-json-typed-bson.opam @@ -1,4 +1,4 @@ -opam-version: "1.2" +opam-version: "2.0" name: "ocplib-json-typed-bson" version: "0.6" maintainer: "Benjamin Canou " @@ -6,11 +6,9 @@ authors: "Benjamin Canou " homepage: "https://github.com/ocamlpro/ocplib-json-typed" bug-reports: "https://github.com/ocamlpro/ocplib-json-typed/issues" license: "LGPLv3 w/ linking exception" -dev-repo: "https://github.com/ocamlpro/ocplib-json-typed.git" -available: [ ocaml-version >= "4.02.0" ] - +dev-repo: "git+https://github.com/ocamlpro/ocplib-json-typed.git" build: [ "dune" "build" "-j" jobs "-p" name "@install" ] -build-test: [ "dune" "runtest" "-p" name "-j" jobs ] +run-test: [ "dune" "runtest" "-p" name "-j" jobs ] depends: [ "dune" {build & >= "1.0.1"} "ocplib-json-typed" {= "0.6" } diff --git a/vendors/ocplib-resto/lib_ezresto-directory/ocplib-ezresto-directory.opam b/vendors/ocplib-resto/lib_ezresto-directory/ocplib-ezresto-directory.opam index 161c9dbba..314505b5a 100644 --- a/vendors/ocplib-resto/lib_ezresto-directory/ocplib-ezresto-directory.opam +++ b/vendors/ocplib-resto/lib_ezresto-directory/ocplib-ezresto-directory.opam @@ -1,5 +1,5 @@ version: "dev" -opam-version: "1.2" +opam-version: "2.0" maintainer: "Grégoire Henry " authors: "Grégoire Henry " license: "LGPL-2.1-with-OCaml-exception" @@ -10,7 +10,7 @@ dev-repo: "git+https://github.com/OCamlPro/ocplib-resto" build: [ [ "dune" "build" "-p" name "-j" jobs ] ] -build-test: [ +run-test: [ [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/vendors/ocplib-resto/lib_ezresto/ocplib-ezresto.opam b/vendors/ocplib-resto/lib_ezresto/ocplib-ezresto.opam index f49478bc4..af93a15ce 100644 --- a/vendors/ocplib-resto/lib_ezresto/ocplib-ezresto.opam +++ b/vendors/ocplib-resto/lib_ezresto/ocplib-ezresto.opam @@ -1,5 +1,5 @@ version: "dev" -opam-version: "1.2" +opam-version: "2.0" maintainer: "Grégoire Henry " authors: "Grégoire Henry " license: "LGPL-2.1-with-OCaml-exception" @@ -10,7 +10,7 @@ dev-repo: "git+https://github.com/OCamlPro/ocplib-resto" build: [ [ "dune" "build" "-p" name "-j" jobs ] ] -build-test: [ +run-test: [ [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/vendors/ocplib-resto/lib_resto-cohttp/ocplib-resto-cohttp.opam b/vendors/ocplib-resto/lib_resto-cohttp/ocplib-resto-cohttp.opam index ec4d7bade..7b21a1e68 100644 --- a/vendors/ocplib-resto/lib_resto-cohttp/ocplib-resto-cohttp.opam +++ b/vendors/ocplib-resto/lib_resto-cohttp/ocplib-resto-cohttp.opam @@ -1,5 +1,5 @@ version: "dev" -opam-version: "1.2" +opam-version: "2.0" maintainer: "Grégoire Henry " authors: "Grégoire Henry " license: "LGPL-2.1-with-OCaml-exception" @@ -10,7 +10,7 @@ dev-repo: "git+https://github.com/OCamlPro/ocplib-resto" build: [ [ "dune" "build" "-p" name "-j" jobs ] ] -build-test: [ +run-test: [ [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/vendors/ocplib-resto/lib_resto-directory/ocplib-resto-directory.opam b/vendors/ocplib-resto/lib_resto-directory/ocplib-resto-directory.opam index c27d6fb46..186a1f094 100644 --- a/vendors/ocplib-resto/lib_resto-directory/ocplib-resto-directory.opam +++ b/vendors/ocplib-resto/lib_resto-directory/ocplib-resto-directory.opam @@ -1,5 +1,5 @@ version: "dev" -opam-version: "1.2" +opam-version: "2.0" maintainer: "Grégoire Henry " authors: "Grégoire Henry " license: "LGPL-2.1-with-OCaml-exception" @@ -10,7 +10,7 @@ dev-repo: "git+https://github.com/OCamlPro/ocplib-resto" build: [ [ "dune" "build" "-p" name "-j" jobs ] ] -build-test: [ +run-test: [ [ "dune" "runtest" "-p" name "-j" jobs ] ] @@ -18,6 +18,6 @@ depends: [ "ocamlfind" {build} "dune" {build} "ocplib-resto" {= "dev" } - "ocplib-resto-json" {= "dev" & test } + "ocplib-resto-json" {= "dev" & with-test } "lwt" { >= "3.0.0" } ] diff --git a/vendors/ocplib-resto/lib_resto-json/ocplib-resto-json.opam b/vendors/ocplib-resto/lib_resto-json/ocplib-resto-json.opam index 9b05e0191..85156e001 100644 --- a/vendors/ocplib-resto/lib_resto-json/ocplib-resto-json.opam +++ b/vendors/ocplib-resto/lib_resto-json/ocplib-resto-json.opam @@ -1,5 +1,5 @@ version: "dev" -opam-version: "1.2" +opam-version: "2.0" maintainer: "Grégoire Henry " authors: "Grégoire Henry " license: "LGPL-2.1-with-OCaml-exception" @@ -10,7 +10,7 @@ dev-repo: "git+https://github.com/OCamlPro/ocplib-resto" build: [ [ "dune" "build" "-p" name "-j" jobs ] ] -build-test: [ +run-test: [ [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/vendors/ocplib-resto/lib_resto/ocplib-resto.opam b/vendors/ocplib-resto/lib_resto/ocplib-resto.opam index c51827634..98306f393 100644 --- a/vendors/ocplib-resto/lib_resto/ocplib-resto.opam +++ b/vendors/ocplib-resto/lib_resto/ocplib-resto.opam @@ -1,5 +1,5 @@ version: "dev" -opam-version: "1.2" +opam-version: "2.0" maintainer: "Grégoire Henry " authors: "Grégoire Henry " license: "LGPL-2.1-with-OCaml-exception" @@ -10,7 +10,7 @@ dev-repo: "git+https://github.com/OCamlPro/ocplib-resto" build: [ [ "dune" "build" "-p" name "-j" jobs ] ] -build-test: [ +run-test: [ [ "dune" "runtest" "-p" name "-j" jobs ] ]