From aa0e1a2532a14d05a044fc8569e566027f845f38 Mon Sep 17 00:00:00 2001 From: Matthew Treinish Date: Thu, 19 Oct 2023 19:54:07 -0400 Subject: [PATCH] Bump main branch version post 0.45.0rc1 tag (#11059) * Bump main branch version post 0.45.0rc1 tag Now that the first release candidate for the 0.45.0 release has been tagged, the stable branch for the 0.45 series has been created and we can start developing the 1.0.0 release on main. This commit bumps all the version strings from 0.45.0 to 1.0.0 (and the backport branch for mergify to 0.45) accordingly to differentiate the main branch from 0.45.*. * Handle 1.0 in docs build --- .mergify.yml | 2 +- Cargo.lock | 4 ++-- Cargo.toml | 2 +- docs/conf.py | 22 +++++----------------- qiskit/VERSION.txt | 2 +- qiskit_pkg/setup.py | 4 ++-- 6 files changed, 12 insertions(+), 24 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index 80346d9b03d0..0f32d2895772 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -6,4 +6,4 @@ pull_request_rules: actions: backport: branches: - - stable/0.25 + - stable/0.45 diff --git a/Cargo.lock b/Cargo.lock index 866c920c7ab6..11a06e6855ac 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -393,7 +393,7 @@ dependencies = [ [[package]] name = "qiskit-qasm2" -version = "0.45.0" +version = "1.0.0" dependencies = [ "hashbrown 0.14.0", "pyo3", @@ -401,7 +401,7 @@ dependencies = [ [[package]] name = "qiskit_accelerate" -version = "0.45.0" +version = "1.0.0" dependencies = [ "ahash", "hashbrown 0.14.0", diff --git a/Cargo.toml b/Cargo.toml index 1f3b4f7c344f..19e1c48231f1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ members = ["crates/*"] [workspace.package] -version = "0.45.0" +version = "1.0.0" edition = "2021" rust-version = "1.64" # 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 58d5dc1b17bd..38b080208f3b 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -27,9 +27,9 @@ author = "Qiskit Development Team" # The short X.Y version -version = "0.45" +version = "1.0" # The full version, including alpha/beta/rc tags -release = "0.45.0" +release = "1.0.0" language = "en" @@ -286,21 +286,9 @@ def determine_api_redirects() -> dict[str, str]: def add_versions_to_config(_app, config): """Add a list of old documentation versions that should have links generated to them into the context, so the theme can use them to generate a sidebar.""" - # First 0.x version where Qiskit/Terra and the metapackage aligned on number. - first_unified_zero_minor = 45 - - # Start with the hardcoded versions of the documentation that were managed while the metapackage - # still existed, so are based on tags that don't exist in the Qiskit package repo. - versions = ["0.19"] + [f"0.{x}" for x in range(24, first_unified_zero_minor)] - - proc = subprocess.run(["git", "describe", "--abbrev=0"], capture_output=True, check=True) - current_version = proc.stdout.decode("utf8") - current_version_info = current_version.split(".") - if current_version_info[0] != "0": - raise Exception("TODO: handle major versions") - versions.extend( - f"0.{x}" % x for x in range(first_unified_zero_minor, int(current_version_info[1]) + 1) - ) + # For qiskit 1.0 the docs won't use this mechanism anymore + # so just build out the historical version list for the 0.x series + versions = ["0.19"] + [f"0.{x}" for x in range(24, 46)] config.html_context["version_list"] = versions diff --git a/qiskit/VERSION.txt b/qiskit/VERSION.txt index 27edeeb5c031..3eefcb9dd5b3 100644 --- a/qiskit/VERSION.txt +++ b/qiskit/VERSION.txt @@ -1 +1 @@ -0.45.0rc1 +1.0.0 diff --git a/qiskit_pkg/setup.py b/qiskit_pkg/setup.py index 6148d3d8a965..4846b2d0b9f6 100644 --- a/qiskit_pkg/setup.py +++ b/qiskit_pkg/setup.py @@ -26,11 +26,11 @@ with open(README_PATH) as readme_file: README = readme_file.read() -requirements = ["qiskit-terra==0.45.0rc1"] +requirements = ["qiskit-terra==1.0.0"] setup( name="qiskit", - version="0.45.0rc1", + version="1.0.0", description="Software for developing quantum computing programs", long_description=README, long_description_content_type="text/markdown",