Merge branch 'master' into more-skus

cirq-aqt/cirq_aqt/_version.py

@@ -14,4 +14,4 @@
 
 """Define version number here, read it from setup.py automatically"""
 
-__version__ = "0.14.0.dev"
+__version__ = "0.15.0.dev"

cirq-aqt/cirq_aqt/_version_test.py

@@ -3,4 +3,4 @@
 
 
 def test_version():
-    assert cirq_aqt.__version__ == "0.14.0.dev"
+    assert cirq_aqt.__version__ == "0.15.0.dev"

cirq-core/cirq/_version.py

@@ -29,4 +29,4 @@
         'of cirq (e.g. "python -m pip install cirq==0.5.*")'
     )
 
-__version__ = "0.14.0.dev"
+__version__ = "0.15.0.dev"

cirq-core/cirq/_version_test.py

@@ -3,4 +3,4 @@
 
 
 def test_version():
-    assert cirq.__version__ == "0.14.0.dev"
+    assert cirq.__version__ == "0.15.0.dev"

cirq-core/cirq/ops/classically_controlled_operation_test.py

@@ -215,7 +215,7 @@ def test_qasm():
     qasm = cirq.qasm(circuit)
     assert (
         qasm
-        == """// Generated from Cirq v0.14.0.dev
+        == """// Generated from Cirq v0.15.0.dev
 
 OPENQASM 2.0;
 include "qelib1.inc";

cirq-google/cirq_google/_version.py

@@ -29,4 +29,4 @@
         'of cirq (e.g. "python -m pip install cirq==0.5.*")'
     )
 
-__version__ = "0.14.0.dev"
+__version__ = "0.15.0.dev"

cirq-google/cirq_google/_version_test.py

@@ -3,4 +3,4 @@
 
 
 def test_version():
-    assert cirq_google.__version__ == "0.14.0.dev"
+    assert cirq_google.__version__ == "0.15.0.dev"

cirq-google/cirq_google/engine/abstract_job.py

@@ -181,7 +181,7 @@ def calibration_results(self) -> Sequence['calibration_result.CalibrationResult'
         """
 
     def __iter__(self) -> Iterator[cirq.Result]:
-        return iter(self.results())
+        yield from self.results()
 
     # pylint: disable=function-redefined
     @overload

cirq-google/cirq_google/engine/abstract_job_test.py

@@ -12,6 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 from typing import Dict, List, TYPE_CHECKING
+import pytest
+import numpy as np
+import cirq
 from cirq_google.engine.abstract_job import AbstractJob
 
 if TYPE_CHECKING:
@@ -83,17 +86,40 @@ def batched_results(self):
         pass
 
     def results(self):
-        return list(range(5))
+        return list(
+            cirq.ResultDict(params={}, measurements={'a': np.asarray([t])}) for t in range(5)
+        )
 
     def calibration_results(self):
         pass
 
 
 def test_instantiation_and_iteration():
     job = MockJob()
+
+    # Test length
     assert len(job) == 5
-    assert job[3] == 3
+
+    # Test direct indexing
+    assert job[3].measurements['a'][0] == 3
+
+    #  Test iterating through for loop
     count = 0
-    for num in job:
-        assert num == count
+    for result in job:
+        assert result.measurements['a'][0] == count
         count += 1
+
+    # Test iterator using iterator
+    iterator = iter(job)
+    result = next(iterator)
+    assert result.measurements['a'][0] == 0
+    result = next(iterator)
+    assert result.measurements['a'][0] == 1
+    result = next(iterator)
+    assert result.measurements['a'][0] == 2
+    result = next(iterator)
+    assert result.measurements['a'][0] == 3
+    result = next(iterator)
+    assert result.measurements['a'][0] == 4
+    with pytest.raises(StopIteration):
+        next(iterator)

cirq-ionq/cirq_ionq/_version.py

@@ -14,4 +14,4 @@
 
 """Define version number here, read it from setup.py automatically"""
 
-__version__ = "0.14.0.dev"
+__version__ = "0.15.0.dev"

cirq-ionq/cirq_ionq/_version_test.py

@@ -3,4 +3,4 @@
 
 
 def test_version():
-    assert cirq_ionq.__version__ == "0.14.0.dev"
+    assert cirq_ionq.__version__ == "0.15.0.dev"

cirq-pasqal/cirq_pasqal/_version.py

@@ -14,4 +14,4 @@
 
 """Define version number here, read it from setup.py automatically"""
 
-__version__ = "0.14.0.dev"
+__version__ = "0.15.0.dev"

cirq-pasqal/cirq_pasqal/_version_test.py

@@ -3,4 +3,4 @@
 
 
 def test_version():
-    assert cirq_pasqal.__version__ == "0.14.0.dev"
+    assert cirq_pasqal.__version__ == "0.15.0.dev"

cirq-rigetti/cirq_rigetti/_version.py

@@ -14,4 +14,4 @@
 
 """Define version number here, read it from setup.py automatically"""
 
-__version__ = "0.14.0.dev"
+__version__ = "0.15.0.dev"

cirq-rigetti/cirq_rigetti/_version_test.py

@@ -3,4 +3,4 @@
 
 
 def test_version():
-    assert cirq_rigetti.__version__ == "0.14.0.dev"
+    assert cirq_rigetti.__version__ == "0.15.0.dev"

cirq-web/cirq_web/_version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.14.0.dev"
+__version__ = "0.15.0.dev"

cirq-web/cirq_web/_version_test.py

@@ -3,4 +3,4 @@
 
 
 def test_version():
-    assert cirq_web.__version__ == "0.14.0.dev"
+    assert cirq_web.__version__ == "0.15.0.dev"

rtd_docs/requirements.txt

@@ -3,3 +3,4 @@ myst-parser
 Sphinx~=3.2.0
 sphinx_rtd_theme
 sphinx-notfound-page
+Jinja2<=3.0.3