From c1d728a9c8c51eaf12b4f118107ffc7cbeda956d Mon Sep 17 00:00:00 2001 From: Matthew Treinish Date: Mon, 6 May 2024 02:52:31 -0400 Subject: [PATCH] Bump main branch version post 1.1.0rc1 tag (#12338) Now that the first release candidate for the 1.1.0 release has been tagged, the stable branch for the 1.1 series has been created and we can start developing the 1.1.0 release on main. This commit bumps all the version strings from 1.1.0 to 1.2.0 (and the backport branch for mergify to stable/1.1) accordingly to differentiate the main branch from 1.1.*. --- .mergify.yml | 2 +- Cargo.lock | 10 +++++----- Cargo.toml | 2 +- docs/conf.py | 4 ++-- qiskit/VERSION.txt | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index 87a3438930f5..10b6d2022256 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -6,4 +6,4 @@ pull_request_rules: actions: backport: branches: - - stable/1.0 + - stable/1.1 diff --git a/Cargo.lock b/Cargo.lock index 50903b3811af..84e0e0090663 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1095,7 +1095,7 @@ dependencies = [ [[package]] name = "qiskit-accelerate" -version = "1.1.0" +version = "1.2.0" dependencies = [ "ahash 0.8.11", "approx", @@ -1122,7 +1122,7 @@ dependencies = [ [[package]] name = "qiskit-circuit" -version = "1.1.0" +version = "1.2.0" dependencies = [ "hashbrown 0.14.5", "pyo3", @@ -1130,7 +1130,7 @@ dependencies = [ [[package]] name = "qiskit-pyext" -version = "1.1.0" +version = "1.2.0" dependencies = [ "pyo3", "qiskit-accelerate", @@ -1141,7 +1141,7 @@ dependencies = [ [[package]] name = "qiskit-qasm2" -version = "1.1.0" +version = "1.2.0" dependencies = [ "hashbrown 0.14.5", "pyo3", @@ -1150,7 +1150,7 @@ dependencies = [ [[package]] name = "qiskit-qasm3" -version = "1.1.0" +version = "1.2.0" dependencies = [ "hashbrown 0.14.5", "indexmap 2.2.6", diff --git a/Cargo.toml b/Cargo.toml index 9c4af6260bed..2827b2206f4d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ members = ["crates/*"] resolver = "2" [workspace.package] -version = "1.1.0" +version = "1.2.0" edition = "2021" rust-version = "1.70" # Keep in sync with README.md and rust-toolchain.toml. license = "Apache-2.0" diff --git a/docs/conf.py b/docs/conf.py index 7081b7d4ed9a..b35f5ca64d66 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -30,9 +30,9 @@ author = "Qiskit Development Team" # The short X.Y version -version = "1.1" +version = "1.2" # The full version, including alpha/beta/rc tags -release = "1.1.0rc1" +release = "1.2.0" language = "en" diff --git a/qiskit/VERSION.txt b/qiskit/VERSION.txt index 686366e4bb8a..26aaba0e8663 100644 --- a/qiskit/VERSION.txt +++ b/qiskit/VERSION.txt @@ -1 +1 @@ -1.1.0rc1 +1.2.0