[SDS-1118] Qiskit 1 support (#168)

* [SDS-1118] Qiskit 1 support * visualization tools import fixed
QuTech-Delft · Apr 16, 2024 · 0327b38 · 0327b38
1 parent b10e8cb
commit 0327b38
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 16 deletions.
diff --git a/docs/examples/grover_algorithm_qi.ipynb b/docs/examples/grover_algorithm_qi.ipynb
@@ -41,7 +41,7 @@
     "from qiskit import transpile, QuantumCircuit, QuantumRegister, ClassicalRegister\n",
     "from qiskit_aer import Aer\n",
     "from qiskit.providers.basic_provider import BasicProvider\n",
-    "from qiskit.tools.visualization import circuit_drawer, plot_histogram\n",
+    "from qiskit.visualization import circuit_drawer, plot_histogram\n",
     "from IPython.display import display, Math, Latex\n",
     "\n",
     "from quantuminspire.credentials import get_authentication\n",

diff --git a/docs/examples/qi-performance-test.ipynb b/docs/examples/qi-performance-test.ipynb
@@ -30,7 +30,7 @@
     "from IPython.display import display\n",
     "\n",
     "from qiskit import QuantumCircuit, ClassicalRegister, QuantumRegister, transpile\n",
-    "from qiskit.tools.visualization import plot_histogram, circuit_drawer\n",
+    "from qiskit.visualization import plot_histogram, circuit_drawer\n",
     "\n",
     "from quantuminspire.credentials import get_authentication\n",
     "from quantuminspire.qiskit import QI\n",

diff --git a/setup.py b/setup.py
@@ -63,7 +63,7 @@ def get_long_description():
       install_requires=['coverage>=4.5.1', 'matplotlib>=2.1', 'pylatexenc', 'coreapi>=2.3.3', 'numpy>=1.20', 'jupyter',
                         'nbimporter', 'qilib', 'setuptools'],
       extras_require={
-          "qiskit": ["qiskit>=0.46,<1.0", "qiskit-aer"],
+          "qiskit": ["qiskit>=1.0", "qiskit-aer"],
           "projectq": ["projectq>=0.8.0"],
           "dev": ["pytest>=3.3.1", "pylint", "mypy>=0.670"],
           "rtd": ["sphinx", "sphinx_rtd_theme", "nbsphinx", "sphinx-automodapi", "recommonmark"],

diff --git a/src/quantuminspire/version.py b/src/quantuminspire/version.py
@@ -1 +1 @@
-__version__ = '2.2.2'
+__version__ = '2.3.0'
diff --git a/src/tests/quantuminspire/qiskit/test_circuit_parser.py b/src/tests/quantuminspire/qiskit/test_circuit_parser.py
@@ -293,24 +293,12 @@ def test_generate_cqasm_correct_output_reset_qubits(self):
         self.assertTrue('prep_z q[1]\nprep_z q[2]\n' in result)
 
     def test_generate_cqasm_correct_output_identity(self):
-        qc = QuantumCircuit(2, 2)
-        qc.i(0)
-        result = self._generate_cqasm_from_circuit(qc)
-        self.assertTrue('I q[0]\n' in result)
-
         qc = QuantumCircuit(2, 2)
         qc.id(0)
         result = self._generate_cqasm_from_circuit(qc)
         self.assertTrue('I q[0]\n' in result)
 
     def test_generate_cqasm_correct_output_conditional_identity(self):
-        q = QuantumRegister(8, "q")
-        c = ClassicalRegister(8, "c")
-        qc = QuantumCircuit(q, c, name="test")
-        qc.i(0).c_if(c, 14)
-        result = self._generate_cqasm_from_circuit(qc)
-        self.assertTrue('not b[0,4,5,6,7]\nC-I b[0,1,2,3,4,5,6,7], q[0]\nnot b[0,4,5,6,7]\n' in result)
-
         q = QuantumRegister(8, "q")
         c = ClassicalRegister(8, "c")
         qc = QuantumCircuit(q, c, name="test")