Bump qiskit version used during qasm compatibility test (#2511)

Fixes #2509
quantumlib · Nov 7, 2019 · aade1f3 · aade1f3
1 parent 1cdf343
commit aade1f3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/cirq/testing/consistent_qasm.py b/cirq/testing/consistent_qasm.py
@@ -70,7 +70,7 @@ def assert_qasm_is_consistent_with_unitary(val: Any):
     qasm_unitary = None
     try:
         result = qiskit.execute(
-            qiskit.load_qasm_string(qasm),
+            qiskit.QuantumCircuit.from_qasm_str(qasm),
             backend=qiskit.Aer.get_backend('unitary_simulator'))
         qasm_unitary = result.result().get_unitary()
         qasm_unitary = _reorder_indices_of_matrix(
@@ -89,21 +89,20 @@ def assert_qasm_is_consistent_with_unitary(val: Any):
             p_unitary = None
             p_qasm_unitary = None
         raise AssertionError(
-            'QASM be consistent with cirq.unitary(op) up to global phase.\n\n'
+            'QASM not consistent with cirq.unitary(op) up to global phase.\n\n'
             'op:\n{}\n\n'
             'cirq.unitary(op):\n{}\n\n'
             'Generated QASM:\n\n{}\n\n'
             'Unitary of generated QASM:\n{}\n\n'
             'Phased matched cirq.unitary(op):\n{}\n\n'
             'Phased matched unitary of generated QASM:\n{}\n\n'
-            'Underlying error:\n{}'.format(
-                _indent(repr(op)),
-                _indent(repr(unitary)),
-                _indent(qasm),
-                _indent(repr(qasm_unitary)),
-                _indent(repr(p_unitary)),
-                _indent(repr(p_qasm_unitary)),
-                _indent(str(ex))))
+            'Underlying error:\n{}'.format(_indent(repr(op)),
+                                           _indent(repr(unitary)),
+                                           _indent(qasm),
+                                           _indent(repr(qasm_unitary)),
+                                           _indent(repr(p_unitary)),
+                                           _indent(repr(p_qasm_unitary)),
+                                           _indent(str(ex))))
 
 
 def assert_qiskit_parsed_qasm_consistent_with_unitary(qasm, unitary):
@@ -116,7 +115,7 @@ def assert_qiskit_parsed_qasm_consistent_with_unitary(qasm, unitary):
         return
 
     num_qubits = int(np.log2(len(unitary)))
-    result = qiskit.execute(qiskit.load_qasm_string(qasm),
+    result = qiskit.execute(qiskit.QuantumCircuit.from_qasm_str(qasm),
                             backend=qiskit.Aer.get_backend('unitary_simulator'))
     qiskit_unitary = result.result().get_unitary()
     qiskit_unitary = _reorder_indices_of_matrix(

diff --git a/dev_tools/conf/pip-list-dev-tools.txt b/dev_tools/conf/pip-list-dev-tools.txt
@@ -14,7 +14,7 @@ mypy-protobuf==1.10
 twine
 
 # For verifying behavior of qasm output.
-qiskit~=0.6.0
+qiskit~=0.13.0
 
 # For generating documentation.
 pypandoc