Merge branch 'main' into fix_bug_get_all_jobs

Qiskit · Jul 31, 2023 · 56f747f · 56f747f
2 parents 0474db4 + 5475289
commit 56f747f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/qiskit_ibm_provider/exceptions.py b/qiskit_ibm_provider/exceptions.py
@@ -28,7 +28,7 @@ class IBMAccountError(IBMError):
 
 
 class IBMProviderError(IBMError):
-    """Base class for rrrors raise by IBMProvider."""
+    """Base class for errors raise by IBMProvider."""
 
     pass
 

diff --git a/qiskit_ibm_provider/transpiler/passes/basis/convert_id_to_delay.py b/qiskit_ibm_provider/transpiler/passes/basis/convert_id_to_delay.py
@@ -69,7 +69,6 @@ def _run_inner(self, dag: DAGCircuit) -> bool:
                 )
             elif isinstance(node.op, IGate):
                 delay_op = Delay(self._get_duration(qubit_index_map[node.qargs[0]]))
-                delay_op.condition = node.op.condition
                 dag.substitute_node(node, delay_op, inplace=True)
 
                 modified = True

diff --git a/releasenotes/notes/fix-convert-id-delay-conditiona-8fc84c79fdcd4953.yaml b/releasenotes/notes/fix-convert-id-delay-conditiona-8fc84c79fdcd4953.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    A transpilation error will no longer occur when attempting to transpile a circuit containing a
+    conditional :class:`~qiskit.circuit.library.IGate` with Qiskit 0.44.