cirq-core 1.7.0.dev20250818230756__py3-none-any.whl → 1.7.0.dev20250820205919__py3-none-any.whl

cirq/ops/common_gates.py

@@ -274,7 +274,7 @@ class XPowGate(eigen_gate.EigenGate):
         return args.format('rx({0:half_turns}) {1};\n', self._exponent, qubits[0])
 
     @property
-    def phase_exponent(self):
+    def phase_exponent(self) -> float:
         return 0.0
 
     def _phase_by_(self, phase_turns, qubit_index):
@@ -467,7 +467,7 @@ class YPowGate(eigen_gate.EigenGate):
         return args.format('ry({0:half_turns}) {1};\n', self._exponent, qubits[0])
 
     @property
-    def phase_exponent(self):
+    def phase_exponent(self) -> float:
         return 0.5
 
     def _phase_by_(self, phase_turns, qubit_index):

cirq/ops/controlled_operation.py

@@ -124,10 +124,10 @@ class ControlledOperation(raw_types.Operation):
         )
 
     @property
-    def qubits(self):
+    def qubits(self) -> tuple[cirq.Qid, ...]:
         return self.controls + self.sub_operation.qubits
 
-    def with_qubits(self, *new_qubits):
+    def with_qubits(self, *new_qubits) -> ControlledOperation:
         n = len(self.controls)
         return ControlledOperation(
             new_qubits[:n], self.sub_operation.with_qubits(*new_qubits[n:]), self.control_values

cirq/ops/controlled_operation_test.py

@@ -17,7 +17,7 @@ from __future__ import annotations
 import itertools
 import re
 from types import EllipsisType, NotImplementedType
-from typing import cast
+from typing import cast, Sequence
 
 import numpy as np
 import pytest
@@ -74,7 +74,7 @@ class GateAllocatingNewSpaceForResult(cirq.testing.SingleQubitGate):
         return 'cirq.ops.controlled_operation_test.GateAllocatingNewSpaceForResult()'
 
 
-def test_controlled_operation_init():
+def test_controlled_operation_init() -> None:
     class G(cirq.testing.SingleQubitGate):
         def _has_mixture_(self):
             return True
@@ -123,7 +123,7 @@ def test_controlled_operation_init():
         _ = cirq.ControlledOperation([cb], cirq.PhaseDampingChannel(1)(q))
 
 
-def test_controlled_operation_eq():
+def test_controlled_operation_eq() -> None:
     c1 = cirq.NamedQubit('c1')
     q1 = cirq.NamedQubit('q1')
     c2 = cirq.NamedQubit('c2')
@@ -148,7 +148,7 @@ def test_controlled_operation_eq():
     )
 
 
-def test_str():
+def test_str() -> None:
     c1 = cirq.NamedQubit('c1')
     c2 = cirq.NamedQubit('c2')
     q2 = cirq.NamedQubit('q2')
@@ -190,7 +190,7 @@ def test_str():
     )
 
 
-def test_repr():
+def test_repr() -> None:
     a, b, c, d = cirq.LineQubit.range(4)
 
     ch = cirq.H(a).controlled_by(b)
@@ -231,7 +231,8 @@ class MultiH(cirq.Gate):
         return True
 
 
-def test_circuit_diagram():
+def test_circuit_diagram() -> None:
+    qubits: Sequence[cirq.Qid]
     qubits = cirq.LineQubit.range(3)
     c = cirq.Circuit()
     c.append(cirq.ControlledOperation(qubits[:1], MultiH(2)(*qubits[1:])))
@@ -302,7 +303,7 @@ class MockGate(cirq.testing.TwoQubitGate):
         return True
 
 
-def test_controlled_diagram_exponent():
+def test_controlled_diagram_exponent() -> None:
     for q in itertools.permutations(cirq.LineQubit.range(5)):
         for idx in [None, 0, 1]:
             op = MockGate(idx)(*q[:2]).controlled_by(*q[2:])
@@ -310,7 +311,7 @@ def test_controlled_diagram_exponent():
             assert cirq.circuit_diagram_info(op).exponent_qubit_index == len(q[2:]) + add
 
 
-def test_uninformed_circuit_diagram_info():
+def test_uninformed_circuit_diagram_info() -> None:
     qbits = cirq.LineQubit.range(3)
     mock_gate = MockGate()
     c_op = cirq.ControlledOperation(qbits[:1], mock_gate(*qbits[1:]))
@@ -323,7 +324,7 @@ def test_uninformed_circuit_diagram_info():
     assert mock_gate.captured_diagram_args == args
 
 
-def test_non_diagrammable_subop():
+def test_non_diagrammable_subop() -> None:
     qbits = cirq.LineQubit.range(2)
 
     class UndiagrammableGate(cirq.testing.SingleQubitGate):
@@ -369,7 +370,7 @@ def test_non_diagrammable_subop():
 )
 def test_controlled_operation_is_consistent(
     gate: cirq.GateOperation, should_decompose_to_target: bool
-):
+) -> None:
     cb = cirq.NamedQubit('ctr')
     cgate = cirq.ControlledOperation([cb], gate)
     cirq.testing.assert_implements_consistent_protocols(cgate)
@@ -395,7 +396,7 @@ def test_controlled_operation_is_consistent(
     cirq.testing.assert_decompose_ends_at_default_gateset(cgate)
 
 
-def test_controlled_circuit_operation_is_consistent():
+def test_controlled_circuit_operation_is_consistent() -> None:
     op = cirq.CircuitOperation(
         cirq.FrozenCircuit(
             cirq.XXPowGate(exponent=0.25, global_shift=-0.5).on(*cirq.LineQubit.range(2))
@@ -416,7 +417,7 @@ def test_controlled_circuit_operation_is_consistent():
 
 
 @pytest.mark.parametrize('resolve_fn', [cirq.resolve_parameters, cirq.resolve_parameters_once])
-def test_parameterizable(resolve_fn):
+def test_parameterizable(resolve_fn) -> None:
     a = sympy.Symbol('a')
     qubits = cirq.LineQubit.range(3)
 
@@ -434,7 +435,7 @@ def test_parameterizable(resolve_fn):
         resolve_fn(cchan, cirq.ParamResolver({'a': 0.1}))
 
 
-def test_bounded_effect():
+def test_bounded_effect() -> None:
     qubits = cirq.LineQubit.range(3)
     cy = cirq.ControlledOperation(qubits[:1], cirq.Y(qubits[1]))
     assert cirq.trace_distance_bound(cy**0.001) < 0.01
@@ -444,8 +445,8 @@ def test_bounded_effect():
     assert cirq.approx_eq(cirq.trace_distance_bound(cy), 1.0)
 
 
-def test_controlled_operation_gate():
-    gate = cirq.X.controlled(control_values=[0, 1], control_qid_shape=[2, 3])
+def test_controlled_operation_gate() -> None:
+    gate = cirq.X.controlled(control_values=[0, 1], control_qid_shape=(2, 3))
     op = gate.on(cirq.LineQubit(0), cirq.LineQid(1, 3), cirq.LineQubit(2))
     assert op.gate == gate
 
@@ -464,7 +465,7 @@ def test_controlled_operation_gate():
     assert op.gate is None
 
 
-def test_controlled_mixture():
+def test_controlled_mixture() -> None:
     a, b = cirq.LineQubit.range(2)
     c_yes = cirq.ControlledOperation(controls=[b], sub_operation=cirq.phase_flip(0.25).on(a))
     assert cirq.has_mixture(c_yes)

cirq/ops/dense_pauli_string_test.py

@@ -24,7 +24,7 @@ import cirq
 from cirq.ops.dense_pauli_string import _vectorized_pauli_mul_phase
 
 
-def test_init():
+def test_init() -> None:
     mask = np.array([0, 3, 1, 2], dtype=np.uint8)
     p = cirq.DensePauliString(coefficient=2, pauli_mask=mask)
     m = cirq.MutableDensePauliString(coefficient=3, pauli_mask=mask)
@@ -50,10 +50,10 @@ def test_init():
     assert cirq.DensePauliString([1, 'X', cirq.X]) == cirq.DensePauliString('XXX')
     assert list(cirq.DensePauliString('XXX')) == [cirq.X, cirq.X, cirq.X]
     with pytest.raises(TypeError, match='Expected a cirq.PAULI_GATE_LIKE'):
-        _ = cirq.DensePauliString([object()])
+        _ = cirq.DensePauliString([object()])  # type: ignore[list-item]
 
 
-def test_value_to_char_correspondence():
+def test_value_to_char_correspondence() -> None:
     d = cirq.DensePauliString
     assert [d.I_VAL, d.X_VAL, d.Y_VAL, d.Z_VAL] == [0, 1, 2, 3]
     assert list(d([cirq.I, cirq.X, cirq.Y, cirq.Z]).pauli_mask) == [0, 1, 2, 3]
@@ -69,7 +69,7 @@ def test_value_to_char_correspondence():
     assert d('Z') * d('Y') == -1j * d('X')
 
 
-def test_from_text():
+def test_from_text() -> None:
     d = cirq.DensePauliString
     m = cirq.MutableDensePauliString
 
@@ -86,7 +86,7 @@ def test_from_text():
         _ = d('2')
 
 
-def test_immutable_eq():
+def test_immutable_eq() -> None:
     eq = cirq.testing.EqualsTester()
 
     # Immutables
@@ -103,7 +103,7 @@ def test_immutable_eq():
     eq.make_equality_group(lambda: cirq.MutableDensePauliString(coefficient=2, pauli_mask=[2]))
 
 
-def test_eye():
+def test_eye() -> None:
     f = cirq.DensePauliString
     m = cirq.MutableDensePauliString
     assert cirq.BaseDensePauliString.eye(4) == f('IIII')
@@ -111,7 +111,7 @@ def test_eye():
     assert cirq.MutableDensePauliString.eye(4) == m('IIII')
 
 
-def test_sparse():
+def test_sparse() -> None:
     a, b, c = cirq.LineQubit.range(3)
     p = -cirq.DensePauliString('XYZ')
     assert p.sparse() == cirq.PauliString(-1, cirq.X(a), cirq.Y(b), cirq.Z(c))
@@ -122,12 +122,14 @@ def test_sparse():
         _ = p.sparse(cirq.GridQubit.rect(2, 2))
 
 
-def test_mul_vectorized_pauli_mul_phase():
+def test_mul_vectorized_pauli_mul_phase() -> None:
     f = _vectorized_pauli_mul_phase
     paulis = [cirq.I, cirq.X, cirq.Y, cirq.Z]
     q = cirq.LineQubit(0)
 
     # Check single qubit cases.
+    sparse1: cirq.PauliString
+    sparse2: cirq.PauliString
     for i in range(4):
         for j in range(4):
             sparse1 = cirq.PauliString(paulis[i].on(q))
@@ -146,7 +148,7 @@ def test_mul_vectorized_pauli_mul_phase():
     )
 
 
-def test_mul():
+def test_mul() -> None:
     f = cirq.DensePauliString
 
     # Scalar.
@@ -193,22 +195,23 @@ def test_mul():
 
     # Unknown number type
     class UnknownNumber(numbers.Number):
-        pass
+        def __hash__(self):
+            return hash(complex(self))  # pragma: no cover
 
     with pytest.raises(TypeError):
         _ = UnknownNumber() * f('I')
 
 
-def test_imul():
+def test_imul() -> None:
     f = cirq.DensePauliString
     m = cirq.MutableDensePauliString
 
     # Immutable not modified by imul.
-    p = f('III')
-    p2 = p
-    p2 *= 2
-    assert p.coefficient == 1
-    assert p is not p2
+    pf = f('III')
+    pf2 = pf
+    pf2 *= 2
+    assert pf.coefficient == 1
+    assert pf is not pf2
 
     # Mutable is modified by imul.
     p = m('III')
@@ -239,19 +242,20 @@ def test_imul():
 
     # Unknown number type
     class UnknownNumber(numbers.Number):
-        pass
+        def __hash__(self):
+            return hash(complex(self))  # pragma: no cover
 
     with pytest.raises(TypeError):
         p *= UnknownNumber()
 
 
-def test_pos_neg():
+def test_pos_neg() -> None:
     p = 1j * cirq.DensePauliString('XYZ')
     assert +p == p
     assert -p == -1 * p
 
 
-def test_abs():
+def test_abs() -> None:
     f = cirq.DensePauliString
     m = cirq.DensePauliString
     assert abs(-f('XX')) == f('XX')
@@ -259,7 +263,7 @@ def test_abs():
     assert abs(2j * m('XX')) == 2 * f('XX')
 
 
-def test_approx_eq():
+def test_approx_eq() -> None:
     f = cirq.DensePauliString
     m = cirq.MutableDensePauliString
 
@@ -278,7 +282,7 @@ def test_approx_eq():
     assert not cirq.approx_eq(f('X'), f('Y'), atol=500)
 
 
-def test_pow():
+def test_pow() -> None:
     f = cirq.DensePauliString
     m = cirq.DensePauliString
     p = 1j * f('IXYZ')
@@ -314,7 +318,7 @@ def test_pow():
     assert m('X') ** 3 == f('X')
 
 
-def test_div():
+def test_div() -> None:
     f = cirq.DensePauliString
     t = sympy.Symbol('t')
     assert f('X') / 2 == 0.5 * f('X')
@@ -323,7 +327,7 @@ def test_div():
         _ = f('X') / object()
 
 
-def test_str():
+def test_str() -> None:
     f = cirq.DensePauliString
     m = cirq.MutableDensePauliString
 
@@ -338,7 +342,7 @@ def test_str():
     assert str(f('XX', coefficient=sympy.Symbol('t'))) == 't*XX'
 
 
-def test_repr():
+def test_repr() -> None:
     f = cirq.DensePauliString
     m = cirq.MutableDensePauliString
     cirq.testing.assert_equivalent_repr(f(''))
@@ -351,7 +355,7 @@ def test_repr():
     cirq.testing.assert_equivalent_repr(m(coefficient=sympy.Symbol('c'), pauli_mask=[0, 3, 2, 1]))
 
 
-def test_one_hot():
+def test_one_hot() -> None:
     f = cirq.DensePauliString
     m = cirq.MutableDensePauliString
 
@@ -374,7 +378,7 @@ def test_one_hot():
         _ = cirq.BaseDensePauliString.one_hot(index=0, length=0, pauli=cirq.X)
 
 
-def test_protocols():
+def test_protocols() -> None:
     t = sympy.Symbol('t')
     cirq.testing.assert_implements_consistent_protocols(cirq.DensePauliString('Y'))
     cirq.testing.assert_implements_consistent_protocols(-cirq.DensePauliString('Z'))
@@ -400,7 +404,7 @@ def test_protocols():
 
 
 @pytest.mark.parametrize('resolve_fn', [cirq.resolve_parameters, cirq.resolve_parameters_once])
-def test_parameterizable(resolve_fn):
+def test_parameterizable(resolve_fn) -> None:
     t = sympy.Symbol('t')
     x = cirq.DensePauliString('X')
     xt = x * t
@@ -415,7 +419,7 @@ def test_parameterizable(resolve_fn):
     assert resolve_fn(xt(q).gate, {'t': 2}) == x2
 
 
-def test_item_immutable():
+def test_item_immutable() -> None:
     p = -cirq.DensePauliString('XYIZ')
     assert p[-1] == cirq.Z
     assert p[0] == cirq.X
@@ -437,7 +441,7 @@ def test_item_immutable():
     assert p[::2] == cirq.DensePauliString('XI')
 
 
-def test_item_mutable():
+def test_item_mutable() -> None:
     m = cirq.MutableDensePauliString
     p = m('XYIZ', coefficient=-1)
     assert p[-1] == cirq.Z
@@ -448,9 +452,9 @@ def test_item_mutable():
     with pytest.raises(IndexError):
         _ = p[4]
     with pytest.raises(TypeError):
-        _ = p["test"]
+        _ = p["test"]  # type: ignore[call-overload]
     with pytest.raises(TypeError):
-        p["test"] = 'X'
+        p["test"] = 'X'  # type: ignore[call-overload]
 
     p[2] = cirq.X
     assert p == m('XYXZ', coefficient=-1)
@@ -482,7 +486,7 @@ def test_item_mutable():
     assert p == m('ZYXX', coefficient=-1)
 
 
-def test_tensor_product():
+def test_tensor_product() -> None:
     f = cirq.DensePauliString
     m = cirq.MutableDensePauliString
     assert (2 * f('XX')).tensor_product(-f('XI')) == -2 * f('XXXI')
@@ -491,7 +495,7 @@ def test_tensor_product():
     assert m('XX', coefficient=2).tensor_product(m('XI', coefficient=-1)) == -2 * m('XXXI')
 
 
-def test_commutes():
+def test_commutes() -> None:
     f = cirq.DensePauliString
     m = cirq.MutableDensePauliString
 
@@ -507,7 +511,7 @@ def test_commutes():
     assert cirq.commutes(f('XX'), "test", default=NotImplemented) is NotImplemented
 
 
-def test_copy():
+def test_copy() -> None:
     p = -cirq.DensePauliString('XYZ')
     m = cirq.MutableDensePauliString('XYZ', coefficient=-1)
 
@@ -545,7 +549,7 @@ def test_copy():
     assert cirq.MutableDensePauliString('XYZ').copy(pauli_mask=mask).pauli_mask is mask
 
 
-def test_gaussian_elimination():
+def test_gaussian_elimination() -> None:
     def table(*rows: str) -> list[cirq.MutableDensePauliString]:
         coefs = {'i': 1j, '-': -1, '+': 1}
         return [
@@ -626,7 +630,7 @@ def test_gaussian_elimination():
     )
 
 
-def test_idiv():
+def test_idiv() -> None:
     p = cirq.MutableDensePauliString('XYZ', coefficient=2)
     p /= 2
     assert p == cirq.MutableDensePauliString('XYZ')
@@ -635,7 +639,7 @@ def test_idiv():
         p /= object()
 
 
-def test_symbolic():
+def test_symbolic() -> None:
     t = sympy.Symbol('t')
     r = sympy.Symbol('r')
     m = cirq.MutableDensePauliString('XYZ', coefficient=t)

cirq/ops/eigen_gate_test.py

@@ -34,10 +34,6 @@ class CExpZinGate(cirq.EigenGate, cirq.testing.TwoQubitGate):
     def __init__(self, quarter_turns: value.TParamVal) -> None:
         super().__init__(exponent=quarter_turns)
 
-    @property
-    def exponent(self):
-        return self._exponent
-
     def _with_exponent(self, exponent):
         return CExpZinGate(exponent)
 
@@ -50,9 +46,6 @@ class CExpZinGate(cirq.EigenGate, cirq.testing.TwoQubitGate):
 
 
 class ZGateDef(cirq.EigenGate, cirq.testing.SingleQubitGate):
-    @property
-    def exponent(self):
-        return self._exponent
 
     def _eigen_components(self) -> list[tuple[float, np.ndarray]]:
         return [(0, np.diag([1, 0])), (1, np.diag([0, 1]))]

cirq/ops/gateset.py

@@ -16,7 +16,7 @@
 
 from __future__ import annotations
 
-from typing import Any, Callable, cast, Hashable, Sequence, TYPE_CHECKING
+from typing import Any, Callable, cast, Hashable, Iterable, TYPE_CHECKING
 
 from cirq import protocols, value
 from cirq.ops import global_phase_op, op_tree, raw_types
@@ -105,8 +105,8 @@ class GateFamily:
         name: str | None = None,
         description: str | None = None,
         ignore_global_phase: bool = True,
-        tags_to_accept: Sequence[Hashable] = (),
-        tags_to_ignore: Sequence[Hashable] = (),
+        tags_to_accept: Iterable[Hashable] = (),
+        tags_to_ignore: Iterable[Hashable] = (),
     ) -> None:
         """Init GateFamily.
 

cirq/ops/gateset_test.py

@@ -56,7 +56,7 @@ q = cirq.NamedQubit("q")
 
 
 @pytest.mark.parametrize('gate', [CustomX, CustomXPowGate])
-def test_gate_family_init(gate):
+def test_gate_family_init(gate) -> None:
     name = 'test_name'
     description = 'test_description'
     g = cirq.GateFamily(gate=gate, name=name, description=description)
@@ -75,7 +75,7 @@ def test_gate_family_init(gate):
         (CustomXPowGate, [], []),
     ],
 )
-def test_gate_family_default_name_and_description(gate, tags_to_accept, tags_to_ignore):
+def test_gate_family_default_name_and_description(gate, tags_to_accept, tags_to_ignore) -> None:
     g = cirq.GateFamily(gate, tags_to_accept=tags_to_accept, tags_to_ignore=tags_to_ignore)
     assert re.match('.*GateFamily.*CustomX.*', g.name)
     assert re.match('Accepts.*instances.*CustomX.*', g.description)
@@ -97,7 +97,7 @@ def test_gate_family_default_name_and_description(gate, tags_to_accept, tags_to_
 )
 def test_gate_family_equality_with_tags(
     tags_to_accept_fam1, tags_to_ignore_fam1, tags_to_accept_fam2, tags_to_ignore_fam2
-):
+) -> None:
     gate_fam1 = cirq.GateFamily(
         cirq.X, tags_to_accept=tags_to_accept_fam1, tags_to_ignore=tags_to_ignore_fam1
     )
@@ -108,9 +108,9 @@ def test_gate_family_equality_with_tags(
     assert gate_fam1 == gate_fam2
 
 
-def test_invalid_gate_family():
+def test_invalid_gate_family() -> None:
     with pytest.raises(ValueError, match='instance or subclass of `cirq.Gate`'):
-        _ = cirq.GateFamily(gate=cirq.Operation)
+        _ = cirq.GateFamily(gate=cirq.Operation)  # type: ignore[arg-type]
 
     with pytest.raises(ValueError, match='non-parameterized instance of `cirq.Gate`'):
         _ = cirq.GateFamily(gate=CustomX ** sympy.Symbol('theta'))
@@ -119,31 +119,31 @@ def test_invalid_gate_family():
         _ = cirq.GateFamily(gate=cirq.H, tags_to_accept={'a', 'b'}, tags_to_ignore={'b', 'c'})
 
 
-def test_gate_family_immutable():
+def test_gate_family_immutable() -> None:
     g = cirq.GateFamily(CustomX)
     # Match one of two strings. The second one is message returned since python 3.11.
     with pytest.raises(
         AttributeError,
         match="(can't set attribute)|(property 'gate' of 'GateFamily' object has no setter)",
     ):
-        g.gate = CustomXPowGate
+        g.gate = CustomXPowGate  # type: ignore[misc]
     with pytest.raises(
         AttributeError,
         match="(can't set attribute)|(property 'name' of 'GateFamily' object has no setter)",
     ):
-        g.name = 'new name'
+        g.name = 'new name'  # type: ignore[misc]
     with pytest.raises(
         AttributeError,
         match="(can't set attribute)|(property 'description' of 'GateFamily' object has no setter)",
     ):
-        g.description = 'new description'
+        g.description = 'new description'  # type: ignore[misc]
 
 
 @pytest.mark.parametrize(
     'gate', [CustomX, CustomXPowGate(exponent=0.5, global_shift=0.1), CustomXPowGate]
 )
 @pytest.mark.parametrize('name, description', [(None, None), ('custom_name', 'custom_description')])
-def test_gate_family_repr_and_str(gate, name, description):
+def test_gate_family_repr_and_str(gate, name, description) -> None:
     g = cirq.GateFamily(gate, name=name, description=description)
     cirq.testing.assert_equivalent_repr(g)
     assert g.name in str(g)
@@ -152,13 +152,13 @@ def test_gate_family_repr_and_str(gate, name, description):
 
 @pytest.mark.parametrize('gate', [cirq.X, cirq.XPowGate(), cirq.XPowGate])
 @pytest.mark.parametrize('name, description', [(None, None), ('custom_name', 'custom_description')])
-def test_gate_family_json(gate, name, description):
+def test_gate_family_json(gate, name, description) -> None:
     g = cirq.GateFamily(gate, name=name, description=description)
     g_json = cirq.to_json(g)
     assert cirq.read_json(json_text=g_json) == g
 
 
-def test_gate_family_eq():
+def test_gate_family_eq() -> None:
     eq = cirq.testing.EqualsTester()
     eq.add_equality_group(cirq.GateFamily(CustomX))
     eq.add_equality_group(cirq.GateFamily(CustomX**3))
@@ -206,7 +206,7 @@ def test_gate_family_eq():
         ),
     ],
 )
-def test_gate_family_predicate_and_containment(gate_family, gates_to_check):
+def test_gate_family_predicate_and_containment(gate_family, gates_to_check) -> None:
     for gate, result in gates_to_check:
         assert gate_family._predicate(gate) == result
         assert (gate in gate_family) == result
@@ -265,7 +265,7 @@ def test_gate_family_predicate_and_containment(gate_family, gates_to_check):
         ),
     ],
 )
-def test_gate_family_tagged_operations(gate_family, gates_to_check):
+def test_gate_family_tagged_operations(gate_family, gates_to_check) -> None:
     for gate, result in gates_to_check:
         assert (gate in gate_family) == result
 
@@ -296,7 +296,7 @@ gateset = cirq.Gateset(
 )
 
 
-def test_gateset_init():
+def test_gateset_init() -> None:
     assert gateset.name == 'custom gateset'
     assert gateset.gates == frozenset(
         [
@@ -308,7 +308,7 @@ def test_gateset_init():
 
 
 @pytest.mark.parametrize('g', [gateset, cirq.Gateset(name='empty gateset')])
-def test_gateset_repr_and_str(g):
+def test_gateset_repr_and_str(g) -> None:
     cirq.testing.assert_equivalent_repr(g)
     assert g.name in str(g)
     for gate_family in g.gates:
@@ -328,7 +328,7 @@ def test_gateset_repr_and_str(g):
         (cirq.testing.TwoQubitGate(), True),
     ],
 )
-def test_gateset_contains(gate, result):
+def test_gateset_contains(gate, result) -> None:
     assert (gate in gateset) is result
     op = gate(*cirq.LineQubit.range(gate.num_qubits()))
     assert (op in gateset) is result
@@ -339,7 +339,7 @@ def test_gateset_contains(gate, result):
 
 
 @pytest.mark.parametrize('use_circuit_op', [True, False])
-def test_gateset_validate(use_circuit_op):
+def test_gateset_validate(use_circuit_op) -> None:
     def optree_and_circuit(optree):
         yield optree
         yield cirq.Circuit(optree)
@@ -374,14 +374,14 @@ def test_gateset_validate(use_circuit_op):
         )
 
 
-def test_gateset_validate_circuit_op_negative_reps():
+def test_gateset_validate_circuit_op_negative_reps() -> None:
     gate = CustomXPowGate(exponent=0.5)
     op = cirq.CircuitOperation(cirq.FrozenCircuit(gate.on(cirq.LineQubit(0))), repetitions=-1)
     assert op not in cirq.Gateset(gate)
     assert op**-1 in cirq.Gateset(gate)
 
 
-def test_with_params():
+def test_with_params() -> None:
     assert gateset.with_params() is gateset
     assert (
         gateset.with_params(name=gateset.name, unroll_circuit_op=gateset._unroll_circuit_op)
@@ -392,7 +392,7 @@ def test_with_params():
     assert gateset_with_params._unroll_circuit_op is False
 
 
-def test_gateset_eq():
+def test_gateset_eq() -> None:
     eq = cirq.testing.EqualsTester()
     eq.add_equality_group(cirq.Gateset(CustomX))
     eq.add_equality_group(cirq.Gateset(CustomX**3))
@@ -427,7 +427,7 @@ def test_gateset_eq():
     )
 
 
-def test_gateset_contains_with_tags():
+def test_gateset_contains_with_tags() -> None:
     tag = "PhysicalZTag"
     gf_accept = cirq.GateFamily(cirq.ZPowGate, tags_to_accept=[tag])
     gf_ignore = cirq.GateFamily(cirq.ZPowGate, tags_to_ignore=[tag])
@@ -447,7 +447,7 @@ def test_gateset_contains_with_tags():
     assert op_with_tag in cirq.Gateset(gf_accept, gf_ignore)
 
 
-def test_gateset_contains_op_with_no_gate():
+def test_gateset_contains_op_with_no_gate() -> None:
     gf = cirq.GateFamily(cirq.ZPowGate)
     op = cirq.X(cirq.q(1)).with_classical_controls('a')
     assert op.gate is None

cirq/ops/linear_combinations.py

@@ -473,7 +473,7 @@ class PauliSum:
 
     @classmethod
     def from_boolean_expression(
-        cls, boolean_expr: sympy.Expr, qubit_map: dict[str, cirq.Qid]
+        cls, boolean_expr: sympy.Expr, qubit_map: Mapping[str, cirq.Qid]
     ) -> PauliSum:
         """Builds the Hamiltonian representation of a Boolean expression.