diff --git a/pyproject.toml b/pyproject.toml index e0d01d0..dfd6ece 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,7 +5,8 @@ dependencies = [ "cirq_core==1.1.0", "matplotlib==3.6.3", "numpy==1.23.4", - "qiskit-aer==0.13.0", + "qiskit>=1.0", + "qiskit-aer>=0.13.0", "setuptools>=65.5.1", "sympy==1.11.1", "pyquafu==0.3.5", diff --git a/qdao/qiskit/gate.py b/qdao/qiskit/gate.py index d07ecb7..6852447 100644 --- a/qdao/qiskit/gate.py +++ b/qdao/qiskit/gate.py @@ -63,12 +63,12 @@ def power(self, exponent: float): exponent (float): Gate^exponent Returns: - qiskit.extensions.UnitaryGate: To which `to_matrix` is self.to_matrix^exponent. + qiskit.circuit.library.UnitaryGate: To which `to_matrix` is self.to_matrix^exponent. Raises: CircuitError: If Gate is not unitary """ - from qiskit.extensions.unitary import ( + from qiskit.circuit.library import ( UnitaryGate, ) # pylint: disable=cyclic-import from qiskit.quantum_info.operators import ( diff --git a/qdao/qiskit/instruction.py b/qdao/qiskit/instruction.py index 84d214f..295efef 100644 --- a/qdao/qiskit/instruction.py +++ b/qdao/qiskit/instruction.py @@ -42,7 +42,7 @@ from qiskit.circuit.operation import Operation from qiskit.circuit.parameter import ParameterExpression from qiskit.circuit.quantumregister import QuantumRegister -from qiskit.qasm.exceptions import QasmError +from qiskit.qasm2 import QASM2Error from qiskit.qobj.qasm_qobj import QasmQobjInstruction from .tools import pi_check @@ -476,7 +476,7 @@ def _qasmif(self, string): if self.condition is None: return string if not isinstance(self.condition[0], ClassicalRegister): - raise QasmError( + raise Qasm2Error( "OpenQASM 2 can only condition on registers, but got '{self.condition[0]}'" ) return "if(%s==%d) " % (self.condition[0].name, self.condition[1]) + string diff --git a/requirements.txt b/requirements.txt index 75b8382..ccb636b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,8 @@ cirq_core==1.1.0 matplotlib==3.6.3 numpy==1.23.4 -qiskit-aer==0.13.0 +qiskit>=1.0 +qiskit-aer>=0.13.0 setuptools>=65.5.1 sympy==1.11.1 pyquafu==0.3.5