Merge branch 'main' into marginal-memory

mtreinish · Jun 22, 2022 · 7229634 · 7229634
2 parents 5c81510 + 5a6ec94
commit 7229634
Show file tree

Hide file tree

Showing 159 changed files with 2,870 additions and 2,695 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "qiskit-terra"
-version = "0.20.0"
+version = "0.21.0"
 edition = "2018"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -15,7 +15,7 @@ numpy = "0.16.2"
 rand = "0.8"
 rand_pcg = "0.3"
 rand_distr = "0.4.3"
-indexmap = "1.9.0"
+indexmap = "1.9.1"
 ahash = "0.7.6"
 num-complex = "0.4"
 num-bigint = "0.4"

diff --git a/docs/conf.py b/docs/conf.py
@@ -21,9 +21,9 @@
 author = "Qiskit Development Team"
 
 # The short X.Y version
-version = ""
+version = "0.21"
 # The full version, including alpha/beta/rc tags
-release = "0.21.0"
+release = "0.21.0rc1"
 
 extensions = [
     "sphinx.ext.napoleon",

diff --git a/qiskit/VERSION.txt b/qiskit/VERSION.txt
@@ -1 +1 @@
-0.21.0
+0.21.0rc1