cirq-core 1.6.0.dev20250516060316__py3-none-any.whl → 1.6.0.dev20250516154249__py3-none-any.whl

cirq/_import_test.py

@@ -17,9 +17,9 @@ from __future__ import annotations
 from cirq import _import
 
 
-def test_lazy_loader():
+def test_lazy_loader() -> None:
     linalg = _import.LazyLoader("linalg", globals(), "scipy.linalg")
-    linalg.fun = 1
+    linalg.fun = 1  # type: ignore[attr-defined]
     assert linalg._module is None
     assert "linalg" not in linalg.__dict__
 

cirq/_version.py

@@ -28,4 +28,4 @@ if sys.version_info < (3, 11, 0):  # pragma: no cover
         'of cirq (e.g. "python -m pip install cirq==1.5.0")'
     )
 
-__version__ = "1.6.0.dev20250516060316"
+__version__ = "1.6.0.dev20250516154249"

cirq/_version_test.py

@@ -3,4 +3,4 @@ import cirq
 
 
 def test_version() -> None:
-    assert cirq.__version__ == "1.6.0.dev20250516060316"
+    assert cirq.__version__ == "1.6.0.dev20250516154249"

cirq/interop/quirk/cells/parse_test.py

@@ -19,7 +19,7 @@ import sympy
 from cirq.interop.quirk.cells.parse import parse_complex, parse_formula, parse_matrix
 
 
-def test_parse_matrix():
+def test_parse_matrix() -> None:
     s = np.sqrt(0.5)
     np.testing.assert_allclose(
         parse_matrix('{{√½,√½},{-√½,√½}}'), np.array([[s, s], [-s, s]]), atol=1e-8
@@ -32,7 +32,7 @@ def test_parse_matrix():
     )
 
 
-def test_parse_matrix_failures():
+def test_parse_matrix_failures() -> None:
     with pytest.raises(ValueError, match='Not surrounded by {{}}'):
         _ = parse_matrix('1')
     with pytest.raises(ValueError, match='Not surrounded by {{}}'):
@@ -45,7 +45,7 @@ def test_parse_matrix_failures():
         _ = parse_matrix('{{x}}')
 
 
-def test_parse_real_formula():
+def test_parse_real_formula() -> None:
     t = sympy.Symbol('t')
     assert parse_formula('1/2') == 0.5
     assert parse_formula('t*t + ln(t)') == t * t + sympy.ln(t)
@@ -58,12 +58,12 @@ def test_parse_real_formula():
         _ = parse_formula('i')
 
 
-def test_parse_formula_failures():
+def test_parse_formula_failures() -> None:
     with pytest.raises(TypeError, match='formula must be a string'):
-        _ = parse_formula(2)
+        _ = parse_formula(2)  # type: ignore[arg-type]
 
     with pytest.raises(TypeError, match='formula must be a string'):
-        _ = parse_formula([])
+        _ = parse_formula([])  # type: ignore[arg-type]
 
     with pytest.raises(ValueError, match='Unrecognized token'):
         _ = parse_formula('5*__**DSA **)SADD')
@@ -72,7 +72,7 @@ def test_parse_formula_failures():
         _ = parse_formula('5*x')
 
 
-def test_parse_complex():
+def test_parse_complex() -> None:
     assert parse_complex('0') == 0
     assert parse_complex('1') == 1
     assert parse_complex('i') == 1j
@@ -84,7 +84,7 @@ def test_parse_complex():
     np.testing.assert_allclose(parse_complex('exp 2'), np.e**2, atol=1e-8)
 
 
-def test_parse_complex_raw_cases_from_quirk():
+def test_parse_complex_raw_cases_from_quirk() -> None:
     assert parse_complex("0") == 0
     assert parse_complex("1") == 1
     assert parse_complex("-1") == -1
@@ -116,7 +116,7 @@ def test_parse_complex_raw_cases_from_quirk():
     np.testing.assert_allclose(parse_complex("2       pi"), 2 * np.pi)
 
 
-def test_parse_complex_expression_cases_from_quirk():
+def test_parse_complex_expression_cases_from_quirk() -> None:
     np.testing.assert_allclose(parse_complex("1/3"), 1 / 3)
     np.testing.assert_allclose(parse_complex("2/3/5"), (2 / 3) / 5)
     np.testing.assert_allclose(parse_complex("2/3/5*7/13"), ((((2 / 3) / 5)) * 7) / 13)
@@ -152,7 +152,7 @@ def test_parse_complex_expression_cases_from_quirk():
     np.testing.assert_allclose(parse_complex("cos(acos(0.5))"), 0.5, atol=1e-8)
 
 
-def test_parse_complex_expression_failures():
+def test_parse_complex_expression_failures() -> None:
     with pytest.raises(ValueError, match='Incomplete expression'):
         _ = parse_formula('(')
     with pytest.raises(ValueError, match=r"unmatched '\)'"):

cirq/testing/equals_tester_test.py

@@ -19,7 +19,7 @@ import pytest
 from cirq.testing.equals_tester import EqualsTester
 
 
-def test_add_equality_group_correct():
+def test_add_equality_group_correct() -> None:
     eq = EqualsTester()
 
     eq.add_equality_group(fractions.Fraction(1, 1))
@@ -39,7 +39,7 @@ def test_add_equality_group_correct():
     eq.add_equality_group('unrelated')
 
 
-def test_assert_make_equality_group():
+def test_assert_make_equality_group() -> None:
     eq = EqualsTester()
 
     with pytest.raises(AssertionError, match="can't be in the same"):
@@ -57,20 +57,20 @@ def test_assert_make_equality_group():
         eq.make_equality_group(lambda: 3)
 
 
-def test_add_equality_group_not_equivalent():
+def test_add_equality_group_not_equivalent() -> None:
     eq = EqualsTester()
     with pytest.raises(AssertionError, match="can't be in the same"):
         eq.add_equality_group(1, 2)
 
 
-def test_add_equality_group_not_disjoint():
+def test_add_equality_group_not_disjoint() -> None:
     eq = EqualsTester()
     eq.add_equality_group(1)
     with pytest.raises(AssertionError, match="can't be in different"):
         eq.add_equality_group(1)
 
 
-def test_add_equality_group_bad_hash():
+def test_add_equality_group_bad_hash() -> None:
     class KeyHash:
         def __init__(self, k, h):
             self._k = k
@@ -94,7 +94,7 @@ def test_add_equality_group_bad_hash():
         eq.add_equality_group(KeyHash('c', 2), KeyHash('c', 3))
 
 
-def test_add_equality_group_exception_hash():
+def test_add_equality_group_exception_hash() -> None:
     class FailHash:
         def __hash__(self):
             raise ValueError('injected failure')
@@ -104,7 +104,7 @@ def test_add_equality_group_exception_hash():
         eq.add_equality_group(FailHash())
 
 
-def test_fails_when_forgot_type_check():
+def test_fails_when_forgot_type_check() -> None:
     eq = EqualsTester()
 
     class NoTypeCheckEqualImplementation:
@@ -124,11 +124,12 @@ def test_fails_when_forgot_type_check():
         eq.add_equality_group(NoTypeCheckEqualImplementation())
 
 
-def test_fails_when_equal_to_everything():
+def test_fails_when_equal_to_everything() -> None:
     eq = EqualsTester()
 
     class AllEqual:
-        __hash__ = None
+        def __hash__(self) -> int:
+            return 0
 
         def __eq__(self, other):
             return True
@@ -136,11 +137,12 @@ def test_fails_when_equal_to_everything():
         def __ne__(self, other):
             return False
 
+    assert hash(AllEqual()) == 0
     with pytest.raises(AssertionError, match="can't be in different"):
         eq.add_equality_group(AllEqual())
 
 
-def test_fails_hash_is_default_and_inconsistent():
+def test_fails_hash_is_default_and_inconsistent() -> None:
     eq = EqualsTester()
 
     class DefaultHashImplementation:
@@ -161,7 +163,7 @@ def test_fails_hash_is_default_and_inconsistent():
         eq.make_equality_group(DefaultHashImplementation)
 
 
-def test_fails_when_ne_is_inconsistent():
+def test_fails_when_ne_is_inconsistent() -> None:
     eq = EqualsTester()
 
     class InconsistentNeImplementation:
@@ -185,7 +187,7 @@ def test_fails_when_ne_is_inconsistent():
         eq.make_equality_group(InconsistentNeImplementation)
 
 
-def test_fails_when_ne_is_inconsistent_due_to_not_implemented():
+def test_fails_when_ne_is_inconsistent_due_to_not_implemented() -> None:
     eq = EqualsTester()
 
     class InconsistentNeImplementation:
@@ -207,7 +209,7 @@ def test_fails_when_ne_is_inconsistent_due_to_not_implemented():
         eq.make_equality_group(InconsistentNeImplementation)
 
 
-def test_fails_when_not_reflexive():
+def test_fails_when_not_reflexive() -> None:
     eq = EqualsTester()
 
     class NotReflexiveImplementation:
@@ -226,7 +228,7 @@ def test_fails_when_not_reflexive():
         eq.add_equality_group(NotReflexiveImplementation())
 
 
-def test_fails_when_not_commutative():
+def test_fails_when_not_commutative() -> None:
     eq = EqualsTester()
 
     class NotCommutativeImplementation:
@@ -248,14 +250,14 @@ def test_fails_when_not_commutative():
         eq.add_equality_group(NotCommutativeImplementation(1), NotCommutativeImplementation(0))
 
 
-def test_works_on_types():
+def test_works_on_types() -> None:
     eq = EqualsTester()
     eq.add_equality_group(object)
     eq.add_equality_group(int)
     eq.add_equality_group(object())
 
 
-def test_returns_not_implemented_for_other_types():
+def test_returns_not_implemented_for_other_types() -> None:
     # First we demonstrate an example of the problem.
 
     # FirstClass is the class that is broken.
@@ -323,7 +325,7 @@ def test_returns_not_implemented_for_other_types():
     eq.add_equality_group(ThirdClass("a"), ThirdClass("a"))
 
 
-def test_not_implemented_error():
+def test_not_implemented_error() -> None:
     # Common bug is to return NotImplementedError instead of NotImplemented.
     class NotImplementedErrorCase:
         def __init__(self, val):

cirq/value/random_state_test.py

@@ -17,7 +17,7 @@ import numpy as np
 import cirq
 
 
-def test_parse_random_state():
+def test_parse_random_state() -> None:
     global_state = np.random.get_state()
 
     def rand(prng):
@@ -34,11 +34,11 @@ def test_parse_random_state():
     eq.add_equality_group(*vals)
 
     seed = np.random.randint(2**31)
-    prngs = [
+    prngs1 = [
         np.random.RandomState(seed),
         cirq.value.parse_random_state(np.random.RandomState(seed)),
         cirq.value.parse_random_state(seed),
     ]
-    vals = [prng.rand() for prng in prngs]
+    vals = [prng.rand() for prng in prngs1]
     eq = cirq.testing.EqualsTester()
     eq.add_equality_group(*vals)

cirq/value/timestamp.py

@@ -64,6 +64,10 @@ class Timestamp:
     def __sub__(self, other: Duration) -> 'Timestamp':
         pass
 
+    @overload
+    def __sub__(self, other: timedelta) -> 'Timestamp':
+        pass
+
     def __sub__(self, other):
         if isinstance(other, Duration):
             return Timestamp(picos=self._picos - other.total_picos())

cirq/value/timestamp_test.py

@@ -20,7 +20,7 @@ import cirq
 from cirq import Duration, Timestamp
 
 
-def test_init():
+def test_init() -> None:
     assert Timestamp().raw_picos() == 0
     assert Timestamp(picos=513).raw_picos() == 513
     assert Timestamp(picos=-5).raw_picos() == -5
@@ -33,13 +33,13 @@ def test_init():
     assert isinstance(Timestamp(nanos=1.0).raw_picos(), float)
 
 
-def test_str():
+def test_str() -> None:
     assert str(Timestamp(picos=1000, nanos=1000)) == 't=1001000'
     assert str(Timestamp(nanos=5.0)) == 't=5000.0'
     assert str(Timestamp(picos=-100)) == 't=-100'
 
 
-def test_repr():
+def test_repr() -> None:
     a = Timestamp(picos=1000, nanos=1000)
     cirq.testing.assert_equivalent_repr(a)
     b = Timestamp(nanos=5.0)
@@ -48,14 +48,14 @@ def test_repr():
     cirq.testing.assert_equivalent_repr(c)
 
 
-def test_eq():
+def test_eq() -> None:
     eq = cirq.testing.EqualsTester()
     eq.add_equality_group(Timestamp(), Timestamp(picos=0), Timestamp(nanos=0.0))
     eq.add_equality_group(Timestamp(picos=1000), Timestamp(nanos=1))
     eq.make_equality_group(lambda: Timestamp(picos=-1))
 
 
-def test_cmp():
+def test_cmp() -> None:
     ordered_groups = [
         Timestamp(picos=-1),
         Timestamp(),
@@ -81,7 +81,7 @@ def test_cmp():
     assert Timestamp() != Duration()
 
 
-def test_cmp_vs_other_type():
+def test_cmp_vs_other_type() -> None:
     with pytest.raises(TypeError):
         _ = Timestamp() < Duration()
     with pytest.raises(TypeError):
@@ -94,7 +94,7 @@ def test_cmp_vs_other_type():
         _ = Timestamp() > 0
 
 
-def test_add():
+def test_add() -> None:
     assert Timestamp(picos=1) + Duration(picos=2) == Timestamp(picos=3)
     assert Duration(picos=3) + Timestamp(picos=-5) == Timestamp(picos=-2)
 
@@ -109,7 +109,7 @@ def test_add():
         _ = Timestamp() + 1
 
 
-def test_sub():
+def test_sub() -> None:
     assert Timestamp() - Timestamp() == Duration()
     assert Timestamp(picos=1) - Timestamp(picos=2) == Duration(picos=-1)
     assert Timestamp(picos=5) - Duration(picos=2) == Timestamp(picos=3)
@@ -118,6 +118,6 @@ def test_sub():
     with pytest.raises(TypeError):
         _ = Duration() - Timestamp()
     with pytest.raises(TypeError):
-        _ = 1 - Timestamp()
+        _ = 1 - Timestamp()  # type: ignore[operator]
     with pytest.raises(TypeError):
-        _ = Timestamp() - 1
+        _ = Timestamp() - 1  # type: ignore[operator]

cirq/vis/density_matrix_test.py

@@ -24,7 +24,7 @@ from cirq.vis.density_matrix import _plot_element_of_density_matrix, plot_densit
 @pytest.mark.usefixtures('closefigures')
 @pytest.mark.parametrize('show_text', [True, False])
 @pytest.mark.parametrize('size', [2, 4, 8, 16])
-def test_density_matrix_plotter(size, show_text):
+def test_density_matrix_plotter(size, show_text) -> None:
     matrix = cirq.testing.random_density_matrix(size)
     # Check that the title shows back up
     ax = plot_density_matrix(matrix, show_text=show_text, title='Test Density Matrix Plot')
@@ -48,16 +48,16 @@ def test_density_matrix_plotter(size, show_text):
 @pytest.mark.usefixtures('closefigures')
 @pytest.mark.parametrize('show_text', [True, False])
 @pytest.mark.parametrize('size', [2, 4, 8, 16])
-def test_density_matrix_circle_rectangle_sizes(size, show_text):
+def test_density_matrix_circle_rectangle_sizes(size, show_text) -> None:
     matrix = cirq.testing.random_density_matrix(size)
     ax = plot_density_matrix(matrix, show_text=show_text, title='Test Density Matrix Plot')
     # Check that the radius of all the circles in the matrix is correct
-    circles = [c for c in ax.get_children() if isinstance(c, patches.Circle)]
-    mean_radius = np.mean([c.radius for c in circles if c.fill])
+    circle_list = [c for c in ax.get_children() if isinstance(c, patches.Circle)]
+    mean_radius = np.mean([c.radius for c in circle_list if c.fill])
     mean_value = np.mean(np.abs(matrix))
-    circles = np.array(sorted(circles, key=lambda x: (x.fill, x.center[0], -x.center[1]))).reshape(
-        (2, size, size)
-    )
+    circles = np.array(
+        sorted(circle_list, key=lambda x: (x.fill, x.center[0], -x.center[1]))
+    ).reshape((2, size, size))
     for i in range(size):
         for j in range(size):
             assert np.isclose(
@@ -65,15 +65,15 @@ def test_density_matrix_circle_rectangle_sizes(size, show_text):
             )
 
     # Check that all the rectangles are of the right height, and only on the diagonal elements
-    rects = [
+    rect_list = [
         r
         for r in ax.get_children()
         if isinstance(r, patches.Rectangle) and r.get_alpha() is not None
     ]
-    assert len(rects) == size
-    mean_size = np.mean([r.get_height() for r in rects])
+    assert len(rect_list) == size
+    mean_size = np.mean([r.get_height() for r in rect_list])
     mean_value = np.trace(np.abs(matrix)) / size
-    rects = np.array(sorted(rects, key=lambda x: x.get_x()))
+    rects = np.array(sorted(rect_list, key=lambda x: x.get_x()))
     for i in range(size):
         # Ensuring that the rectangle is the right height
         assert np.isclose(np.abs(matrix[i, i]) * mean_size / mean_value, rects[i].get_height())
@@ -90,7 +90,7 @@ def test_density_matrix_circle_rectangle_sizes(size, show_text):
 @pytest.mark.usefixtures('closefigures')
 @pytest.mark.parametrize('show_text', [True, False])
 @pytest.mark.parametrize('size', [2, 4, 8, 16])
-def test_density_matrix_sizes_upper_bounds(size, show_text):
+def test_density_matrix_sizes_upper_bounds(size, show_text) -> None:
     matrix = cirq.testing.random_density_matrix(size)
     ax = plot_density_matrix(matrix, show_text=show_text, title='Test Density Matrix Plot')
 
@@ -113,7 +113,7 @@ def test_density_matrix_sizes_upper_bounds(size, show_text):
 @pytest.mark.usefixtures('closefigures')
 @pytest.mark.parametrize('show_rect', [True, False])
 @pytest.mark.parametrize('value', [0.0, 1.0, 0.5 + 0.3j, 0.2 + 0.1j, 0.5 + 0.5j])
-def test_density_element_plot(value, show_rect):
+def test_density_element_plot(value, show_rect) -> None:
     _, ax = plt.subplots(figsize=(10, 10))
     _plot_element_of_density_matrix(
         ax, 0, 0, np.abs(value), np.angle(value), show_rect=False, show_text=False
@@ -122,9 +122,9 @@ def test_density_element_plot(value, show_rect):
     plotted_lines = [c for c in ax.get_children() if isinstance(c, lines.Line2D)]
     assert len(plotted_lines) == 1
     line_position = plotted_lines[0].get_xydata()
-    angle = np.arctan(
-        (line_position[1, 1] - line_position[0, 1]) / (line_position[1, 0] - line_position[0, 0])
-    )
+    numerator = line_position[1, 1] - line_position[0, 1]  # type: ignore
+    denumerator = line_position[1, 0] - line_position[0, 0]  # type: ignore
+    angle = np.arctan(numerator / denumerator)
     assert np.isclose(np.angle(value), angle)
     # Check if the circles are the right size ratio, given the value of the element
     circles_in = [c for c in ax.get_children() if isinstance(c, patches.Circle) and c.fill]
@@ -151,6 +151,6 @@ def test_density_element_plot(value, show_rect):
         np.random.random((4, 8)) * np.exp(np.random.random((4, 8)) * 2 * np.pi * 1j),
     ],
 )
-def test_density_matrix_type_error(matrix):
+def test_density_matrix_type_error(matrix) -> None:
     with pytest.raises(ValueError, match="Incorrect shape for density matrix:*"):
         plot_density_matrix(matrix)

cirq/work/collector_test.py

@@ -18,7 +18,7 @@ import pytest
 import cirq
 
 
-def test_circuit_sample_job_equality():
+def test_circuit_sample_job_equality() -> None:
     eq = cirq.testing.EqualsTester()
     c1 = cirq.Circuit()
     c2 = cirq.Circuit(cirq.measure(cirq.LineQubit(0)))
@@ -32,14 +32,14 @@ def test_circuit_sample_job_equality():
     eq.add_equality_group(cirq.CircuitSampleJob(c1, repetitions=10, tag='test'))
 
 
-def test_circuit_sample_job_repr():
+def test_circuit_sample_job_repr() -> None:
     cirq.testing.assert_equivalent_repr(
         cirq.CircuitSampleJob(cirq.Circuit(cirq.H(cirq.LineQubit(0))), repetitions=10, tag='guess')
     )
 
 
 @duet.sync
-async def test_async_collect():
+async def test_async_collect() -> None:
     received = []
 
     class TestCollector(cirq.Collector):
@@ -51,14 +51,13 @@ async def test_async_collect():
         def on_job_result(self, job, result):
             received.append(job.tag)
 
-    result = await TestCollector().collect_async(
+    await TestCollector().collect_async(
         sampler=cirq.Simulator(), max_total_samples=100, concurrency=5
     )
-    assert result is None
     assert received == ['test'] * 10
 
 
-def test_collect():
+def test_collect() -> None:
     received = []
 
     class TestCollector(cirq.Collector):
@@ -74,7 +73,7 @@ def test_collect():
     assert received == ['test'] * 10
 
 
-def test_failed_job():
+def test_failed_job() -> None:
     class FailingSampler:
         async def run_async(self, circuit, repetitions):
             await duet.completed_future(None)
@@ -90,10 +89,14 @@ def test_failed_job():
             pass
 
     with pytest.raises(Exception, match='job failed!'):
-        TestCollector().collect(sampler=FailingSampler(), max_total_samples=100, concurrency=5)
+        TestCollector().collect(
+            sampler=FailingSampler(),  # type:ignore
+            max_total_samples=100,
+            concurrency=5,
+        )
 
 
-def test_collect_with_reaction():
+def test_collect_with_reaction() -> None:
     events = [0]
     sent = 0
     received = 0
@@ -123,7 +126,7 @@ def test_collect_with_reaction():
     assert all(events.index(-k) > events.index(k) for k in range(1, 11))
 
 
-def test_flatten_jobs_terminate_from_collector():
+def test_flatten_jobs_terminate_from_collector() -> None:
     sent = False
     received = []
 

cirq/work/observable_measurement.py

@@ -20,7 +20,19 @@ import itertools
 import os
 import tempfile
 import warnings
-from typing import Any, Dict, Iterable, List, Optional, Sequence, Set, Tuple, TYPE_CHECKING, Union
+from typing import (
+    Any,
+    Dict,
+    Iterable,
+    List,
+    Mapping,
+    Optional,
+    Sequence,
+    Set,
+    Tuple,
+    TYPE_CHECKING,
+    Union,
+)
 
 import numpy as np
 import pandas as pd
@@ -246,7 +258,7 @@ def _aggregate_n_repetitions(next_chunk_repetitions: Set[int]) -> int:
 
 def _check_meas_specs_still_todo(
     meas_specs: List[_MeasurementSpec],
-    accumulators: Dict[_MeasurementSpec, BitstringAccumulator],
+    accumulators: Mapping[_MeasurementSpec, BitstringAccumulator],
     stopping_criteria: StoppingCriteria,
 ) -> Tuple[List[_MeasurementSpec], int]:
     """Filter `meas_specs` in case some are done.

cirq/work/observable_measurement_data.py

@@ -45,7 +45,7 @@ def _check_and_get_real_coef(observable: cirq.PauliString, atol: float):
 
 def _obs_vals_from_measurements(
     bitstrings: np.ndarray,
-    qubit_to_index: Dict[cirq.Qid, int],
+    qubit_to_index: Mapping[cirq.Qid, int],
     observable: cirq.PauliString,
     atol: float,
 ):
@@ -63,7 +63,7 @@ def _obs_vals_from_measurements(
 
 def _stats_from_measurements(
     bitstrings: np.ndarray,
-    qubit_to_index: Dict[cirq.Qid, int],
+    qubit_to_index: Mapping[cirq.Qid, int],
     observable: cirq.PauliString,
     atol: float,
 ) -> Tuple[float, float]:
@@ -216,7 +216,7 @@ class BitstringAccumulator:
         self,
         meas_spec: _MeasurementSpec,
         simul_settings: List[InitObsSetting],
-        qubit_to_index: Dict[cirq.Qid, int],
+        qubit_to_index: Mapping[cirq.Qid, int],
         bitstrings: Optional[np.ndarray] = None,
         chunksizes: Optional[np.ndarray] = None,
         timestamps: Optional[np.ndarray] = None,

cirq/work/observable_measurement_test.py

@@ -16,6 +16,7 @@ from typing import Dict, Iterable, List
 
 import numpy as np
 import pytest
+import sympy
 
 import cirq
 import cirq.work as cw
@@ -37,7 +38,7 @@ from cirq.work.observable_measurement import (
 )
 
 
-def test_with_parameterized_layers():
+def test_with_parameterized_layers() -> None:
     qs = cirq.LineQubit.range(3)
     circuit = cirq.Circuit([cirq.H.on_each(*qs), cirq.CZ(qs[0], qs[1]), cirq.CZ(qs[1], qs[2])])
     circuit2 = _with_parameterized_layers(circuit, qubits=qs, needs_init_layer=False)
@@ -46,9 +47,11 @@ def test_with_parameterized_layers():
     *_, xlayer, ylayer, measurelayer = circuit2.moments
     for op in xlayer.operations:
         assert isinstance(op.gate, cirq.XPowGate)
+        assert isinstance(op.gate.exponent, sympy.Symbol)
         assert op.gate.exponent.name.endswith('-Xf')
     for op in ylayer.operations:
         assert isinstance(op.gate, cirq.YPowGate)
+        assert isinstance(op.gate.exponent, sympy.Symbol)
         assert op.gate.exponent.name.endswith('-Yf')
     for op in measurelayer:
         assert isinstance(op.gate, cirq.MeasurementGate)
@@ -60,13 +63,15 @@ def test_with_parameterized_layers():
     xlayer, ylayer, *_ = circuit3.moments
     for op in xlayer.operations:
         assert isinstance(op.gate, cirq.XPowGate)
+        assert isinstance(op.gate.exponent, sympy.Symbol)
         assert op.gate.exponent.name.endswith('-Xi')
     for op in ylayer.operations:
         assert isinstance(op.gate, cirq.YPowGate)
+        assert isinstance(op.gate.exponent, sympy.Symbol)
         assert op.gate.exponent.name.endswith('-Yi')
 
 
-def test_get_params_for_setting():
+def test_get_params_for_setting() -> None:
     qubits = cirq.LineQubit.range(3)
     a, b, c = qubits
 
@@ -82,10 +87,10 @@ def test_get_params_for_setting():
     needs_init_layer = True
     with pytest.raises(ValueError):
         _get_params_for_setting(
-            padded_setting, flips=[0, 0], qubits=qubits, needs_init_layer=needs_init_layer
+            padded_setting, flips=[False, False], qubits=qubits, needs_init_layer=needs_init_layer
         )
     params = _get_params_for_setting(
-        padded_setting, flips=[0, 0, 1], qubits=qubits, needs_init_layer=needs_init_layer
+        padded_setting, flips=[False, False, True], qubits=qubits, needs_init_layer=needs_init_layer
     )
     assert all(
         x in params
@@ -116,7 +121,7 @@ def test_get_params_for_setting():
     np.testing.assert_allclose([ma, mb, mc], [1, 0, -1])
 
 
-def test_params_and_settings():
+def test_params_and_settings() -> None:
     qubits = cirq.LineQubit.range(1)
     (q,) = qubits
     tests = [
@@ -143,7 +148,7 @@ def test_params_and_settings():
         assert np.abs(coef - z) < 1e-2, f'{init} {obs} {coef}'
 
 
-def test_subdivide_meas_specs():
+def test_subdivide_meas_specs() -> None:
     qubits = cirq.LineQubit.range(2)
     q0, q1 = qubits
     setting = cw.InitObsSetting(
@@ -177,7 +182,7 @@ def test_subdivide_meas_specs():
     ]
 
 
-def test_aggregate_n_repetitions():
+def test_aggregate_n_repetitions() -> None:
     with pytest.warns(UserWarning):
         reps = _aggregate_n_repetitions({5, 6})
     assert reps == 6
@@ -197,7 +202,7 @@ class _MockBitstringAccumulator(BitstringAccumulator):
         return cov / len(self.bitstrings)
 
 
-def test_variance_stopping_criteria():
+def test_variance_stopping_criteria() -> None:
     stop = cw.VarianceStoppingCriteria(variance_bound=1e-6)
     acc = _MockBitstringAccumulator()
     assert stop.more_repetitions(acc) == 10_000
@@ -222,22 +227,30 @@ class _WildVarianceStoppingCriteria(StoppingCriteria):
         return [5, 6][self._state % 2]
 
 
-def test_variance_stopping_criteria_aggregate_n_repetitions():
+def test_variance_stopping_criteria_aggregate_n_repetitions() -> None:
+    q0, q1 = cirq.LineQubit.range(2)
     stop = _WildVarianceStoppingCriteria()
     acc1 = _MockBitstringAccumulator()
     acc2 = _MockBitstringAccumulator()
-    accumulators = {'FakeMeasSpec1': acc1, 'FakeMeasSpec2': acc2}
+    setting = InitObsSetting(
+        init_state=cirq.KET_ZERO(q0) * cirq.KET_ZERO(q1), observable=cirq.X(q0) * cirq.Y(q1)
+    )
+    meas_spec = _MeasurementSpec(
+        max_setting=setting, circuit_params={'beta': 0.123, 'gamma': 0.456}
+    )
+    meas_spec2 = _MeasurementSpec(
+        max_setting=setting, circuit_params={'beta': 0.123, 'gamma': 0.456}
+    )
+    accumulators = {meas_spec: acc1, meas_spec2: acc2}
     with pytest.warns(UserWarning, match='the largest value will be used: 6.'):
         still_todo, reps = _check_meas_specs_still_todo(
-            meas_specs=sorted(accumulators.keys()),
-            accumulators=accumulators,
-            stopping_criteria=stop,
+            meas_specs=[meas_spec, meas_spec2], accumulators=accumulators, stopping_criteria=stop
         )
-    assert still_todo == ['FakeMeasSpec1', 'FakeMeasSpec2']
+    assert still_todo == [meas_spec, meas_spec2]
     assert reps == 6
 
 
-def test_repetitions_stopping_criteria():
+def test_repetitions_stopping_criteria() -> None:
     stop = cw.RepetitionsStoppingCriteria(total_repetitions=50_000)
     acc = _MockBitstringAccumulator()
 
@@ -248,7 +261,7 @@ def test_repetitions_stopping_criteria():
     assert todos == [10_000] * 5 + [0, 0]
 
 
-def test_repetitions_stopping_criteria_partial():
+def test_repetitions_stopping_criteria_partial() -> None:
     stop = cw.RepetitionsStoppingCriteria(total_repetitions=5_000, repetitions_per_chunk=1_000_000)
     acc = _MockBitstringAccumulator()
     assert stop.more_repetitions(acc) == 5_000
@@ -268,7 +281,7 @@ def _set_up_meas_specs_for_testing():
     return bsa, meas_spec
 
 
-def test_meas_specs_still_todo():
+def test_meas_specs_still_todo() -> None:
     bsa, meas_spec = _set_up_meas_specs_for_testing()
     stop = cw.RepetitionsStoppingCriteria(1_000)
 
@@ -296,7 +309,7 @@ def test_meas_specs_still_todo():
     assert reps == 0
 
 
-def test_meas_spec_still_todo_bad_spec():
+def test_meas_spec_still_todo_bad_spec() -> None:
     bsa, meas_spec = _set_up_meas_specs_for_testing()
 
     class BadStopping(StoppingCriteria):
@@ -310,7 +323,7 @@ def test_meas_spec_still_todo_bad_spec():
         )
 
 
-def test_meas_spec_still_todo_too_many_params(monkeypatch):
+def test_meas_spec_still_todo_too_many_params(monkeypatch) -> None:
     monkeypatch.setattr(cw.observable_measurement, 'MAX_REPETITIONS_PER_JOB', 30_000)
     bsa, meas_spec = _set_up_meas_specs_for_testing()
     lots_of_meas_spec = [meas_spec] * 3_001
@@ -321,7 +334,7 @@ def test_meas_spec_still_todo_too_many_params(monkeypatch):
         )
 
 
-def test_meas_spec_still_todo_lots_of_params(monkeypatch):
+def test_meas_spec_still_todo_lots_of_params(monkeypatch) -> None:
     monkeypatch.setattr(cw.observable_measurement, 'MAX_REPETITIONS_PER_JOB', 30_000)
     bsa, meas_spec = _set_up_meas_specs_for_testing()
     lots_of_meas_spec = [meas_spec] * 4
@@ -332,7 +345,7 @@ def test_meas_spec_still_todo_lots_of_params(monkeypatch):
         )
 
 
-def test_checkpoint_options():
+def test_checkpoint_options() -> None:
     # There are three ~binary options (the latter two can be either specified or `None`. We
     # test those 2^3 cases.
 
@@ -345,12 +358,15 @@ def test_checkpoint_options():
         _parse_checkpoint_options(False, 'test1', 'test2')
 
     chk, chkprev = _parse_checkpoint_options(True, None, None)
+    assert chk is not None
+    assert chkprev is not None
     assert chk.startswith(tempfile.gettempdir())
     assert chk.endswith('observables.json')
     assert chkprev.startswith(tempfile.gettempdir())
     assert chkprev.endswith('observables.prev.json')
 
     chk, chkprev = _parse_checkpoint_options(True, None, 'prev.json')
+    assert chk is not None
     assert chk.startswith(tempfile.gettempdir())
     assert chk.endswith('observables.json')
     assert chkprev == 'prev.json'
@@ -381,7 +397,7 @@ def test_checkpoint_options():
 
 
 @pytest.mark.parametrize(('with_circuit_sweep', 'checkpoint'), [(True, True), (False, False)])
-def test_measure_grouped_settings(with_circuit_sweep, checkpoint, tmpdir):
+def test_measure_grouped_settings(with_circuit_sweep, checkpoint, tmpdir) -> None:
     qubits = cirq.LineQubit.range(1)
     (q,) = qubits
     tests = [
@@ -431,7 +447,7 @@ def _get_some_grouped_settings():
     return grouped_settings, qubits
 
 
-def test_measure_grouped_settings_calibration_validation():
+def test_measure_grouped_settings_calibration_validation() -> None:
     mock_ro_calib = _MockBitstringAccumulator()
     grouped_settings, qubits = _get_some_grouped_settings()
 
@@ -448,7 +464,7 @@ def test_measure_grouped_settings_calibration_validation():
         )
 
 
-def test_measure_grouped_settings_read_checkpoint(tmpdir):
+def test_measure_grouped_settings_read_checkpoint(tmpdir) -> None:
     qubits = cirq.LineQubit.range(1)
     (q,) = qubits
 
@@ -495,7 +511,7 @@ Q = cirq.NamedQubit('q')
         (cirq.Circuit(cirq.Y(Q) ** 0.5, cirq.Z(Q) ** 0.2), cirq.X(Q)),
     ],
 )
-def test_XYZ_point8(circuit, observable):
+def test_XYZ_point8(circuit, observable) -> None:
     # each circuit, observable combination should result in the observable value of 0.8
     df = measure_observables_df(
         circuit,
@@ -517,7 +533,7 @@ def _each_in_its_own_group_grouper(
 @pytest.mark.parametrize(
     'grouper', ['greedy', group_settings_greedy, _each_in_its_own_group_grouper]
 )
-def test_measure_observable_grouper(grouper):
+def test_measure_observable_grouper(grouper) -> None:
     circuit = cirq.Circuit(cirq.X(Q) ** 0.2)
     observables = [cirq.Z(Q), cirq.Z(cirq.NamedQubit('q2'))]
     results = measure_observables(
@@ -532,7 +548,7 @@ def test_measure_observable_grouper(grouper):
     np.testing.assert_allclose(1, results[1].mean, atol=1e-9)
 
 
-def test_measure_observable_bad_grouper():
+def test_measure_observable_bad_grouper() -> None:
     circuit = cirq.Circuit(cirq.X(Q) ** 0.2)
     observables = [cirq.Z(Q), cirq.Z(cirq.NamedQubit('q2'))]
     with pytest.raises(ValueError, match=r'Unknown grouping function'):

cirq/work/observable_settings.py

@@ -16,17 +16,7 @@ from __future__ import annotations
 
 import dataclasses
 import numbers
-from typing import (
-    AbstractSet,
-    Dict,
-    FrozenSet,
-    Iterable,
-    Mapping,
-    Optional,
-    Tuple,
-    TYPE_CHECKING,
-    Union,
-)
+from typing import Dict, FrozenSet, Iterable, Mapping, Optional, Tuple, TYPE_CHECKING, Union
 
 import sympy
 
@@ -156,7 +146,7 @@ def _fix_precision(val: Union[value.Scalar, sympy.Expr], precision) -> Union[int
 
 
 def _hashable_param(
-    param_tuples: AbstractSet[Tuple[Union[str, sympy.Expr], Union[value.Scalar, sympy.Expr]]],
+    param_tuples: Iterable[Tuple[Union[str, sympy.Expr], Union[value.Scalar, sympy.Expr]]],
     precision=1e7,
 ) -> FrozenSet[Tuple[str, Union[int, Tuple[int, int]]]]:
     """Hash circuit parameters using fixed precision.

cirq/work/observable_settings_test.py

@@ -20,7 +20,7 @@ from cirq.work import _MeasurementSpec, InitObsSetting, observables_to_settings
 from cirq.work.observable_settings import _hashable_param, _max_weight_observable, _max_weight_state
 
 
-def test_init_obs_setting():
+def test_init_obs_setting() -> None:
     q0, q1 = cirq.LineQubit.range(2)
     setting = InitObsSetting(
         init_state=cirq.KET_ZERO(q0) * cirq.KET_ZERO(q1), observable=cirq.X(q0) * cirq.Y(q1)
@@ -32,7 +32,7 @@ def test_init_obs_setting():
         setting = InitObsSetting(init_state=cirq.KET_ZERO(q0), observable=cirq.X(q0) * cirq.Y(q1))
 
 
-def test_max_weight_observable():
+def test_max_weight_observable() -> None:
     q0, q1 = cirq.LineQubit.range(2)
     observables = [cirq.X(q0), cirq.X(q1)]
     assert _max_weight_observable(observables) == cirq.X(q0) * cirq.X(q1)
@@ -41,7 +41,7 @@ def test_max_weight_observable():
     assert _max_weight_observable(observables) is None
 
 
-def test_max_weight_state():
+def test_max_weight_state() -> None:
     q0, q1 = cirq.LineQubit.range(2)
     states = [cirq.KET_PLUS(q0), cirq.KET_PLUS(q1)]
     assert _max_weight_state(states) == cirq.KET_PLUS(q0) * cirq.KET_PLUS(q1)
@@ -50,7 +50,7 @@ def test_max_weight_state():
     assert _max_weight_state(states) is None
 
 
-def test_observable_to_setting():
+def test_observable_to_setting() -> None:
     q0, q1, q2 = cirq.LineQubit.range(3)
     observables = [cirq.X(q0) * cirq.Y(q1), cirq.Z(q2) * 1]
 
@@ -62,7 +62,7 @@ def test_observable_to_setting():
     assert list(observables_to_settings(observables, qubits=[q0, q1, q2])) == settings_should_be
 
 
-def test_param_hash():
+def test_param_hash() -> None:
     params1 = [('beta', 1.23), ('gamma', 4.56)]
     params2 = [('beta', 1.23), ('gamma', 4.56)]
     params3 = [('beta', 1.24), ('gamma', 4.57)]
@@ -81,7 +81,7 @@ def test_param_hash():
     assert hash(_hashable_param(params4)) == hash(_hashable_param(params5))
 
 
-def test_measurement_spec():
+def test_measurement_spec() -> None:
     q0, q1 = cirq.LineQubit.range(2)
     setting = InitObsSetting(
         init_state=cirq.KET_ZERO(q0) * cirq.KET_ZERO(q1), observable=cirq.X(q0) * cirq.Y(q1)
@@ -96,7 +96,7 @@ def test_measurement_spec():
     cirq.testing.assert_equivalent_repr(meas_spec)
 
 
-def test_measurement_spec_no_symbols():
+def test_measurement_spec_no_symbols() -> None:
     q0, q1 = cirq.LineQubit.range(2)
     setting = InitObsSetting(
         init_state=cirq.KET_ZERO(q0) * cirq.KET_ZERO(q1), observable=cirq.X(q0) * cirq.Y(q1)

cirq/work/pauli_sum_collector_test.py

@@ -18,7 +18,7 @@ import cirq
 
 
 @duet.sync
-async def test_pauli_string_sample_collector():
+async def test_pauli_string_sample_collector() -> None:
     a, b = cirq.LineQubit.range(2)
     p = cirq.PauliSumCollector(
         circuit=cirq.Circuit(cirq.H(a), cirq.CNOT(a, b), cirq.X(a), cirq.Z(b)),
@@ -28,26 +28,24 @@ async def test_pauli_string_sample_collector():
         + (1 - 0j),
         samples_per_term=100,
     )
-    result = await p.collect_async(sampler=cirq.Simulator())
-    assert result is None
+    await p.collect_async(sampler=cirq.Simulator())
     energy = p.estimated_energy()
     assert isinstance(energy, float) and energy == 12
 
 
 @duet.sync
-async def test_pauli_string_sample_single():
+async def test_pauli_string_sample_single() -> None:
     a, b = cirq.LineQubit.range(2)
     p = cirq.PauliSumCollector(
         circuit=cirq.Circuit(cirq.H(a), cirq.CNOT(a, b), cirq.X(a), cirq.Z(b)),
         observable=cirq.X(a) * cirq.X(b),
         samples_per_term=100,
     )
-    result = await p.collect_async(sampler=cirq.Simulator())
-    assert result is None
+    await p.collect_async(sampler=cirq.Simulator())
     assert p.estimated_energy() == -1
 
 
-def test_pauli_string_sample_collector_identity():
+def test_pauli_string_sample_collector_identity() -> None:
     p = cirq.PauliSumCollector(
         circuit=cirq.Circuit(), observable=cirq.PauliSum() + 2j, samples_per_term=100
     )
@@ -55,7 +53,7 @@ def test_pauli_string_sample_collector_identity():
     assert p.estimated_energy() == 2j
 
 
-def test_pauli_string_sample_collector_extra_qubit_z():
+def test_pauli_string_sample_collector_extra_qubit_z() -> None:
     a, b = cirq.LineQubit.range(2)
     p = cirq.PauliSumCollector(
         circuit=cirq.Circuit(cirq.H(a)), observable=3 * cirq.Z(b), samples_per_term=100
@@ -64,7 +62,7 @@ def test_pauli_string_sample_collector_extra_qubit_z():
     assert p.estimated_energy() == 3
 
 
-def test_pauli_string_sample_collector_extra_qubit_x():
+def test_pauli_string_sample_collector_extra_qubit_x() -> None:
     a, b = cirq.LineQubit.range(2)
     p = cirq.PauliSumCollector(
         circuit=cirq.Circuit(cirq.H(a)), observable=3 * cirq.X(b), samples_per_term=10000

cirq/work/sampler_test.py

@@ -28,7 +28,7 @@ import cirq
 
 
 @duet.sync
-async def test_run_async():
+async def test_run_async() -> None:
     sim = cirq.Simulator()
     result = await sim.run_async(
         cirq.Circuit(cirq.measure(cirq.GridQubit(0, 0), key='m')), repetitions=10
@@ -37,7 +37,7 @@ async def test_run_async():
 
 
 @duet.sync
-async def test_run_sweep_async():
+async def test_run_sweep_async() -> None:
     sim = cirq.Simulator()
     results = await sim.run_sweep_async(
         cirq.Circuit(cirq.measure(cirq.GridQubit(0, 0), key='m')),
@@ -50,7 +50,7 @@ async def test_run_sweep_async():
 
 
 @duet.sync
-async def test_sampler_async_fail():
+async def test_sampler_async_fail() -> None:
     class FailingSampler(cirq.Sampler):
         def run_sweep(self, program, params, repetitions: int = 1):
             raise ValueError('test')
@@ -62,7 +62,7 @@ async def test_sampler_async_fail():
         await FailingSampler().run_sweep_async(cirq.Circuit(), repetitions=1, params=None)
 
 
-def test_run_sweep_impl():
+def test_run_sweep_impl() -> None:
     """Test run_sweep implemented in terms of run_sweep_async."""
 
     class AsyncSampler(cirq.Sampler):
@@ -81,7 +81,7 @@ def test_run_sweep_impl():
 
 
 @duet.sync
-async def test_run_sweep_async_impl():
+async def test_run_sweep_async_impl() -> None:
     """Test run_sweep_async implemented in terms of run_sweep."""
 
     class SyncSampler(cirq.Sampler):
@@ -98,7 +98,7 @@ async def test_run_sweep_async_impl():
         np.testing.assert_equal(result.records['m'], np.zeros((10, 1, 1)))
 
 
-def test_sampler_sample_multiple_params():
+def test_sampler_sample_multiple_params() -> None:
     a, b = cirq.LineQubit.range(2)
     s = sympy.Symbol('s')
     t = sympy.Symbol('t')
@@ -132,7 +132,7 @@ def test_sampler_sample_multiple_params():
     )
 
 
-def test_sampler_sample_sweep():
+def test_sampler_sample_sweep() -> None:
     a = cirq.LineQubit(0)
     t = sympy.Symbol('t')
     sampler = cirq.Simulator()
@@ -158,7 +158,7 @@ def test_sampler_sample_sweep():
     )
 
 
-def test_sampler_sample_no_params():
+def test_sampler_sample_no_params() -> None:
     a, b = cirq.LineQubit.range(2)
     sampler = cirq.Simulator()
     circuit = cirq.Circuit(cirq.X(a), cirq.measure(a, b, key='out'))
@@ -168,7 +168,7 @@ def test_sampler_sample_no_params():
     )
 
 
-def test_sampler_sample_inconsistent_keys():
+def test_sampler_sample_inconsistent_keys() -> None:
     q = cirq.LineQubit(0)
     sampler = cirq.Simulator()
     circuit = cirq.Circuit(cirq.measure(q, key='out'))
@@ -177,7 +177,7 @@ def test_sampler_sample_inconsistent_keys():
 
 
 @duet.sync
-async def test_sampler_async_not_run_inline():
+async def test_sampler_async_not_run_inline() -> None:
     ran = False
 
     class S(cirq.Sampler):
@@ -192,7 +192,7 @@ async def test_sampler_async_not_run_inline():
     assert ran
 
 
-def test_sampler_run_batch():
+def test_sampler_run_batch() -> None:
     sampler = cirq.ZerosSampler()
     a = cirq.LineQubit(0)
     circuit1 = cirq.Circuit(cirq.X(a) ** sympy.Symbol('t'), cirq.measure(a, key='m'))
@@ -215,7 +215,7 @@ def test_sampler_run_batch():
 
 
 @duet.sync
-async def test_run_batch_async_calls_run_sweep_asynchronously():
+async def test_run_batch_async_calls_run_sweep_asynchronously() -> None:
     """Test run_batch_async calls run_sweep_async without waiting."""
     finished = []
     a = cirq.LineQubit(0)
@@ -241,7 +241,7 @@ async def test_run_batch_async_calls_run_sweep_asynchronously():
     assert finished == list(reversed(params_list))
 
 
-def test_sampler_run_batch_default_params_and_repetitions():
+def test_sampler_run_batch_default_params_and_repetitions() -> None:
     sampler = cirq.ZerosSampler()
     a = cirq.LineQubit(0)
     circuit1 = cirq.Circuit(cirq.X(a), cirq.measure(a, key='m'))
@@ -256,7 +256,7 @@ def test_sampler_run_batch_default_params_and_repetitions():
         assert result.measurements == {'m': np.array([[0]], dtype='uint8')}
 
 
-def test_sampler_run_batch_bad_input_lengths():
+def test_sampler_run_batch_bad_input_lengths() -> None:
     sampler = cirq.ZerosSampler()
     a = cirq.LineQubit(0)
     circuit1 = cirq.Circuit(cirq.X(a) ** sympy.Symbol('t'), cirq.measure(a, key='m'))
@@ -271,7 +271,7 @@ def test_sampler_run_batch_bad_input_lengths():
         )
 
 
-def test_sampler_simple_sample_expectation_values():
+def test_sampler_simple_sample_expectation_values() -> None:
     a = cirq.LineQubit(0)
     sampler = cirq.Simulator()
     circuit = cirq.Circuit(cirq.H(a))
@@ -281,7 +281,7 @@ def test_sampler_simple_sample_expectation_values():
     assert np.allclose(results, [[1]])
 
 
-def test_sampler_sample_expectation_values_calculation():
+def test_sampler_sample_expectation_values_calculation() -> None:
     class DeterministicImbalancedStateSampler(cirq.Sampler):
         """A simple, deterministic mock sampler.
         Pretends to sample from a state vector with a 3:1 balance between the
@@ -311,7 +311,7 @@ def test_sampler_sample_expectation_values_calculation():
     assert np.allclose(results, [[0.5]])
 
 
-def test_sampler_sample_expectation_values_multi_param():
+def test_sampler_sample_expectation_values_multi_param() -> None:
     a = cirq.LineQubit(0)
     t = sympy.Symbol('t')
     sampler = cirq.Simulator(seed=1)
@@ -324,20 +324,23 @@ def test_sampler_sample_expectation_values_multi_param():
     assert np.allclose(results, [[1], [-1], [1]])
 
 
-def test_sampler_sample_expectation_values_complex_param():
+def test_sampler_sample_expectation_values_complex_param() -> None:
     a = cirq.LineQubit(0)
     t = sympy.Symbol('t')
     sampler = cirq.Simulator(seed=1)
     circuit = cirq.Circuit(cirq.global_phase_operation(t))
     obs = cirq.Z(a)
     results = sampler.sample_expectation_values(
-        circuit, [obs], num_samples=5, params=cirq.Points('t', [1, 1j, (1 + 1j) / np.sqrt(2)])
+        circuit,
+        [obs],
+        num_samples=5,
+        params=cirq.Points('t', [1, 1j, (1 + 1j) / np.sqrt(2)]),  # type: ignore[list-item]
     )
 
     assert np.allclose(results, [[1], [1], [1]])
 
 
-def test_sampler_sample_expectation_values_multi_qubit():
+def test_sampler_sample_expectation_values_multi_qubit() -> None:
     q = cirq.LineQubit.range(3)
     sampler = cirq.Simulator(seed=1)
     circuit = cirq.Circuit(cirq.X(q[0]), cirq.X(q[1]), cirq.X(q[2]))
@@ -347,7 +350,7 @@ def test_sampler_sample_expectation_values_multi_qubit():
     assert np.allclose(results, [[-3]])
 
 
-def test_sampler_sample_expectation_values_composite():
+def test_sampler_sample_expectation_values_composite() -> None:
     # Tests multi-{param,qubit} sampling together in one circuit.
     q = cirq.LineQubit.range(3)
     t = [sympy.Symbol(f't{x}') for x in range(3)]
@@ -376,7 +379,7 @@ def test_sampler_sample_expectation_values_composite():
     )
 
 
-def test_sampler_simple_sample_expectation_requirements():
+def test_sampler_simple_sample_expectation_requirements() -> None:
     a = cirq.LineQubit(0)
     sampler = cirq.Simulator(seed=1)
     circuit = cirq.Circuit(cirq.H(a))

{cirq_core-1.6.0.dev20250516060316.dist-info → cirq_core-1.6.0.dev20250516154249.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cirq-core
-Version: 1.6.0.dev20250516060316
+Version: 1.6.0.dev20250516154249
 Summary: A framework for creating, editing, and invoking Noisy Intermediate Scale Quantum (NISQ) circuits.
 Home-page: http://github.com/quantumlib/cirq
 Author: The Cirq Developers

{cirq_core-1.6.0.dev20250516060316.dist-info → cirq_core-1.6.0.dev20250516154249.dist-info}/RECORD

@@ -3,9 +3,9 @@ cirq/_compat.py,sha256=WAe4w7ZvaLlmn5J-YQMoHNwlosFaTUW6XiI1bXhPCrA,29569
 cirq/_compat_test.py,sha256=t51ZXkEuomg1SMI871Ws-5pk68DGBsAf2TGNjVXtZ8I,34755
 cirq/_doc.py,sha256=GlE8YPG5aEuA_TNMQMvqS6Pd8654akVJavUnNngtWUg,2915
 cirq/_import.py,sha256=bXzIRteBSrBl6D5KBIMP0uE8T-jjwMAgoF8yTC03tSc,8457
-cirq/_import_test.py,sha256=kjt5cN8RbEYrKz9SDg_1mDCoONUP9wlFzv4uVdQoySM,1051
-cirq/_version.py,sha256=RH_AIdAOPRBoimc7cepiC9ffAIkOymBwG4ock_EOqRM,1206
-cirq/_version_test.py,sha256=dzRFlnBDpVg2C4A2xLDkMfhgUbfTKHGeaqjzd3H-mvs,155
+cirq/_import_test.py,sha256=oF4izzOVZLc7NZ0aZHFcGv-r01eiFFt_JORx_x7_D4s,1089
+cirq/_version.py,sha256=WSIwZgUQEbYEPZoFmf0OjrFqsw7VpCbcC620BKjTZqY,1206
+cirq/_version_test.py,sha256=0xhiwZjQOG9e_f2WcSSRHNd3f048dCQTYPqqtsMdPWQ,155
 cirq/conftest.py,sha256=X7yLFL8GLhg2CjPw0hp5e_dGASfvHx1-QT03aUbhKJw,1168
 cirq/json_resolver_cache.py,sha256=-4KqEEYb6aps-seafnFTHTp3SZc0D8mr4O-pCKIajn8,13653
 cirq/py.typed,sha256=VFSlmh_lNwnaXzwY-ZuW-C2Ws5PkuDoVgBdNCs0jXJE,63
@@ -237,7 +237,7 @@ cirq/interop/quirk/cells/input_rotation_cells_test.py,sha256=6UhV6T5Os3omTDGNy8v
 cirq/interop/quirk/cells/measurement_cells.py,sha256=_6a6jm-EP9khPm2eZZu2ArlTdvfLzo1bW7LZ9GFaXVg,1539
 cirq/interop/quirk/cells/measurement_cells_test.py,sha256=guP6XrUdM2gxOhjqc3QyWOSLYpkb9gZOZRPuyC5gPhM,1582
 cirq/interop/quirk/cells/parse.py,sha256=Ilyzz9rbe9XYExVlj4rcJsrIWN4TnAj6LlVl37S9MO8,11873
-cirq/interop/quirk/cells/parse_test.py,sha256=1L3qRRaz8Q0vh8N92uFwI7G-ez97mKIqubQgp10uPsI,7473
+cirq/interop/quirk/cells/parse_test.py,sha256=zmhvD08_yU7UMOvmG3i0dTwOIY-Qy9Q4iovpLleAIWA,7589
 cirq/interop/quirk/cells/qubit_permutation_cells.py,sha256=swv_ovLaqO073j-uo6JtII_Sw_Nh51e53tSq-8JREoM,3424
 cirq/interop/quirk/cells/qubit_permutation_cells_test.py,sha256=Yk1zMK1G-M58jph3m9vLwA_ouLbtgoEq0hC2Go-8N88,4516
 cirq/interop/quirk/cells/scalar_cells.py,sha256=rHgoPJX3a9CGFAcjnJJMjc6xIsDTKdGJyGaMXGZYlnc,1281
@@ -1000,7 +1000,7 @@ cirq/testing/deprecation_test.py,sha256=CtEW1pOd9wALHVU96DNPGrANT9XRm5fF3nFdZBa2
 cirq/testing/devices.py,sha256=i3v7hOGgblJXxOdZhWeAd-XszsF2PX4-ooTmqUdkAoM,3259
 cirq/testing/devices_test.py,sha256=4cqjBi9BhmJpBdUq-nEsrtRYNhIdvTQKYynfA_CoFH8,2885
 cirq/testing/equals_tester.py,sha256=3rTAyPAQs-Ocy8v26SzSSjmaqz3ROk0oZw0DpNWaWs0,6587
-cirq/testing/equals_tester_test.py,sha256=9Rl9i-ccl7OAF_aXbVUiBgF08BeHJfn37I5Nk1etRag,10366
+cirq/testing/equals_tester_test.py,sha256=SR0wJuRWFydBkQIAPxbupRHSN43v0HpbqQHD_DwAYeU,10559
 cirq/testing/equivalent_basis_map.py,sha256=y9OlbBOWn-AC7l5x4iLfq5T4q8SxaWX_a-__QjL8_p0,2633
 cirq/testing/equivalent_basis_map_test.py,sha256=uJ4Uxa7Dmvvgh_FX65jaXXtfTU8afigPg7X7LyI88fs,1503
 cirq/testing/equivalent_repr_eval.py,sha256=vM8M9j-kVoxMg5BA1BCfZ3TgjFL5XthO7gXcau6BOak,3378
@@ -1182,15 +1182,15 @@ cirq/value/probability_test.py,sha256=TyomoRJ97eO0Wcmzc0Dlm7_iqFFTgKetnTwYcbvhL4
 cirq/value/product_state.py,sha256=C72NlKOkHXhlAeh6Zz2uO1JzZD1p-E67RhU2Hws_8aw,9026
 cirq/value/product_state_test.py,sha256=-xEbZ7TCPvkBcveKvDO6FgbPzvqdQCuZndFZK7Gwwjs,5945
 cirq/value/random_state.py,sha256=aJ2czSgM7Oiy4lrL4QPWirZy3o7C5MdKn8TDKR-aBVw,2063
-cirq/value/random_state_test.py,sha256=0VyxtuBYgrbHsNCXFZtcgucd5KwI1obMjILH2ZTZ5BU,1348
-cirq/value/timestamp.py,sha256=a7PFlJgvmGln7LJzhJK7g0JJt8cQD7JnHjC6BEYMFs0,3604
-cirq/value/timestamp_test.py,sha256=kEzKyhA0j1DnMlp41olZ7ure949nGP90Jw5OscFonwI,4030
+cirq/value/random_state_test.py,sha256=jfwVpo8Aos4QCGI1Tj_UHj0EJo1zKoD4YkZBroxzyCE,1358
+cirq/value/timestamp.py,sha256=nVAbM4PaAqu9a67u1wRewcOPC_S_-wn_3dedba20qUc,3688
+cirq/value/timestamp_test.py,sha256=lewJmgbIclbeKZ-_lbP51yr2BJgTKWzTQlvxy80r_2w,4146
 cirq/value/type_alias.py,sha256=bmKOnIIiHbjU4x62QBxAPyvdzsyv9fGyMEBz_ivwBo8,1128
 cirq/value/value_equality_attr.py,sha256=ZaCd8VW36yKENuBlmxjbdUp8NZa9wlegJqnE9vTN7G0,10545
 cirq/value/value_equality_attr_test.py,sha256=7CO1U7ct4IeloutMygx5SBrQQu9FffhORI0K3eB2-cA,6520
 cirq/vis/__init__.py,sha256=YzNrNjIyUiTxKHGzYw92qzOYzx8aXkm2y_1hkfVohtU,1171
 cirq/vis/density_matrix.py,sha256=8jadiGKgOG86llpgCahDcBJnWw0IpCooWWREJcNGXP4,4819
-cirq/vis/density_matrix_test.py,sha256=PBqsp4BjIubKWmei5FFzt5345_g_Iu-MR41jDR6Qa8Q,6907
+cirq/vis/density_matrix_test.py,sha256=gsCjGjWVsAgyEdliFqaGKuEWZSwLH-JP0unZ2D7XxYk,7045
 cirq/vis/heatmap.py,sha256=zQi8LqyZZUFXKKAzFgyFWPoo5MK51D126ODIqRFhtjg,17765
 cirq/vis/heatmap_test.py,sha256=6CEVTaS6jfpdE7EhJIs7D_AXclA0pS_calDAHx0gW2Q,20550
 cirq/vis/histogram.py,sha256=Zo4JCkQm7zNqUmae9e4hYd0fFcEY__TXaGl5mNkG-5M,5107
@@ -1201,25 +1201,25 @@ cirq/vis/vis_utils.py,sha256=CsNHb9vMBF9UjxZ2k5XqMESbATOx0FXhWAwxFbq-9pQ,1239
 cirq/vis/vis_utils_test.py,sha256=V_41sZlIRzuvmhk_wgDyQl6XyXzEOTSr9CmXWzxnD34,947
 cirq/work/__init__.py,sha256=qbw_dKRx_88FxNH_f_CfpVGMrrJKxtjDncx6m7dEWYs,1771
 cirq/work/collector.py,sha256=UqvhkMJm4fl4M_Xhc0xI2xc7FlVmMRDwKrQ6N6v-Icc,7870
-cirq/work/collector_test.py,sha256=MirBDZ584HMZ3nJRUOSSQZcAyLR6sKc124GTQqPkunc,4885
+cirq/work/collector_test.py,sha256=Vz41CZUvBhp4dKb_V6jW4RegAARQEGt7D5yBMPTSv5s,4968
 cirq/work/observable_grouping.py,sha256=Nx-oeih6fCDVxux3E3b6_Q4xDBJaEhzujc9Y2xYX8uY,3492
 cirq/work/observable_grouping_test.py,sha256=NzTPw6PD0-jvRRsGj4Q1kmZRj68I9SXbKR_PBr7OZAM,5875
-cirq/work/observable_measurement.py,sha256=On5e9So3q2jMrtAhiXcbvCNZQPMrzABZxjed0LHzqjo,28303
-cirq/work/observable_measurement_data.py,sha256=LOykgXlEcx1HLgHnODAPSuhSmxRRSZGrS5RN67wPHpg,21186
+cirq/work/observable_measurement.py,sha256=Y6cl2IJSRoMxdhgbJyMeRoqEJh5aLwDvS61ZD9NkizQ,28364
+cirq/work/observable_measurement_data.py,sha256=kQxXJaZqU2seYrQ6Zt58XgWC7CZKa7Ws20nYcK41v5w,21195
 cirq/work/observable_measurement_data_test.py,sha256=vI_SMbG4riMu0XD0tN9d_Kbq2u73k6kxTWU6Vx_tfOI,19696
-cirq/work/observable_measurement_test.py,sha256=0EvlC3rqiKSudEyq24ZYD1NQ6mxYMO9CluP3Clc-BOI,20189
+cirq/work/observable_measurement_test.py,sha256=5nqIYbHcF5AFSWQVDG9A05eyg55mB36n-Cgly_ldI2Q,21046
 cirq/work/observable_readout_calibration.py,sha256=XM8pY3lAJqwQSuCqVDhx4P2XeDzk-QC2nXMVlhlDz5s,1921
 cirq/work/observable_readout_calibration_test.py,sha256=5XpRIP3VQ1EGtbvnOetElWHIDpKv6d086eyHtAxDeh0,1849
-cirq/work/observable_settings.py,sha256=x4IT5b0ynmTZxEPTGXZ29KXjzIa6kz6aB0jH8tW6lCM,6801
-cirq/work/observable_settings_test.py,sha256=pINRmwyJkracXiQqZddl8QSejm-NBWyXPRio9ecc76k,4281
+cirq/work/observable_settings.py,sha256=-FTSGTT_Dn-uC619zJMO_F_PJc8Qi3FRmT4TzaKU61Q,6744
+cirq/work/observable_settings_test.py,sha256=i4BMv74RT_32QPuf8W7pbAFygq_hJtwjUVfaYEglris,4337
 cirq/work/pauli_sum_collector.py,sha256=5Ld5nOS6qe5a9ZZzx7rOinFC78FovWpbObMcPg61lFY,4250
-cirq/work/pauli_sum_collector_test.py,sha256=aeo06iLIYZjWjN3C4loVHRYWpV35lSSlcX2cOVdt2Ss,2437
+cirq/work/pauli_sum_collector_test.py,sha256=PG8rO_XyD21Z4pjcWGA3MLgcE8Nvy0H2iDfX6TQZ9D8,2407
 cirq/work/sampler.py,sha256=b7O3B8bc77KQb8ReLx7qeF8owP1Qwb5_I-RwC6-M_C8,19118
-cirq/work/sampler_test.py,sha256=TBJm3gepuOURwklJTXNdqj0thvdqKUvrZwZqdytJxNY,13313
+cirq/work/sampler_test.py,sha256=SsMrRvLDYELyOAWLKISjkdEfrBwLYWRsT6D8WrsLM3Q,13533
 cirq/work/zeros_sampler.py,sha256=vHCfqkXmUcPkaDuKHlY-UQ71dUHVroEtm_XW51mZpHs,2390
 cirq/work/zeros_sampler_test.py,sha256=lQLgQDGBLtfImryys2HzQ2jOSGxHgc7-koVBUhv8qYk,3345
-cirq_core-1.6.0.dev20250516060316.dist-info/licenses/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
-cirq_core-1.6.0.dev20250516060316.dist-info/METADATA,sha256=7RyqRnynRkP-snaGP8xaQiEka3s-nh96OHDu73mZ-8A,4857
-cirq_core-1.6.0.dev20250516060316.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-cirq_core-1.6.0.dev20250516060316.dist-info/top_level.txt,sha256=Sz9iOxHU0IEMLSFGwiwOCaN2e9K-jFbBbtpPN1hB73g,5
-cirq_core-1.6.0.dev20250516060316.dist-info/RECORD,,
+cirq_core-1.6.0.dev20250516154249.dist-info/licenses/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
+cirq_core-1.6.0.dev20250516154249.dist-info/METADATA,sha256=jSyePk9-nEc2wJpPfNOe3UPh7_gxwTGwj3NHqiDalos,4857
+cirq_core-1.6.0.dev20250516154249.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+cirq_core-1.6.0.dev20250516154249.dist-info/top_level.txt,sha256=Sz9iOxHU0IEMLSFGwiwOCaN2e9K-jFbBbtpPN1hB73g,5
+cirq_core-1.6.0.dev20250516154249.dist-info/RECORD,,