cirq-core 1.5.0.dev20250409222543__py3-none-any.whl → 1.6.0__py3-none-any.whl

cirq/circuits/qasm_output.py

@@ -17,7 +17,7 @@
 from __future__ import annotations
 
 import re
-from typing import Callable, Dict, Iterator, Optional, Sequence, Tuple, TYPE_CHECKING, Union
+from typing import Callable, Iterator, Sequence, TYPE_CHECKING
 
 import numpy as np
 
@@ -55,7 +55,7 @@ class QasmUGate(ops.Gate):
     def _has_unitary_(self):
         return True
 
-    def _qasm_(self, qubits: Tuple[cirq.Qid, ...], args: cirq.QasmArgs) -> str:
+    def _qasm_(self, qubits: tuple[cirq.Qid, ...], args: cirq.QasmArgs) -> str:
         args.validate_version('2.0', '3.0')
         return args.format(
             'u3({0:half_turns},{1:half_turns},{2:half_turns}) {3};\n',
@@ -84,7 +84,7 @@ class QasmUGate(ops.Gate):
     def _value_equality_values_(self):
         return self.lmda, self.theta, self.phi
 
-    def _json_dict_(self) -> Dict[str, float]:
+    def _json_dict_(self) -> dict[str, float]:
         return {'theta': self.theta, 'phi': self.phi, 'lmda': self.lmda}
 
     @classmethod
@@ -173,7 +173,7 @@ class QasmOutput:
     def __init__(
         self,
         operations: cirq.OP_TREE,
-        qubits: Tuple[cirq.Qid, ...],
+        qubits: tuple[cirq.Qid, ...],
         header: str = '',
         precision: int = 10,
         version: str = '2.0',
@@ -208,10 +208,10 @@ class QasmOutput:
             meas_key_bitcount={k: v[0] for k, v in self.cregs.items()},
         )
 
-    def _generate_measurement_ids(self) -> Tuple[Dict[str, str], Dict[str, Optional[str]]]:
+    def _generate_measurement_ids(self) -> tuple[dict[str, str], dict[str, str | None]]:
         # Pick an id for the creg that will store each measurement
-        meas_key_id_map: Dict[str, str] = {}
-        meas_comments: Dict[str, Optional[str]] = {}
+        meas_key_id_map: dict[str, str] = {}
+        meas_comments: dict[str, str | None] = {}
         meas_i = 0
         for meas in self.measurements:
             key = protocols.measurement_key_name(meas)
@@ -227,10 +227,10 @@ class QasmOutput:
             meas_key_id_map[key] = meas_id
         return meas_key_id_map, meas_comments
 
-    def _generate_qubit_ids(self) -> Dict[cirq.Qid, str]:
+    def _generate_qubit_ids(self) -> dict[cirq.Qid, str]:
         return {qubit: f'q[{i}]' for i, qubit in enumerate(self.qubits)}
 
-    def _generate_cregs(self, meas_key_id_map: Dict[str, str]) -> Dict[str, tuple[int, str]]:
+    def _generate_cregs(self, meas_key_id_map: dict[str, str]) -> dict[str, tuple[int, str]]:
         """Pick an id for the creg that will store each measurement
 
         This function finds the largest measurement using each key.
@@ -239,7 +239,7 @@ class QasmOutput:
 
         Returns: dictionary with key of measurement id and value of (#qubits, comment).
         """
-        cregs: Dict[str, tuple[int, str]] = {}
+        cregs: dict[str, tuple[int, str]] = {}
         for meas in self.measurements:
             key = protocols.measurement_key_name(meas)
             meas_id = meas_key_id_map[key]
@@ -258,7 +258,7 @@ class QasmOutput:
         """Test if id_str is a valid id in QASM grammar."""
         return self.valid_id_re.match(id_str) is not None
 
-    def save(self, path: Union[str, bytes, int]) -> None:
+    def save(self, path: str | bytes | int) -> None:
         """Write QASM output to a file specified by path."""
         with open(path, 'w') as f:
 

cirq/circuits/qasm_output_test.py

@@ -11,6 +11,9 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
+from __future__ import annotations
+
 import os
 import re
 
@@ -26,12 +29,12 @@ def _make_qubits(n):
     return [cirq.NamedQubit(f'q{i}') for i in range(n)]
 
 
-def test_u_gate_repr():
+def test_u_gate_repr() -> None:
     gate = QasmUGate(0.1, 0.2, 0.3)
     assert repr(gate) == 'cirq.circuits.qasm_output.QasmUGate(theta=0.1, phi=0.2, lmda=0.3)'
 
 
-def test_u_gate_eq():
+def test_u_gate_eq() -> None:
     gate = QasmUGate(0.1, 0.2, 0.3)
     gate2 = QasmUGate(0.1, 0.2, 0.3)
     cirq.approx_eq(gate, gate2, atol=1e-16)
@@ -40,13 +43,13 @@ def test_u_gate_eq():
     cirq.approx_eq(gate4, gate3, atol=1e-16)
 
 
-def test_qasm_two_qubit_gate_repr():
+def test_qasm_two_qubit_gate_repr() -> None:
     cirq.testing.assert_equivalent_repr(
         QasmTwoQubitGate.from_matrix(cirq.testing.random_unitary(4))
     )
 
 
-def test_qasm_u_qubit_gate_unitary():
+def test_qasm_u_qubit_gate_unitary() -> None:
     u = cirq.testing.random_unitary(2)
     g = QasmUGate.from_matrix(u)
     cirq.testing.assert_allclose_up_to_global_phase(cirq.unitary(g), u, atol=1e-7)
@@ -59,13 +62,13 @@ def test_qasm_u_qubit_gate_unitary():
     cirq.testing.assert_implements_consistent_protocols(g)
 
 
-def test_qasm_two_qubit_gate_unitary():
+def test_qasm_two_qubit_gate_unitary() -> None:
     u = cirq.testing.random_unitary(4)
     g = QasmTwoQubitGate.from_matrix(u)
     np.testing.assert_allclose(cirq.unitary(g), u)
 
 
-def test_empty_circuit_one_qubit():
+def test_empty_circuit_one_qubit() -> None:
     (q0,) = _make_qubits(1)
     output = cirq.QasmOutput((), (q0,))
     assert (
@@ -80,7 +83,7 @@ qreg q[1];
     )
 
 
-def test_empty_circuit_no_qubits():
+def test_empty_circuit_no_qubits() -> None:
     output = cirq.QasmOutput((), ())
     assert (
         str(output)
@@ -93,7 +96,7 @@ include "qelib1.inc";
     )
 
 
-def test_header():
+def test_header() -> None:
     (q0,) = _make_qubits(1)
     output = cirq.QasmOutput(
         (),
@@ -140,7 +143,7 @@ qreg q[1];
     )
 
 
-def test_single_gate_no_parameter():
+def test_single_gate_no_parameter() -> None:
     (q0,) = _make_qubits(1)
     output = cirq.QasmOutput((cirq.X(q0),), (q0,))
     assert (
@@ -158,7 +161,7 @@ x q[0];
     )
 
 
-def test_single_gate_with_parameter():
+def test_single_gate_with_parameter() -> None:
     (q0,) = _make_qubits(1)
     output = cirq.QasmOutput((cirq.X(q0) ** 0.25,), (q0,))
     assert (
@@ -176,7 +179,7 @@ rx(pi*0.25) q[0];
     )
 
 
-def test_h_gate_with_parameter():
+def test_h_gate_with_parameter() -> None:
     (q0,) = _make_qubits(1)
     output = cirq.QasmOutput((cirq.H(q0) ** 0.25,), (q0,))
     assert (
@@ -197,7 +200,7 @@ ry(pi*-0.25) q[0];
     )
 
 
-def test_qasm_global_pahse():
+def test_qasm_global_pahse() -> None:
     output = cirq.QasmOutput((cirq.global_phase_operation(np.exp(1j * 5))), ())
     assert (
         str(output)
@@ -210,7 +213,7 @@ include "qelib1.inc";
     )
 
 
-def test_precision():
+def test_precision() -> None:
     (q0,) = _make_qubits(1)
     output = cirq.QasmOutput((cirq.X(q0) ** 0.1234567,), (q0,), precision=3)
     assert (
@@ -228,14 +231,14 @@ rx(pi*0.123) q[0];
     )
 
 
-def test_version():
+def test_version() -> None:
     (q0,) = _make_qubits(1)
     with pytest.raises(ValueError):
         output = cirq.QasmOutput((), (q0,), version='4.0')
         _ = str(output)
 
 
-def test_save_to_file(tmpdir):
+def test_save_to_file(tmpdir) -> None:
     file_path = os.path.join(tmpdir, 'test.qasm')
     (q0,) = _make_qubits(1)
     output = cirq.QasmOutput((), (q0,))
@@ -254,7 +257,7 @@ qreg q[1];
     )
 
 
-def test_unsupported_operation():
+def test_unsupported_operation() -> None:
     (q0,) = _make_qubits(1)
 
     class UnsupportedOperation(cirq.Operation):
@@ -266,7 +269,7 @@ def test_unsupported_operation():
         _ = str(output)
 
 
-def _all_operations(q0, q1, q2, q3, q4, include_measurements=True):
+def _all_operations(q0, q1, q2, q3, q4, *, include_measurements=True):
     class ExampleOperation(cirq.Operation):
         qubits = (q0,)
         with_qubits = NotImplemented
@@ -354,7 +357,7 @@ def _all_operations(q0, q1, q2, q3, q4, include_measurements=True):
     )
 
 
-def test_output_unitary_same_as_qiskit():
+def test_output_unitary_same_as_qiskit() -> None:
     qubits = tuple(_make_qubits(5))
     operations = _all_operations(*qubits, include_measurements=False)
     output = cirq.QasmOutput(operations, qubits, header='Generated from Cirq', precision=10)
@@ -365,7 +368,7 @@ def test_output_unitary_same_as_qiskit():
     cq.assert_qiskit_parsed_qasm_consistent_with_unitary(text, cirq_unitary)
 
 
-def test_fails_on_big_unknowns():
+def test_fails_on_big_unknowns() -> None:
     class UnrecognizedGate(cirq.testing.ThreeQubitGate):
         pass
 
@@ -374,7 +377,7 @@ def test_fails_on_big_unknowns():
         _ = c.to_qasm()
 
 
-def test_output_format():
+def test_output_format() -> None:
     def filter_unpredictable_numbers(text):
         return re.sub(r'u3\(.+\)', r'u3(<not-repeatable>)', text)
 
@@ -568,7 +571,7 @@ x q[0];
     )
 
 
-def test_reset():
+def test_reset() -> None:
     a, b = cirq.LineQubit.range(2)
     c = cirq.Circuit(cirq.H(a), cirq.CNOT(a, b), cirq.reset(a), cirq.reset(b))
     output = cirq.QasmOutput(
@@ -598,7 +601,7 @@ reset q[1];
     )
 
 
-def test_different_sized_registers():
+def test_different_sized_registers() -> None:
     qubits = cirq.LineQubit.range(2)
     c = cirq.Circuit(cirq.measure(qubits[0], key='c'), cirq.measure(qubits, key='c'))
     output = cirq.QasmOutput(

cirq/circuits/text_diagram_drawer.py

@@ -14,20 +14,7 @@
 
 from __future__ import annotations
 
-from typing import (
-    Any,
-    Callable,
-    cast,
-    Dict,
-    Iterable,
-    List,
-    Mapping,
-    NamedTuple,
-    Optional,
-    Sequence,
-    Tuple,
-    TYPE_CHECKING,
-)
+from typing import Any, Callable, cast, Iterable, Mapping, NamedTuple, Self, Sequence, TYPE_CHECKING
 
 import numpy as np
 
@@ -73,25 +60,25 @@ class TextDiagramDrawer:
 
     def __init__(
         self,
-        entries: Optional[Mapping[Tuple[int, int], _DiagramText]] = None,
-        horizontal_lines: Optional[Iterable[_HorizontalLine]] = None,
-        vertical_lines: Optional[Iterable[_VerticalLine]] = None,
-        horizontal_padding: Optional[Mapping[int, int]] = None,
-        vertical_padding: Optional[Mapping[int, int]] = None,
+        entries: Mapping[tuple[int, int], _DiagramText] | None = None,
+        horizontal_lines: Iterable[_HorizontalLine] | None = None,
+        vertical_lines: Iterable[_VerticalLine] | None = None,
+        horizontal_padding: Mapping[int, float] | None = None,
+        vertical_padding: Mapping[int, float] | None = None,
     ) -> None:
-        self.entries: Dict[Tuple[int, int], _DiagramText] = (
+        self.entries: dict[tuple[int, int], _DiagramText] = (
             dict() if entries is None else dict(entries)
         )
-        self.horizontal_lines: List[_HorizontalLine] = (
+        self.horizontal_lines: list[_HorizontalLine] = (
             [] if horizontal_lines is None else list(horizontal_lines)
         )
-        self.vertical_lines: List[_VerticalLine] = (
+        self.vertical_lines: list[_VerticalLine] = (
             [] if vertical_lines is None else list(vertical_lines)
         )
-        self.horizontal_padding: Dict[int, float] = (
+        self.horizontal_padding: dict[int, float] = (
             dict() if horizontal_padding is None else dict(horizontal_padding)
         )
-        self.vertical_padding: Dict[int, float] = (
+        self.vertical_padding: dict[int, float] = (
             dict() if vertical_padding is None else dict(vertical_padding)
         )
 
@@ -108,7 +95,7 @@ class TextDiagramDrawer:
     def __bool__(self):
         return any(self._value_equality_values_())
 
-    def write(self, x: int, y: int, text: str, transposed_text: Optional[str] = None):
+    def write(self, x: int, y: int, text: str, transposed_text: str | None = None) -> None:
         """Adds text to the given location.
 
         Args:
@@ -143,7 +130,7 @@ class TextDiagramDrawer:
 
     def grid_line(
         self, x1: int, y1: int, x2: int, y2: int, emphasize: bool = False, doubled: bool = False
-    ):
+    ) -> None:
         """Adds a vertical or horizontal line from (x1, y1) to (x2, y2).
 
         Horizontal line is selected on equality in the second coordinate and
@@ -215,7 +202,7 @@ class TextDiagramDrawer:
         """Change the padding after the given row."""
         self.vertical_padding[index] = padding
 
-    def _transform_coordinates(self, func: Callable[[float, float], Tuple[float, float]]) -> None:
+    def _transform_coordinates(self, func: Callable[[float, float], tuple[float, float]]) -> None:
         """Helper method to transformer either row or column coordinates."""
 
         def func_x(x: float) -> float:
@@ -225,7 +212,7 @@ class TextDiagramDrawer:
             return func(0, y)[1]
 
         self.entries = {
-            cast(Tuple[int, int], func(int(x), int(y))): v for (x, y), v in self.entries.items()
+            cast(tuple[int, int], func(int(x), int(y))): v for (x, y), v in self.entries.items()
         }
         self.vertical_lines = [
             _VerticalLine(func_x(x), func_y(y1), func_y(y2), emph, doubled)
@@ -245,7 +232,7 @@ class TextDiagramDrawer:
     def insert_empty_columns(self, x: int, amount: int = 1) -> None:
         """Insert a number of columns after the given column."""
 
-        def transform_columns(column: float, row: float) -> Tuple[float, float]:
+        def transform_columns(column: float, row: float) -> tuple[float, float]:
             return column + (amount if column >= x else 0), row
 
         self._transform_coordinates(transform_columns)
@@ -253,7 +240,7 @@ class TextDiagramDrawer:
     def insert_empty_rows(self, y: int, amount: int = 1) -> None:
         """Insert a number of rows after the given row."""
 
-        def transform_rows(column: float, row: float) -> Tuple[float, float]:
+        def transform_rows(column: float, row: float) -> tuple[float, float]:
             return column, row + (amount if row >= y else 0)
 
         self._transform_coordinates(transform_rows)
@@ -262,7 +249,7 @@ class TextDiagramDrawer:
         self,
         horizontal_spacing: int = 1,
         vertical_spacing: int = 1,
-        crossing_char: Optional[str] = None,
+        crossing_char: str | None = None,
         use_unicode_characters: bool = True,
     ) -> str:
         """Outputs text containing the diagram."""
@@ -326,7 +313,7 @@ class TextDiagramDrawer:
 
         return block_diagram.render()
 
-    def copy(self):
+    def copy(self) -> Self:
         return self.__class__(
             entries=self.entries,
             vertical_lines=self.vertical_lines,
@@ -357,7 +344,7 @@ class TextDiagramDrawer:
     def vstack(
         cls,
         diagrams: Sequence[cirq.TextDiagramDrawer],
-        padding_resolver: Optional[Callable[[Sequence[Optional[int]]], int]] = None,
+        padding_resolver: Callable[[Sequence[int | None]], int] | None = None,
     ):
         """Vertically stack text diagrams.
 
@@ -386,9 +373,7 @@ class TextDiagramDrawer:
             dy += diagram.height()
         for x in stacked.horizontal_padding:
             resolved_padding = padding_resolver(
-                tuple(
-                    cast(Optional[int], diagram.horizontal_padding.get(x)) for diagram in diagrams
-                )
+                tuple(cast(int | None, diagram.horizontal_padding.get(x)) for diagram in diagrams)
             )
             if resolved_padding is not None:
                 stacked.horizontal_padding[x] = resolved_padding
@@ -398,7 +383,7 @@ class TextDiagramDrawer:
     def hstack(
         cls,
         diagrams: Sequence[cirq.TextDiagramDrawer],
-        padding_resolver: Optional[Callable[[Sequence[Optional[int]]], int]] = None,
+        padding_resolver: Callable[[Sequence[int | None]], int] | None = None,
     ):
         """Horizontally stack text diagrams.
 
@@ -427,7 +412,7 @@ class TextDiagramDrawer:
             dx += diagram.width()
         for y in stacked.vertical_padding:
             resolved_padding = padding_resolver(
-                tuple(cast(Optional[int], diagram.vertical_padding.get(y)) for diagram in diagrams)
+                tuple(cast(int | None, diagram.vertical_padding.get(y)) for diagram in diagrams)
             )
             if resolved_padding is not None:
                 stacked.vertical_padding[y] = resolved_padding

cirq/circuits/text_diagram_drawer_test.py

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import annotations
+
 from unittest import mock
 
 import pytest
@@ -57,7 +59,7 @@ def assert_has_rendering(actual: TextDiagramDrawer, desired: str, **kwargs) -> N
     )
 
 
-def test_draw_entries_and_lines_with_options():
+def test_draw_entries_and_lines_with_options() -> None:
     d = TextDiagramDrawer()
     d.write(0, 0, '!')
     d.write(6, 2, 'span')
@@ -130,7 +132,7 @@ def test_draw_entries_and_lines_with_options():
     )
 
 
-def test_draw_entries_and_lines_with_emphasize():
+def test_draw_entries_and_lines_with_emphasize() -> None:
     d = TextDiagramDrawer()
     d.write(0, 0, '!')
     d.write(6, 2, 'span')
@@ -159,27 +161,27 @@ def test_draw_entries_and_lines_with_emphasize():
     )
 
 
-def test_line_detects_horizontal():
+def test_line_detects_horizontal() -> None:
     d = TextDiagramDrawer()
     with mock.patch.object(d, 'vertical_line') as vertical_line:
         d.grid_line(1, 2, 1, 5, True)
         vertical_line.assert_called_once_with(1, 2, 5, True, False)
 
 
-def test_line_detects_vertical():
+def test_line_detects_vertical() -> None:
     d = TextDiagramDrawer()
     with mock.patch.object(d, 'horizontal_line') as horizontal_line:
         d.grid_line(2, 1, 5, 1, True)
         horizontal_line.assert_called_once_with(1, 2, 5, True, False)
 
 
-def test_line_fails_when_not_aligned():
+def test_line_fails_when_not_aligned() -> None:
     d = TextDiagramDrawer()
     with pytest.raises(ValueError):
         d.grid_line(1, 2, 3, 4)
 
 
-def test_multiline_entries():
+def test_multiline_entries() -> None:
     d = TextDiagramDrawer()
     d.write(0, 0, 'hello\nthere')
     d.write(0, 1, 'next')
@@ -223,7 +225,7 @@ short     │ │         │
     )
 
 
-def test_drawer_copy():
+def test_drawer_copy() -> None:
     orig_entries = {(0, 0): _DiagramText('entry', '')}
     orig_vertical_lines = [_VerticalLine(1, 1, 3, True, False)]
     orig_horizontal_lines = [_HorizontalLine(0, 0, 3, False, False)]
@@ -236,9 +238,9 @@ def test_drawer_copy():
         'vertical_padding': orig_vertical_padding,
         'horizontal_padding': orig_horizontal_padding,
     }
-    orig_drawer = TextDiagramDrawer(**kwargs)
+    orig_drawer = TextDiagramDrawer(**kwargs)  # type: ignore[arg-type]
 
-    same_drawer = TextDiagramDrawer(**kwargs)
+    same_drawer = TextDiagramDrawer(**kwargs)  # type: ignore[arg-type]
     assert orig_drawer == same_drawer
 
     copy_drawer = orig_drawer.copy()
@@ -264,7 +266,7 @@ def test_drawer_copy():
     assert copy_drawer != orig_drawer
 
 
-def test_drawer_stack():
+def test_drawer_stack() -> None:
     d = TextDiagramDrawer()
     d.write(0, 0, 'A')
     d.write(1, 0, 'B')
@@ -334,7 +336,7 @@ AB D
     with pytest.raises(ValueError):
         TextDiagramDrawer.vstack((d, dd))
 
-    vstacked = TextDiagramDrawer.vstack((dd, d), padding_resolver=max)
+    vstacked = TextDiagramDrawer.vstack((dd, d), padding_resolver=max)  # type: ignore[arg-type]
     expected = """
 D
 
@@ -348,7 +350,7 @@ A  B
     """.strip()
     assert_has_rendering(vstacked, expected)
 
-    hstacked = TextDiagramDrawer.hstack((d, dd), padding_resolver=max)
+    hstacked = TextDiagramDrawer.hstack((d, dd), padding_resolver=max)  # type: ignore[arg-type]
     expected = """
 AB D
 
@@ -358,7 +360,7 @@ AB D
     """.strip()
     assert_has_rendering(hstacked, expected)
 
-    vstacked_min = TextDiagramDrawer.vstack((dd, d), padding_resolver=min)
+    vstacked_min = TextDiagramDrawer.vstack((dd, d), padding_resolver=min)  # type: ignore[arg-type]
     expected = """
 D
 
@@ -372,7 +374,7 @@ AB
     """.strip()
     assert_has_rendering(vstacked_min, expected)
 
-    hstacked_min = TextDiagramDrawer.hstack((d, dd), padding_resolver=min)
+    hstacked_min = TextDiagramDrawer.hstack((d, dd), padding_resolver=min)  # type: ignore[arg-type]
     expected = """
 AB D
 
@@ -381,7 +383,7 @@ AB D
     assert_has_rendering(hstacked_min, expected)
 
 
-def test_drawer_eq():
+def test_drawer_eq() -> None:
     assert TextDiagramDrawer().__eq__(23) == NotImplemented
 
     eq = ct.EqualsTester()
@@ -405,7 +407,7 @@ def test_drawer_eq():
     eq.add_equality_group(dd)
 
 
-def test_drawer_superimposed():
+def test_drawer_superimposed() -> None:
     empty_drawer = TextDiagramDrawer()
     assert not empty_drawer
     drawer_with_something = TextDiagramDrawer()
@@ -416,7 +418,7 @@ def test_drawer_superimposed():
     assert not empty_drawer
 
 
-def test_pick_charset():
+def test_pick_charset() -> None:
     assert pick_charset(use_unicode=False, emphasize=False, doubled=False) == ASCII_BOX_CHARS
     assert pick_charset(use_unicode=False, emphasize=False, doubled=True) == ASCII_BOX_CHARS
     assert pick_charset(use_unicode=False, emphasize=True, doubled=False) == ASCII_BOX_CHARS

cirq/conftest.py

@@ -14,18 +14,19 @@
 
 import inspect
 import os
+from collections.abc import Iterator
 
 import matplotlib.pyplot as plt
 import pytest
 
 
-def pytest_configure(config):
+def pytest_configure(config) -> None:
     # Use matplotlib agg backend which does not require a display.
     plt.switch_backend('agg')
     os.environ['CIRQ_TESTING'] = "true"
 
 
-def pytest_pyfunc_call(pyfuncitem):
+def pytest_pyfunc_call(pyfuncitem) -> None:
     if inspect.iscoroutinefunction(pyfuncitem._obj):
         raise ValueError(  # pragma: no cover
             f'{pyfuncitem._obj.__name__} is a bare async function. '
@@ -34,6 +35,6 @@ def pytest_pyfunc_call(pyfuncitem):
 
 
 @pytest.fixture
-def closefigures():
+def closefigures() -> Iterator[None]:
     yield
     plt.close('all')

cirq/contrib/__init__.py

@@ -18,9 +18,9 @@ Any contributions not ready for full production can be put in a subdirectory in
 this package.
 """
 
-from cirq.contrib import acquaintance
-from cirq.contrib import graph_device
-from cirq.contrib import quirk
+from cirq.contrib import acquaintance  # noqa: F401
+from cirq.contrib import graph_device  # noqa: F401
+from cirq.contrib import quirk  # noqa: F401
 from cirq.contrib.qcircuit import circuit_to_latex_using_qcircuit as circuit_to_latex_using_qcircuit
-from cirq.contrib import json
+from cirq.contrib import json  # noqa: F401
 from cirq.contrib.circuitdag import CircuitDag as CircuitDag, Unique as Unique

cirq/contrib/acquaintance/__init__.py

@@ -79,4 +79,4 @@ from cirq.contrib.acquaintance.topological_sort import (
     random_topological_sort as random_topological_sort,
 )
 
-from cirq.contrib.acquaintance import testing
+from cirq.contrib.acquaintance import testing  # noqa: F401

cirq/contrib/acquaintance/bipartite.py

@@ -16,7 +16,7 @@ from __future__ import annotations
 
 import enum
 import itertools
-from typing import Dict, Iterator, Sequence, Tuple, TYPE_CHECKING, Union
+from typing import Iterator, Sequence, TYPE_CHECKING
 
 from cirq import ops
 from cirq.contrib.acquaintance.gates import acquaint
@@ -61,10 +61,7 @@ class BipartiteSwapNetworkGate(PermutationGate):
     """
 
     def __init__(
-        self,
-        subgraph: Union[str, BipartiteGraphType],
-        part_size: int,
-        swap_gate: cirq.Gate = ops.SWAP,
+        self, subgraph: str | BipartiteGraphType, part_size: int, swap_gate: cirq.Gate = ops.SWAP
     ) -> None:
         super().__init__(2 * part_size, swap_gate)
         self.part_size = part_size
@@ -106,7 +103,7 @@ class BipartiteSwapNetworkGate(PermutationGate):
             return self.decompose_matching(qubits)
         raise NotImplementedError('No decomposition implemented for ' + str(self.subgraph))
 
-    def permutation(self) -> Dict[int, int]:
+    def permutation(self) -> dict[int, int]:
         if self.num_qubits() != 2 * self.part_size:
             raise ValueError('qubit_count != 2 * self.part_size')
         if self.subgraph == BipartiteGraphType.MATCHING:
@@ -124,7 +121,7 @@ class BipartiteSwapNetworkGate(PermutationGate):
             return dict(enumerate(range(2 * self.part_size)))
         raise NotImplementedError(str(self.subgraph) + 'not implemented')
 
-    def _circuit_diagram_info_(self, args: cirq.CircuitDiagramInfoArgs) -> Tuple[str, ...]:
+    def _circuit_diagram_info_(self, args: cirq.CircuitDiagramInfoArgs) -> tuple[str, ...]:
         qubit_count = 2 * self.part_size
         if args.known_qubit_count not in (None, qubit_count):
             raise ValueError('args.known_qubit_count not in (None, 2 * self.part_size)')
@@ -149,7 +146,7 @@ class BipartiteSwapNetworkGate(PermutationGate):
         return wire_symbols
 
     def __repr__(self) -> str:
-        args: Tuple[str, ...] = (repr(self.subgraph), repr(self.part_size))
+        args: tuple[str, ...] = (repr(self.subgraph), repr(self.part_size))
         if self.swap_gate != ops.SWAP:
             args += (repr(self.swap_gate),)
         args_str = ', '.join(args)