From deb6cc76ab3e9ce35081333f3a5044c21b12c678 Mon Sep 17 00:00:00 2001 From: Killian Delarue Date: Mon, 13 Nov 2023 16:53:27 +0100 Subject: [PATCH] Manifest: Add 4.0.0 Tezt upperbound --- manifest/main.ml | 2 +- opam/bls12-381.opam | 2 +- opam/octez-alcotezt.opam | 2 +- opam/octez-l2-libs.opam | 2 +- opam/octez-libs.opam | 2 +- opam/octez-proto-libs.opam | 2 +- opam/octez-protocol-017-PtNairob-libs.opam | 2 +- opam/octez-protocol-018-Proxford-libs.opam | 2 +- opam/octez-protocol-alpha-libs.opam | 2 +- opam/octez-shell-libs.opam | 2 +- opam/octez-shell-tests.opam | 2 +- opam/octez-store-tests.opam | 2 +- opam/octez-testnet-scenarios.opam | 2 +- opam/scoru-sequencer-test.opam | 2 +- opam/tezos-benchmark-tests.opam | 2 +- opam/tezos-dac-lib-test.opam | 2 +- opam/tezos-dac-node-lib-test.opam | 2 +- opam/tezos-lazy-containers-tests.opam | 2 +- opam/tezos-micheline-rewriting.opam | 2 +- opam/tezos-openapi.opam | 2 +- opam/tezos-protocol-017-PtNairob-tests.opam | 2 +- opam/tezos-protocol-018-Proxford-tests.opam | 2 +- opam/tezos-protocol-alpha-tests.opam | 2 +- opam/tezos-proxy-server-config.opam | 2 +- opam/tezos-sc-rollup-node-test.opam | 2 +- opam/tezos-scoru-wasm-regressions.opam | 2 +- opam/tezos-smart-rollup-node-lib-test.opam | 2 +- opam/tezos-tps-evaluation.opam | 2 +- opam/tezos-tree-encoding-test.opam | 2 +- opam/tezt-ethereum.opam | 2 +- opam/tezt-tezos.opam | 2 +- opam/virtual/octez-deps.opam | 2 +- 32 files changed, 32 insertions(+), 32 deletions(-) diff --git a/manifest/main.ml b/manifest/main.ml index 72b6d5a4a6b6..fe39d872aa60 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -396,7 +396,7 @@ let tezt_lib = external_lib ~js_compatible:false "tezt" - V.(at_least "3.1.1") + V.(at_least "3.1.1" && less_than "4.0.0") ~main_module:"Tezt" let tezt_core_lib = diff --git a/opam/bls12-381.opam b/opam/bls12-381.opam index e1f36218e3e7..a6f262ca593b 100644 --- a/opam/bls12-381.opam +++ b/opam/bls12-381.opam @@ -15,7 +15,7 @@ depends: [ "zarith" { >= "1.12" & < "1.13" } "zarith_stubs_js" "hex" { >= "1.3.0" } - "tezt" { with-test & >= "3.1.1" } + "tezt" { with-test & >= "3.1.1" & < "4.0.0" } "octez-alcotezt" {with-test} "qcheck-alcotest" { with-test & >= "0.20" } ] diff --git a/opam/octez-alcotezt.opam b/opam/octez-alcotezt.opam index 4fc2fdcc453b..78ac765b3f63 100644 --- a/opam/octez-alcotezt.opam +++ b/opam/octez-alcotezt.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" & < "3.11" } "ocaml" { >= "4.14" } - "tezt" { >= "3.1.1" } + "tezt" { >= "3.1.1" & < "4.0.0" } ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/octez-l2-libs.opam b/opam/octez-l2-libs.opam index fc2407fc3520..839f38b6dfdc 100644 --- a/opam/octez-l2-libs.opam +++ b/opam/octez-l2-libs.opam @@ -25,7 +25,7 @@ depends: [ "ppx_import" "qcheck-alcotest" { >= "0.20" } "octez-alcotezt" - "tezt" { >= "3.1.1" } + "tezt" { >= "3.1.1" & < "4.0.0" } ] x-opam-monorepo-opam-provided: [ "tezos-rust-libs" diff --git a/opam/octez-libs.opam b/opam/octez-libs.opam index 8a0b4b3514b5..cf89c6034ac7 100644 --- a/opam/octez-libs.opam +++ b/opam/octez-libs.opam @@ -53,7 +53,7 @@ depends: [ "conf-libev" "uutf" "ringo" { >= "1.0.0" } - "tezt" { with-test & >= "3.1.1" } + "tezt" { with-test & >= "3.1.1" & < "4.0.0" } "qcheck-core" {with-test} "irmin" { >= "3.7.2" & < "3.8.0" } "irmin-pack" { >= "3.7.2" & < "3.8.0" } diff --git a/opam/octez-proto-libs.opam b/opam/octez-proto-libs.opam index b9a0850bab32..50f818f33125 100644 --- a/opam/octez-proto-libs.opam +++ b/opam/octez-proto-libs.opam @@ -19,7 +19,7 @@ depends: [ "class_group_vdf" { >= "0.0.4" } "aches" { >= "1.0.0" } "aches-lwt" { >= "1.0.0" } - "tezt" { with-test & >= "3.1.1" } + "tezt" { with-test & >= "3.1.1" & < "4.0.0" } "octez-alcotezt" {with-test} "qcheck-alcotest" { with-test & >= "0.20" } "lwt" { with-test & >= "5.6.0" } diff --git a/opam/octez-protocol-017-PtNairob-libs.opam b/opam/octez-protocol-017-PtNairob-libs.opam index 96d0ed2c2ebe..6ea06a9aeab2 100644 --- a/opam/octez-protocol-017-PtNairob-libs.opam +++ b/opam/octez-protocol-017-PtNairob-libs.opam @@ -28,7 +28,7 @@ depends: [ "tezos-dac-client-lib" "octez-injector" "octez-l2-libs" - "tezt" { with-test & >= "3.1.1" } + "tezt" { with-test & >= "3.1.1" & < "4.0.0" } "octez-alcotezt" {with-test} "tezos-dac-node-lib" {with-test} ] diff --git a/opam/octez-protocol-018-Proxford-libs.opam b/opam/octez-protocol-018-Proxford-libs.opam index 2d097ba6c09a..e9c161afddda 100644 --- a/opam/octez-protocol-018-Proxford-libs.opam +++ b/opam/octez-protocol-018-Proxford-libs.opam @@ -28,7 +28,7 @@ depends: [ "tezos-dac-client-lib" "octez-injector" "octez-l2-libs" - "tezt" { with-test & >= "3.1.1" } + "tezt" { with-test & >= "3.1.1" & < "4.0.0" } "octez-alcotezt" {with-test} "tezos-dac-node-lib" {with-test} ] diff --git a/opam/octez-protocol-alpha-libs.opam b/opam/octez-protocol-alpha-libs.opam index 53d215493845..8cdb4be3fb9d 100644 --- a/opam/octez-protocol-alpha-libs.opam +++ b/opam/octez-protocol-alpha-libs.opam @@ -28,7 +28,7 @@ depends: [ "tezos-dac-client-lib" "octez-injector" "octez-l2-libs" - "tezt" { with-test & >= "3.1.1" } + "tezt" { with-test & >= "3.1.1" & < "4.0.0" } "octez-alcotezt" {with-test} "tezos-dac-node-lib" {with-test} ] diff --git a/opam/octez-shell-libs.opam b/opam/octez-shell-libs.opam index f04fb567c095..0861610cc9a0 100644 --- a/opam/octez-shell-libs.opam +++ b/opam/octez-shell-libs.opam @@ -16,7 +16,7 @@ depends: [ "ringo" { >= "1.0.0" } "aches" { >= "1.0.0" } "prometheus" { >= "1.2" } - "tezt" { >= "3.1.1" } + "tezt" { >= "3.1.1" & < "4.0.0" } "tezt-tezos" {with-test} "octez-alcotezt" {with-test} "astring" {with-test} diff --git a/opam/octez-shell-tests.opam b/opam/octez-shell-tests.opam index 456c343ed525..ff94b36b45ef 100644 --- a/opam/octez-shell-tests.opam +++ b/opam/octez-shell-tests.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" & < "3.11" } "ocaml" { >= "4.14" } - "tezt" { with-test & >= "3.1.1" } + "tezt" { with-test & >= "3.1.1" & < "4.0.0" } "octez-libs" {with-test} "octez-shell-libs" {with-test} "tezos-protocol-demo-noops" {with-test} diff --git a/opam/octez-store-tests.opam b/opam/octez-store-tests.opam index d80e5ed4afeb..f547f033f5a0 100644 --- a/opam/octez-store-tests.opam +++ b/opam/octez-store-tests.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" & < "3.11" } "ocaml" { >= "4.14" } - "tezt" { with-test & >= "3.1.1" } + "tezt" { with-test & >= "3.1.1" & < "4.0.0" } "octez-libs" {with-test} "octez-shell-libs" {with-test} "tezos-protocol-demo-noops" {with-test} diff --git a/opam/octez-testnet-scenarios.opam b/opam/octez-testnet-scenarios.opam index d3588f83b680..b036f84108ca 100644 --- a/opam/octez-testnet-scenarios.opam +++ b/opam/octez-testnet-scenarios.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" & < "3.11" } "ocaml" { >= "4.14" } - "tezt" { >= "3.1.1" } + "tezt" { >= "3.1.1" & < "4.0.0" } "tezt-tezos" "tezt-ethereum" ] diff --git a/opam/scoru-sequencer-test.opam b/opam/scoru-sequencer-test.opam index 7b7a74c64d85..1b61d7388758 100644 --- a/opam/scoru-sequencer-test.opam +++ b/opam/scoru-sequencer-test.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" & < "3.11" } "ocaml" { >= "4.14" } - "tezt" { with-test & >= "3.1.1" } + "tezt" { with-test & >= "3.1.1" & < "4.0.0" } "octez-libs" {with-test} "tezos-protocol-alpha" {with-test} "octez-smart-rollup-sequencer" {with-test} diff --git a/opam/tezos-benchmark-tests.opam b/opam/tezos-benchmark-tests.opam index c2e8b09bfbd3..242d4384dfba 100644 --- a/opam/tezos-benchmark-tests.opam +++ b/opam/tezos-benchmark-tests.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" & < "3.11" } "ocaml" { >= "4.14" } - "tezt" { with-test & >= "3.1.1" } + "tezt" { with-test & >= "3.1.1" & < "4.0.0" } "octez-alcotezt" {with-test} "octez-libs" {with-test} "tezos-benchmark" {with-test} diff --git a/opam/tezos-dac-lib-test.opam b/opam/tezos-dac-lib-test.opam index cc70bc6b21f2..3a869a6793c2 100644 --- a/opam/tezos-dac-lib-test.opam +++ b/opam/tezos-dac-lib-test.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" & < "3.11" } "ocaml" { >= "4.14" } - "tezt" { with-test & >= "3.1.1" } + "tezt" { with-test & >= "3.1.1" & < "4.0.0" } "octez-libs" {with-test} "tezos-dac-lib" {with-test} "octez-alcotezt" {with-test} diff --git a/opam/tezos-dac-node-lib-test.opam b/opam/tezos-dac-node-lib-test.opam index 759149e5f7bf..a3177f471095 100644 --- a/opam/tezos-dac-node-lib-test.opam +++ b/opam/tezos-dac-node-lib-test.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" & < "3.11" } "ocaml" { >= "4.14" } - "tezt" { with-test & >= "3.1.1" } + "tezt" { with-test & >= "3.1.1" & < "4.0.0" } "octez-libs" {with-test} "tezos-dac-node-lib" {with-test} "octez-alcotezt" {with-test} diff --git a/opam/tezos-lazy-containers-tests.opam b/opam/tezos-lazy-containers-tests.opam index d88c4b190444..95a7975a8a63 100644 --- a/opam/tezos-lazy-containers-tests.opam +++ b/opam/tezos-lazy-containers-tests.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" & < "3.11" } "ocaml" { >= "4.14" } - "tezt" { with-test & >= "3.1.1" } + "tezt" { with-test & >= "3.1.1" & < "4.0.0" } "octez-libs" {with-test} "qcheck-core" {with-test} "qcheck-alcotest" { with-test & >= "0.20" } diff --git a/opam/tezos-micheline-rewriting.opam b/opam/tezos-micheline-rewriting.opam index 9f4a7257b1a7..0021d5e7ad7c 100644 --- a/opam/tezos-micheline-rewriting.opam +++ b/opam/tezos-micheline-rewriting.opam @@ -13,7 +13,7 @@ depends: [ "zarith" { >= "1.12" & < "1.13" } "zarith_stubs_js" "octez-libs" - "tezt" { with-test & >= "3.1.1" } + "tezt" { with-test & >= "3.1.1" & < "4.0.0" } "tezos-protocol-alpha" {with-test} "octez-protocol-alpha-libs" {with-test} ] diff --git a/opam/tezos-openapi.opam b/opam/tezos-openapi.opam index 95c2a427fc38..8fc336959154 100644 --- a/opam/tezos-openapi.opam +++ b/opam/tezos-openapi.opam @@ -12,7 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "ezjsonm" { >= "1.3.0" } "json-data-encoding" { >= "0.12" & < "0.13" } - "tezt" { >= "3.1.1" } + "tezt" { >= "3.1.1" & < "4.0.0" } ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-017-PtNairob-tests.opam b/opam/tezos-protocol-017-PtNairob-tests.opam index e7a51a961bab..323e03b52a39 100644 --- a/opam/tezos-protocol-017-PtNairob-tests.opam +++ b/opam/tezos-protocol-017-PtNairob-tests.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" & < "3.11" } "ocaml" { >= "4.14" } - "tezt" { with-test & >= "3.1.1" } + "tezt" { with-test & >= "3.1.1" & < "4.0.0" } "octez-libs" {with-test} "octez-alcotezt" {with-test} "octez-protocol-017-PtNairob-libs" {with-test} diff --git a/opam/tezos-protocol-018-Proxford-tests.opam b/opam/tezos-protocol-018-Proxford-tests.opam index 4e8e710c8ea6..9cec52fd5400 100644 --- a/opam/tezos-protocol-018-Proxford-tests.opam +++ b/opam/tezos-protocol-018-Proxford-tests.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" & < "3.11" } "ocaml" { >= "4.14" } - "tezt" { with-test & >= "3.1.1" } + "tezt" { with-test & >= "3.1.1" & < "4.0.0" } "octez-libs" {with-test} "octez-alcotezt" {with-test} "octez-protocol-018-Proxford-libs" {with-test} diff --git a/opam/tezos-protocol-alpha-tests.opam b/opam/tezos-protocol-alpha-tests.opam index 000d9afcff78..52c3e724fd1f 100644 --- a/opam/tezos-protocol-alpha-tests.opam +++ b/opam/tezos-protocol-alpha-tests.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" & < "3.11" } "ocaml" { >= "4.14" } - "tezt" { with-test & >= "3.1.1" } + "tezt" { with-test & >= "3.1.1" & < "4.0.0" } "octez-libs" {with-test} "octez-alcotezt" {with-test} "octez-protocol-alpha-libs" {with-test} diff --git a/opam/tezos-proxy-server-config.opam b/opam/tezos-proxy-server-config.opam index 6759cfc65e36..688f669cd0f2 100644 --- a/opam/tezos-proxy-server-config.opam +++ b/opam/tezos-proxy-server-config.opam @@ -12,7 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "octez-libs" "uri" { >= "3.1.0" } - "tezt" { with-test & >= "3.1.1" } + "tezt" { with-test & >= "3.1.1" & < "4.0.0" } "qcheck-alcotest" { with-test & >= "0.20" } "octez-alcotezt" {with-test} ] diff --git a/opam/tezos-sc-rollup-node-test.opam b/opam/tezos-sc-rollup-node-test.opam index 150747633a62..fe168787e6c2 100644 --- a/opam/tezos-sc-rollup-node-test.opam +++ b/opam/tezos-sc-rollup-node-test.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" & < "3.11" } "ocaml" { >= "4.14" } - "tezt" { with-test & >= "3.1.1" } + "tezt" { with-test & >= "3.1.1" & < "4.0.0" } "octez-libs" {with-test} "tezos-protocol-017-PtNairob" {with-test} "octez-protocol-017-PtNairob-libs" {with-test} diff --git a/opam/tezos-scoru-wasm-regressions.opam b/opam/tezos-scoru-wasm-regressions.opam index c09be009f20e..372656dae84f 100644 --- a/opam/tezos-scoru-wasm-regressions.opam +++ b/opam/tezos-scoru-wasm-regressions.opam @@ -16,7 +16,7 @@ depends: [ "octez-l2-libs" "tezos-protocol-alpha" "octez-protocol-alpha-libs" - "tezt" { >= "3.1.1" } + "tezt" { >= "3.1.1" & < "4.0.0" } ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-smart-rollup-node-lib-test.opam b/opam/tezos-smart-rollup-node-lib-test.opam index d1a2c87424aa..e21e7483f3f6 100644 --- a/opam/tezos-smart-rollup-node-lib-test.opam +++ b/opam/tezos-smart-rollup-node-lib-test.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" & < "3.11" } "ocaml" { >= "4.14" } - "tezt" { with-test & >= "3.1.1" } + "tezt" { with-test & >= "3.1.1" & < "4.0.0" } "octez-libs" {with-test} "octez-l2-libs" {with-test} "octez-smart-rollup-node-lib" {with-test} diff --git a/opam/tezos-tps-evaluation.opam b/opam/tezos-tps-evaluation.opam index 35ea14728f9f..27d4952c0e77 100644 --- a/opam/tezos-tps-evaluation.opam +++ b/opam/tezos-tps-evaluation.opam @@ -19,7 +19,7 @@ depends: [ "octez-protocol-alpha-libs" "octez-shell-libs" "tezos-protocol-alpha" - "tezt" { >= "3.1.1" } + "tezt" { >= "3.1.1" & < "4.0.0" } "tezt-tezos" "uri" { >= "3.1.0" } ] diff --git a/opam/tezos-tree-encoding-test.opam b/opam/tezos-tree-encoding-test.opam index fc3fe6a57b71..b6acc217bbe0 100644 --- a/opam/tezos-tree-encoding-test.opam +++ b/opam/tezos-tree-encoding-test.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" & < "3.11" } "ocaml" { >= "4.14" } - "tezt" { with-test & >= "3.1.1" } + "tezt" { with-test & >= "3.1.1" & < "4.0.0" } "octez-libs" {with-test} "octez-l2-libs" {with-test} "qcheck-alcotest" { with-test & >= "0.20" } diff --git a/opam/tezt-ethereum.opam b/opam/tezt-ethereum.opam index 22f821a3bf3d..50302e1b619e 100644 --- a/opam/tezt-ethereum.opam +++ b/opam/tezt-ethereum.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" & < "3.11" } "ocaml" { >= "4.14" } - "tezt" { >= "3.1.1" } + "tezt" { >= "3.1.1" & < "4.0.0" } "tezt-tezos" ] build: [ diff --git a/opam/tezt-tezos.opam b/opam/tezt-tezos.opam index a855736d97a4..10b8604dd7c0 100644 --- a/opam/tezt-tezos.opam +++ b/opam/tezt-tezos.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" & < "3.11" } "ocaml" { >= "4.14" } - "tezt" { >= "3.1.1" } + "tezt" { >= "3.1.1" & < "4.0.0" } "uri" { >= "3.1.0" } "cohttp-lwt-unix" { >= "5.2.0" } "hex" { >= "1.3.0" } diff --git a/opam/virtual/octez-deps.opam b/opam/virtual/octez-deps.opam index 4a6cbd1a7a9b..47c2e436a4e7 100644 --- a/opam/virtual/octez-deps.opam +++ b/opam/virtual/octez-deps.opam @@ -93,7 +93,7 @@ depends: [ "tar-unix" { >= "2.0.1" & < "3.0.0" } "tezos-rust-libs" { = "1.6" } "tezos-sapling-parameters" { >= "1.1.0" } - "tezt" { >= "3.1.1" } + "tezt" { >= "3.1.1" & < "4.0.0" } "tls-lwt" { >= "0.16.0" } "uri" { >= "3.1.0" } "uutf" -- GitLab