qiskit: updates (#33877)

5 files changed, 56 insertions, 13 deletions

diff --git a/var/spack/repos/builtin/packages/py-qiskit-aer/package.py b/var/spack/repos/builtin/packages/py-qiskit-aer/package.py
index 9b14f93e32..332e385d55 100644
--- a/var/spack/repos/builtin/packages/py-qiskit-aer/package.py
+++ b/var/spack/repos/builtin/packages/py-qiskit-aer/package.py
@@ -14,13 +14,16 @@ class PyQiskitAer(PythonPackage, CudaPackage):
     homepage = "https://github.com/Qiskit/qiskit-aer"
     pypi = "qiskit-aer/qiskit-aer-0.9.1.tar.gz"
 
+    version("0.11.1", sha256="ff136a086d0473346e5f5309ae34cc78b103dcd8a898344c6e5f86de91af41a1")
     version("0.9.1", sha256="3bf5f615aaae7cc5f816c39a4e9108aabaed0cc894fb6f841e48ffd56574e7eb")
 
-    depends_on("python@3.6:", type=("build", "run"))
+    depends_on("python@3.6:", type=("build", "run"), when="@0.9.1")
+    depends_on("python@3.7:", type=("build", "run"), when="@0.11.1")
     depends_on("py-setuptools@40.1.0:", type="build")
     depends_on("py-numpy@1.16.3:", type=("build", "run"))
     depends_on("py-pybind11@2.6:", type="build")
     depends_on("py-qiskit-terra@0.17.0:", type=("build", "run"))
+    depends_on("py-qiskit-terra@0.21.0:", type=("build", "run"), when="@0.11.1")
     depends_on("py-scipy@1.0:", type=("build", "run"))
     depends_on("py-scikit-build@0.11.0:", type="build")
     depends_on("py-cmake@:3.16,3.18:", type="build")
diff --git a/var/spack/repos/builtin/packages/py-qiskit-terra/package.py b/var/spack/repos/builtin/packages/py-qiskit-terra/package.py
index 576cb5562a..097916ed5f 100644
--- a/var/spack/repos/builtin/packages/py-qiskit-terra/package.py
+++ b/var/spack/repos/builtin/packages/py-qiskit-terra/package.py
@@ -15,23 +15,36 @@ class PyQiskitTerra(PythonPackage):
     homepage = "https://github.com/Qiskit/qiskit-terra"
     pypi = "qiskit-terra/qiskit-terra-0.18.3.tar.gz"
 
+    version("0.22.2", sha256="efd212cd98479ebedc8cc1f93d4eb8039f21c07bd39a62065b584e02d72e632d")
     version("0.18.3", sha256="8737c8f1f4c6f29ec2fb02d73023f4854a396c33f78f4629a861a3e48fc789cc")
 
-    depends_on("python@3.6:", type=("build", "run"))
     depends_on("py-setuptools", type="build")
-    depends_on("py-cython@0.27.1:", type="build")
-
-    depends_on("py-contextvars@2.4:", when="^python@:3.6", type=("build", "run"))
-    depends_on("py-jsonschema@2.6:", type=("build", "run"))
-    depends_on("py-retworkx@0.9.0:", type=("build", "run"))
     depends_on("py-numpy@1.17:", type=("build", "run"))
-    depends_on("py-scipy@1.4:", type=("build", "run"))
     depends_on("py-ply@3.10:", type=("build", "run"))
-    depends_on("py-psutil@5:", type=("build", "run"))
     depends_on("py-sympy@1.3:", type=("build", "run"))
     depends_on("py-dill@0.3:", type=("build", "run"))
-    depends_on("py-fastjsonschema@2.10:", type=("build", "run"))
-    depends_on("py-python-constraint@1.4:", type=("build", "run"))
     depends_on("py-python-dateutil@2.8.0:", type=("build", "run"))
-    depends_on("py-symengine@0.7:", type=("build", "run"))
-    depends_on("py-tweedledum@1.1:1", type=("build", "run"))
+    depends_on("py-tweedledum@1.1:1", type=("build", "run"), when="^python@:3.11")
+    depends_on("py-stevedore@3.0.0:", type=("build", "run"))
+    depends_on("py-psutil@5:", type=("build", "run"))
+
+    with when("@0.18.3"):
+        depends_on("python@3.6:", type=("build", "run"))
+        depends_on("py-cython@0.27.1:", type="build")
+        depends_on("py-contextvars@2.4:", when="^python@:3.6", type=("build", "run"))
+        depends_on("py-jsonschema@2.6:", type=("build", "run"))
+        depends_on("py-retworkx@0.9.0:", type=("build", "run"))
+        depends_on("py-scipy@1.4:", type=("build", "run"))
+        depends_on("py-fastjsonschema@2.10:", type=("build", "run"))
+        depends_on("py-python-constraint@1.4:", type=("build", "run"))
+        depends_on("py-symengine@0.7:", type=("build", "run"))
+
+    with when("@0.22.2"):
+        depends_on("python@3.7:", type=("build", "run"))
+        depends_on("py-setuptools-rust", type="build")
+        depends_on("py-retworkx@0.11.0:", type=("build", "run"))
+        depends_on("py-scipy@1.5:", type=("build", "run"))
+        depends_on("py-symengine@0.9:", type=("build", "run"))
+        depends_on("py-typing-extensions", when="^python@:3.7", type=("build", "run"))
+        depends_on("py-shared-memory38", when="^python@:3.7", type=("build", "run"))
+        depends_on("py-importlib-metadata@:4", when="^python@:3.7", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-retworkx/package.py b/var/spack/repos/builtin/packages/py-retworkx/package.py
index 7e5adc33cd..587ae656b8 100644
--- a/var/spack/repos/builtin/packages/py-retworkx/package.py
+++ b/var/spack/repos/builtin/packages/py-retworkx/package.py
@@ -13,6 +13,7 @@ class PyRetworkx(PythonPackage):
     homepage = "https://github.com/Qiskit/retworkx"
     pypi = "retworkx/retworkx-0.5.0.tar.gz"
 
+    version("0.11.0", sha256="a4c2a5ad3f8402493d41ad20ad91a03777ea214a3636c290272bbfaf36161161")
     version("0.10.2", sha256="ba81cb527de7ff338575905bb6fcbebdf2ab18ae800169a77ab863f855bf0951")
 
     depends_on("python@3.6:", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-shared-memory38/package.py b/var/spack/repos/builtin/packages/py-shared-memory38/package.py
new file mode 100644
index 0000000000..4fec900ed4
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-shared-memory38/package.py
@@ -0,0 +1,22 @@
+# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other
+# Spack Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+
+from spack.package import *
+
+
+class PySharedMemory38(PythonPackage):
+    """Backport of multiprocessing.shared_memory for Python 3.6 and
+    3.7. Simply import all things from shared_memory to make your code
+    work. Note that multiprocessing.managers.SharedMemoryManager is also
+    included under shared_memory package."""
+
+    homepage = "https://github.com/mars-project/shared_memory38"
+    pypi = "shared_memory38/shared_memory38-0.1.2.tar.gz"
+
+    version("0.1.2", sha256="9d4f11fcb08cce059cc31fc8c70292b786a4cf9e411555b37077b7020f5d97e5")
+
+    depends_on("python@3.6:3.7", type=("build", "run"))
+    depends_on("py-setuptools", type="build")
diff --git a/var/spack/repos/builtin/packages/py-symengine/package.py b/var/spack/repos/builtin/packages/py-symengine/package.py
index d5151e41e5..fc27353d3c 100644
--- a/var/spack/repos/builtin/packages/py-symengine/package.py
+++ b/var/spack/repos/builtin/packages/py-symengine/package.py
@@ -14,6 +14,7 @@ class PySymengine(PythonPackage):
     git = "https://github.com/symengine/symengine.py.git"
 
     version("master", branch="master")
+    version("0.9.2", sha256="0f7e45f5bba3fa844f7de7aa8d6640faaacb1075df76d8e4996e82b0ec6a4f62")
     # pypi source doesn't have necessary files in cmake directory
     version(
         "0.8.1",
@@ -25,12 +26,15 @@ class PySymengine(PythonPackage):
     # Build dependencies
     depends_on("python@2.7:2.8,3.3:", type=("build", "run"), when="@0.2.0")
     depends_on("python@3.6:3", type=("build", "run"), when="@0.8.1:")
+    depends_on("python@3.7:3", type=("build", "run"), when="@0.9.2:")
     depends_on("py-setuptools", type="build")
     depends_on("py-cython@0.19.1:", type="build", when="@0.2.0")
     depends_on("py-cython@0.29.24:", type="build", when="@0.8.1:")
     depends_on("cmake@2.8.12:", type="build")
+    # see symengine_version.txt
     depends_on("symengine@0.2.0", when="@0.2.0")
     depends_on("symengine@0.8.1", when="@0.8.1")
+    depends_on("symengine@0.9.0", when="@0.9.2")
 
     def install_options(self, spec, prefix):
         return ["--symengine-dir={0}".format(spec["symengine"].prefix)]