Merge branch 'master' into u/maffoo/pylint

quantumlib · Mar 29, 2022 · 76f59ff · 76f59ff
2 parents b74ef58 + 06b5a5b
commit 76f59ff
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/cirq-ionq/cirq_ionq/job.py b/cirq-ionq/cirq_ionq/job.py
@@ -206,7 +206,7 @@ def results(
                 f'Job was not completed successfully. Instead had status: {self.status()}'
             )
         # IonQ returns results in little endian, Cirq prefers to use big endian, so we convert.
-        if self.target() == 'qpu':
+        if self.target().startswith('qpu'):
             repetitions = self.repetitions()
             counts = {
                 _little_endian_to_big(int(k), self.num_qubits()): int(repetitions * float(v))

diff --git a/cirq-ionq/cirq_ionq/job_test.py b/cirq-ionq/cirq_ionq/job_test.py
@@ -101,6 +101,20 @@ def test_job_results_qpu_endianness():
     assert results == ionq.QPUResult({0: 600, 2: 400}, 2, measurement_dict={})
 
 
+def test_job_results_qpu_target_endianness():
+    job_dict = {
+        'id': 'my_id',
+        'status': 'completed',
+        'qubits': '2',
+        'target': 'qpu.target',
+        'metadata': {'shots': 1000},
+        'data': {'histogram': {'0': '0.6', '1': '0.4'}},
+    }
+    job = ionq.Job(None, job_dict)
+    results = job.results()
+    assert results == ionq.QPUResult({0: 600, 2: 400}, 2, measurement_dict={})
+
+
 @mock.patch('time.sleep', return_value=None)
 def test_job_results_poll(mock_sleep):
     ready_job = {

diff --git a/dev_tools/requirements/deps/format.txt b/dev_tools/requirements/deps/format.txt
@@ -1,3 +1,2 @@
 -r flynt.txt
-black==21.12b0
-click<=8.0.4
+black==22.3.0