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

cirq/__init__.py

@@ -14,6 +14,8 @@
 
 """Cirq is a framework for creating, editing, and invoking quantum circuits."""
 
+# ruff: noqa: F401
+
 from cirq import _import
 
 from cirq._compat import __cirq_debug__ as __cirq_debug__, with_debug as with_debug
@@ -121,20 +123,19 @@ from cirq.interop import (
 )
 
 from cirq.linalg import (
-    # pylint: disable=line-too-long
     all_near_zero as all_near_zero,
     all_near_zero_mod as all_near_zero_mod,
     allclose_up_to_global_phase as allclose_up_to_global_phase,
     apply_matrix_to_slices as apply_matrix_to_slices,
     axis_angle as axis_angle,
     AxisAngleDecomposition as AxisAngleDecomposition,
-    bidiagonalize_real_matrix_pair_with_symmetric_products as bidiagonalize_real_matrix_pair_with_symmetric_products,
-    bidiagonalize_unitary_with_special_orthogonals as bidiagonalize_unitary_with_special_orthogonals,
+    bidiagonalize_real_matrix_pair_with_symmetric_products as bidiagonalize_real_matrix_pair_with_symmetric_products,  # noqa: E501
+    bidiagonalize_unitary_with_special_orthogonals as bidiagonalize_unitary_with_special_orthogonals,  # noqa: E501
     block_diag as block_diag,
     CONTROL_TAG as CONTROL_TAG,
     deconstruct_single_qubit_matrix_into_angles as deconstruct_single_qubit_matrix_into_angles,
     density_matrix_kronecker_product as density_matrix_kronecker_product,
-    diagonalize_real_symmetric_and_sorted_diagonal_matrices as diagonalize_real_symmetric_and_sorted_diagonal_matrices,
+    diagonalize_real_symmetric_and_sorted_diagonal_matrices as diagonalize_real_symmetric_and_sorted_diagonal_matrices,  # noqa: E501
     diagonalize_real_symmetric_matrix as diagonalize_real_symmetric_matrix,
     dot as dot,
     expand_matrix_in_orthogonal_basis as expand_matrix_in_orthogonal_basis,
@@ -163,7 +164,7 @@ from cirq.linalg import (
     partial_trace as partial_trace,
     partial_trace_of_state_vector_as_mixture as partial_trace_of_state_vector_as_mixture,
     PAULI_BASIS as PAULI_BASIS,
-    scatter_plot_normalized_kak_interaction_coefficients as scatter_plot_normalized_kak_interaction_coefficients,
+    scatter_plot_normalized_kak_interaction_coefficients as scatter_plot_normalized_kak_interaction_coefficients,  # noqa: E501
     pow_pauli_combination as pow_pauli_combination,
     reflection_matrix_pow as reflection_matrix_pow,
     slice_for_qubits_equal_to as slice_for_qubits_equal_to,
@@ -205,7 +206,9 @@ from cirq.ops import (
     CSwapGate as CSwapGate,
     CX as CX,
     CXPowGate as CXPowGate,
+    CXSWAP as CXSWAP,
     CZ as CZ,
+    CZSWAP as CZSWAP,
     CZPowGate as CZPowGate,
     DensePauliString as DensePauliString,
     depolarize as depolarize,
@@ -340,20 +343,19 @@ from cirq.ops import (
 
 
 from cirq.transformers import (
-    # pylint: disable=line-too-long
     AbstractInitialMapper as AbstractInitialMapper,
     add_dynamical_decoupling as add_dynamical_decoupling,
     align_left as align_left,
     align_right as align_right,
     CompilationTargetGateset as CompilationTargetGateset,
     CZTargetGateset as CZTargetGateset,
-    compute_cphase_exponents_for_fsim_decomposition as compute_cphase_exponents_for_fsim_decomposition,
+    compute_cphase_exponents_for_fsim_decomposition as compute_cphase_exponents_for_fsim_decomposition,  # noqa: E501
     create_transformer_with_kwargs as create_transformer_with_kwargs,
     decompose_clifford_tableau_to_operations as decompose_clifford_tableau_to_operations,
     decompose_cphase_into_two_fsim as decompose_cphase_into_two_fsim,
     decompose_multi_controlled_x as decompose_multi_controlled_x,
     decompose_multi_controlled_rotation as decompose_multi_controlled_rotation,
-    decompose_two_qubit_interaction_into_four_fsim_gates as decompose_two_qubit_interaction_into_four_fsim_gates,
+    decompose_two_qubit_interaction_into_four_fsim_gates as decompose_two_qubit_interaction_into_four_fsim_gates,  # noqa: E501
     defer_measurements as defer_measurements,
     dephase_measurements as dephase_measurements,
     drop_empty_moments as drop_empty_moments,
@@ -363,6 +365,7 @@ from cirq.transformers import (
     eject_z as eject_z,
     expand_composite as expand_composite,
     HardCodedInitialMapper as HardCodedInitialMapper,
+    index_tags as index_tags,
     is_negligible_turn as is_negligible_turn,
     LineInitialMapper as LineInitialMapper,
     MappingManager as MappingManager,
@@ -377,6 +380,7 @@ from cirq.transformers import (
     merge_operations_to_circuit_op as merge_operations_to_circuit_op,
     merge_single_qubit_gates_to_phased_x_and_z as merge_single_qubit_gates_to_phased_x_and_z,
     merge_single_qubit_gates_to_phxz as merge_single_qubit_gates_to_phxz,
+    merge_single_qubit_gates_to_phxz_symbolized as merge_single_qubit_gates_to_phxz_symbolized,
     merge_single_qubit_moments_to_phxz as merge_single_qubit_moments_to_phxz,
     optimize_for_target_gateset as optimize_for_target_gateset,
     parameterized_2q_op_to_sqrt_iswap_operations as parameterized_2q_op_to_sqrt_iswap_operations,
@@ -385,6 +389,7 @@ from cirq.transformers import (
     prepare_two_qubit_state_using_sqrt_iswap as prepare_two_qubit_state_using_sqrt_iswap,
     quantum_shannon_decomposition as quantum_shannon_decomposition,
     RouteCQC as RouteCQC,
+    remove_tags as remove_tags,
     routed_circuit_with_mapping as routed_circuit_with_mapping,
     SqrtIswapTargetGateset as SqrtIswapTargetGateset,
     single_qubit_matrix_to_gates as single_qubit_matrix_to_gates,
@@ -393,6 +398,7 @@ from cirq.transformers import (
     single_qubit_matrix_to_phxz as single_qubit_matrix_to_phxz,
     single_qubit_op_to_framed_phase_form as single_qubit_op_to_framed_phase_form,
     stratified_circuit as stratified_circuit,
+    symbolize_single_qubit_gates_by_indexed_tags as symbolize_single_qubit_gates_by_indexed_tags,
     synchronize_terminal_measurements as synchronize_terminal_measurements,
     TRANSFORMER as TRANSFORMER,
     TransformerContext as TransformerContext,
@@ -401,7 +407,7 @@ from cirq.transformers import (
     transformer as transformer,
     two_qubit_matrix_to_cz_isometry as two_qubit_matrix_to_cz_isometry,
     two_qubit_matrix_to_cz_operations as two_qubit_matrix_to_cz_operations,
-    two_qubit_matrix_to_diagonal_and_cz_operations as two_qubit_matrix_to_diagonal_and_cz_operations,
+    two_qubit_matrix_to_diagonal_and_cz_operations as two_qubit_matrix_to_diagonal_and_cz_operations,  # noqa: E501
     two_qubit_matrix_to_ion_operations as two_qubit_matrix_to_ion_operations,
     two_qubit_matrix_to_sqrt_iswap_operations as two_qubit_matrix_to_sqrt_iswap_operations,
     two_qubit_gate_product_tabulation as two_qubit_gate_product_tabulation,
@@ -565,7 +571,6 @@ from cirq.value import (
     ProductState as ProductState,
 )
 
-# pylint: disable=redefined-builtin
 from cirq.protocols import (
     act_on as act_on,
     apply_channel as apply_channel,
@@ -687,14 +692,10 @@ from cirq.work import (
     ZerosSampler as ZerosSampler,
 )
 
-# pylint: enable=redefined-builtin
 
 # Unflattened sub-modules.
 
-from cirq import testing
-
 # Registers cirq-core's public classes for JSON serialization.
-# pylint: disable=wrong-import-position
 from cirq.protocols.json_serialization import _register_resolver
 from cirq.json_resolver_cache import _class_resolver_dictionary
 
@@ -703,6 +704,4 @@ _register_resolver(_class_resolver_dictionary)
 
 # contrib's json resolver cache depends on cirq.DEFAULT_RESOLVER
 
-from cirq import contrib
-
-# pylint: enable=wrong-import-position
+from cirq import contrib  # noqa: E402

cirq/_compat.py

@@ -13,6 +13,9 @@
 # limitations under the License.
 
 """Workarounds for compatibility issues between versions and libraries."""
+
+from __future__ import annotations
+
 import contextlib
 import contextvars
 import dataclasses
@@ -25,7 +28,7 @@ import sys
 import traceback
 import warnings
 from types import ModuleType
-from typing import Any, Callable, Dict, Iterator, Optional, overload, Set, Tuple, Type, TypeVar
+from typing import Any, Callable, Iterator, overload, TypeVar
 
 import numpy as np
 import pandas as pd
@@ -76,7 +79,7 @@ def cached_method(__func: TFunc) -> TFunc: ...
 def cached_method(*, maxsize: int = 128) -> Callable[[TFunc], TFunc]: ...
 
 
-def cached_method(method: Optional[TFunc] = None, *, maxsize: int = 128) -> Any:
+def cached_method(method: TFunc | None = None, *, maxsize: int = 128) -> Any:
     """Decorator that adds a per-instance LRU cache for a method.
 
     Can be applied with or without parameters to customize the underlying cache:
@@ -192,7 +195,7 @@ def proper_repr(value: Any) -> str:
             f'\n)'
         )
 
-    if isinstance(value, Dict):
+    if isinstance(value, dict):
         return '{' + ','.join(f"{proper_repr(k)}: {proper_repr(v)}" for k, v in value.items()) + '}'
 
     if hasattr(value, "__qualname__"):
@@ -285,7 +288,7 @@ def _validate_deadline(deadline: str):
 
 
 def deprecated(
-    *, deadline: str, fix: str, name: Optional[str] = None
+    *, deadline: str, fix: str, name: str | None = None
 ) -> Callable[[Callable], Callable]:
     """Marks a function as deprecated.
 
@@ -326,9 +329,7 @@ def deprecated(
     return decorator
 
 
-def deprecated_class(
-    *, deadline: str, fix: str, name: Optional[str] = None
-) -> Callable[[Type], Type]:
+def deprecated_class(*, deadline: str, fix: str, name: str | None = None) -> Callable[[type], type]:
     """Marks a class as deprecated.
 
     Args:
@@ -345,7 +346,7 @@ def deprecated_class(
 
     _validate_deadline(deadline)
 
-    def decorator(clazz: Type) -> Type:
+    def decorator(clazz: type) -> type:
         clazz_new = clazz.__new__
 
         def patched_new(cls, *args, **kwargs):
@@ -375,12 +376,12 @@ def deprecated_parameter(
     *,
     deadline: str,
     fix: str,
-    func_name: Optional[str] = None,
+    func_name: str | None = None,
     parameter_desc: str,
-    match: Callable[[Tuple[Any, ...], Dict[str, Any]], bool],
-    rewrite: Optional[
-        Callable[[Tuple[Any, ...], Dict[str, Any]], Tuple[Tuple[Any, ...], Dict[str, Any]]]
-    ] = None,
+    match: Callable[[tuple[Any, ...], dict[str, Any]], bool],
+    rewrite: (
+        Callable[[tuple[Any, ...], dict[str, Any]], tuple[tuple[Any, ...], dict[str, Any]]] | None
+    ) = None,
 ) -> Callable[[Callable], Callable]:
     """Marks a function parameter as deprecated.
 
@@ -444,7 +445,7 @@ def deprecated_parameter(
     return decorator
 
 
-def deprecate_attributes(module_name: str, deprecated_attributes: Dict[str, Tuple[str, str]]):
+def deprecate_attributes(module_name: str, deprecated_attributes: dict[str, tuple[str, str]]):
     """Replace module with a wrapper that gives warnings for deprecated attributes.
 
     Args:
@@ -468,7 +469,7 @@ def deprecate_attributes(module_name: str, deprecated_attributes: Dict[str, Tupl
         __dict__ = module.__dict__
 
         # Workaround for: https://github.com/python/mypy/issues/8083
-        __spec__ = _make_proxy_spec_property(module)  # type: ignore
+        __spec__ = _make_proxy_spec_property(module)
 
         def __getattr__(self, name):
             if name in deprecated_attributes:
@@ -534,7 +535,7 @@ class DeprecatedModuleLoader(importlib.abc.Loader):
                 sys.modules[self.old_module_name] = sys.modules[self.new_module_name]
                 return sys.modules[self.old_module_name]
             method(self.new_module_name)
-            # https://docs.python.org/3.5/library/importlib.html#importlib.abc.Loader.load_module
+            # https://docs.python.org/3.11/library/importlib.html#importlib.abc.Loader.load_module
             assert self.new_module_name in sys.modules, (
                 f"Wrapped loader {self.loader} was "
                 f"expected to insert "
@@ -583,7 +584,7 @@ def _is_internal(filename: str) -> bool:
     return 'importlib' in filename and '_bootstrap' in filename
 
 
-_warned: Set[str] = set()
+_warned: set[str] = set()
 
 
 def _called_from_test() -> bool:
@@ -632,7 +633,7 @@ class DeprecatedModuleFinder(importlib.abc.MetaPathFinder):
         new_module_name: str,
         old_module_name: str,
         deadline: str,
-        broken_module_exception: Optional[BaseException],
+        broken_module_exception: BaseException | None,
     ):
         """An aliasing module finder that uses existing module finders to find a python
         module spec and intercept the execution of matching modules.
@@ -760,7 +761,7 @@ def _setup_deprecated_submodule_attribute(
     old_parent: str,
     old_child: str,
     deadline: str,
-    new_module: Optional[ModuleType],
+    new_module: ModuleType | None,
 ):
     parent_module = sys.modules[old_parent]
     setattr(parent_module, old_child, new_module)
@@ -769,7 +770,7 @@ def _setup_deprecated_submodule_attribute(
         __dict__ = parent_module.__dict__
 
         # Workaround for: https://github.com/python/mypy/issues/8083
-        __spec__ = _make_proxy_spec_property(parent_module)  # type: ignore
+        __spec__ = _make_proxy_spec_property(parent_module)
 
         def __getattr__(self, name):
             if name == old_child:

cirq/_compat_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 collections
 import dataclasses
 import importlib.metadata
@@ -24,7 +27,7 @@ import types
 import warnings
 from importlib.machinery import ModuleSpec
 from types import ModuleType
-from typing import Any, Callable, Dict, Optional, Tuple
+from typing import Any, Callable
 from unittest import mock
 
 import duet
@@ -199,13 +202,11 @@ def test_deprecated():
         old_func(1, 2)
 
     with pytest.raises(AssertionError, match='deadline should match vX.Y'):
-        # pylint: disable=unused-variable
+
         @deprecated(deadline='invalid', fix='Roll some dice.')
         def badly_deprecated_func(*args, **kwargs):  # pragma: no cover
             return new_func(*args, **kwargs)
 
-        # pylint: enable=unused-variable
-
 
 def test_deprecated_parameter():
     @deprecated_parameter(
@@ -231,20 +232,16 @@ def test_deprecated_parameter():
         'Double it yourself.',
         deadline='v1.2',
     ):
-        # pylint: disable=unexpected-keyword-arg
         # pylint: disable=no-value-for-parameter
         assert f(double_count=1) == 2
         # pylint: enable=no-value-for-parameter
-        # pylint: enable=unexpected-keyword-arg
 
     with pytest.raises(
         ValueError, match='During testing using Cirq deprecated functionality is not allowed'
     ):
-        # pylint: disable=unexpected-keyword-arg
         # pylint: disable=no-value-for-parameter
         f(double_count=1)
         # pylint: enable=no-value-for-parameter
-        # pylint: enable=unexpected-keyword-arg
 
     with pytest.raises(AssertionError, match='deadline should match vX.Y'):
 
@@ -256,12 +253,9 @@ def test_deprecated_parameter():
             match=lambda args, kwargs: 'double_count' in kwargs,
             rewrite=lambda args, kwargs: (args, {'new_count': kwargs['double_count'] * 2}),
         )
-        # pylint: disable=unused-variable
         def f_with_badly_deprecated_param(new_count):  # pragma: no cover
             return new_count
 
-        # pylint: enable=unused-variable
-
 
 @duet.sync
 async def test_deprecated_parameter_async_function():
@@ -290,11 +284,9 @@ async def test_deprecated_parameter_async_function():
         'Double it yourself.',
         deadline='v1.2',
     ):
-        # pylint: disable=unexpected-keyword-arg
         # pylint: disable=no-value-for-parameter
         assert await f(double_count=1) == 2
         # pylint: enable=no-value-for-parameter
-        # pylint: enable=unexpected-keyword-arg
 
 
 def test_wrap_module():
@@ -402,13 +394,11 @@ def test_deprecated_class():
         OldClass('1')
 
     with pytest.raises(AssertionError, match='deadline should match vX.Y'):
-        # pylint: disable=unused-variable
+
         @deprecated_class(deadline='invalid', fix='theFix', name='foo')
         class BadlyDeprecatedClass(NewClass):  # pragma: no cover
             ...
 
-        # pylint: enable=unused-variable
-
 
 def _from_parent_import_deprecated():
     from cirq.testing._compat_test_data import fake_a
@@ -574,8 +564,7 @@ def _import_top_level_deprecated():
 def _repeated_import_path():
     """to ensure that the highly unlikely repeated subpath import doesn't interfere"""
 
-    # pylint: disable=line-too-long
-    from cirq.testing._compat_test_data.repeated_child.cirq.testing._compat_test_data.repeated_child import (  # type: ignore
+    from cirq.testing._compat_test_data.repeated_child.cirq.testing._compat_test_data.repeated_child import (  # type: ignore  # noqa: E501
         child,
     )
 
@@ -584,7 +573,6 @@ def _repeated_import_path():
 
 def _type_repr_in_deprecated_module():
     # initialize the DeprecatedModuleFinders
-    # pylint: disable=unused-import
     import cirq.testing._compat_test_data.fake_a as mod_a
 
     expected_repr = "<class 'cirq.testing._compat_test_data.module_a.types.SampleType'>"
@@ -635,7 +623,7 @@ _repeated_child_deprecation_msg = [
 ] + _deprecation_origin
 
 
-def _trace_unhandled_exceptions(*args, queue: 'multiprocessing.Queue', func: Callable):
+def _trace_unhandled_exceptions(*args, queue: multiprocessing.Queue, func: Callable):
     try:
         func(*args)
         queue.put(None)
@@ -760,9 +748,6 @@ def test_metadata_search_path():
 
 def _test_metadata_search_path_inner():  # pragma: no cover
     # initialize the DeprecatedModuleFinders
-    # pylint: disable=unused-import
-    import cirq.testing._compat_test_data.module_a
-
     assert importlib.metadata.metadata('numpy')
 
 
@@ -803,7 +788,6 @@ def test_type_repr_in_new_module():
 
 def _test_type_repr_in_new_module_inner():
     # initialize the DeprecatedModuleFinders
-    # pylint: disable=unused-import
     import cirq.testing._compat_test_data.module_a as mod_a
 
     expected_repr = "<class 'cirq.testing._compat_test_data.module_a.types.SampleType'>"
@@ -825,8 +809,7 @@ def _test_broken_module_1_inner():
     with pytest.raises(
         DeprecatedModuleImportError, match="missing_module cannot be imported. The typical reasons"
     ):
-        # pylint: disable=unused-import
-        import cirq.testing._compat_test_data.broken_ref as br  # type: ignore
+        import cirq.testing._compat_test_data.broken_ref as br  # type: ignore # noqa: F401
 
 
 def _test_broken_module_2_inner():
@@ -873,14 +856,11 @@ def test_new_module_is_top_level():
 
 def _test_new_module_is_top_level_inner():
     # sets up the DeprecationFinders
-    # pylint: disable=unused-import
     import time
 
     # imports a top level module that was also deprecated
     from freezegun import api
 
-    import cirq.testing._compat_test_data
-
     assert api.real_time == time.time
 
 
@@ -922,7 +902,7 @@ def test_loader_create_module():
     fake_mod = ModuleType('hello')
 
     class CreateModuleLoader(importlib.abc.Loader):
-        def create_module(self, spec: ModuleSpec) -> Optional[ModuleType]:
+        def create_module(self, spec: ModuleSpec) -> ModuleType | None:
             return fake_mod
 
     assert (
@@ -1014,16 +994,16 @@ def test_block_overlapping_deprecation():
 
 class Bar:
     def __init__(self) -> None:
-        self.foo_calls: Dict[int, int] = collections.Counter()
-        self.bar_calls: Dict[int, int] = collections.Counter()
+        self.foo_calls: dict[int, int] = collections.Counter()
+        self.bar_calls: dict[int, int] = collections.Counter()
 
     @cached_method
-    def foo(self, n: int) -> Tuple[int, int]:
+    def foo(self, n: int) -> tuple[int, int]:
         self.foo_calls[n] += 1
         return (id(self), n)
 
     @cached_method(maxsize=1)
-    def bar(self, n: int) -> Tuple[int, int]:
+    def bar(self, n: int) -> tuple[int, int]:
         self.bar_calls[n] += 1
         return (id(self), 2 * n)
 

cirq/_doc.py

@@ -13,9 +13,11 @@
 # limitations under the License.
 """Workaround for associating docstrings with public constants."""
 
-from typing import Any, Dict
+from __future__ import annotations
 
-RECORDED_CONST_DOCS: Dict[int, str] = {}
+from typing import Any
+
+RECORDED_CONST_DOCS: dict[int, str] = {}
 
 
 def document(value: Any, doc_string: str = ''):

cirq/_import.py

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import annotations
+
 import importlib
 import sys
 from contextlib import contextmanager
@@ -19,7 +21,7 @@ from importlib import abc
 from importlib.abc import Loader
 from importlib.machinery import ModuleSpec
 from types import ModuleType
-from typing import Any, Callable, cast, List, Optional
+from typing import Any, Callable, cast
 
 
 class InstrumentedFinder(abc.MetaPathFinder):
@@ -29,7 +31,7 @@ class InstrumentedFinder(abc.MetaPathFinder):
         self,
         finder: Any,
         module_name: str,
-        wrap_module: Callable[[ModuleType], Optional[ModuleType]],
+        wrap_module: Callable[[ModuleType], ModuleType | None],
         after_exec: Callable[[ModuleType], None],
     ):
         """A module finder that uses an existing module finder to find a python
@@ -54,7 +56,7 @@ class InstrumentedFinder(abc.MetaPathFinder):
 
         self.finder = finder
         self.module_name = module_name
-        self.match_components: List[str] = []
+        self.match_components: list[str] = []
         if self.module_name:
             self.match_components = self.module_name.split('.')
         self.wrap_module = wrap_module
@@ -80,7 +82,7 @@ class InstrumentedLoader(abc.Loader):
     def __init__(
         self,
         loader: Any,
-        wrap_module: Callable[[ModuleType], Optional[ModuleType]],
+        wrap_module: Callable[[ModuleType], ModuleType | None],
         after_exec: Callable[[ModuleType], None],
     ):
         """A module loader that uses an existing module loader and intercepts
@@ -119,7 +121,7 @@ class InstrumentedLoader(abc.Loader):
 @contextmanager
 def wrap_module_executions(
     module_name: str,
-    wrap_func: Callable[[ModuleType], Optional[ModuleType]],
+    wrap_func: Callable[[ModuleType], ModuleType | None],
     after_exec: Callable[[ModuleType], None] = lambda m: None,
     assert_meta_path_unchanged: bool = True,
 ):
@@ -155,7 +157,7 @@ def delay_import(module_name: str):
     delay = True
     execute_list = []
 
-    def wrap_func(module: ModuleType) -> Optional[ModuleType]:
+    def wrap_func(module: ModuleType) -> ModuleType | None:
         if delay:
             execute_list.append(module)
             return None  # Don't allow the module to be executed yet

cirq/_import_test.py

@@ -12,12 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+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

@@ -13,19 +13,19 @@
 # limitations under the License.
 
 """Define version number here, read it from setup.py automatically,
-and warn users that the latest version of cirq uses python 3.10+"""
+and warn users that the latest version of Cirq uses Python 3.11+"""
 
 import sys
 
-if sys.version_info < (3, 10, 0):  # pragma: no cover
+if sys.version_info < (3, 11, 0):  # pragma: no cover
     raise SystemError(
-        "You installed the latest version of cirq but aren't on python 3.10+.\n"
+        "You installed the latest version of Cirq but aren't on Python 3.11+.\n"
         'To fix this error, you need to either:\n'
         '\n'
-        'A) Update to python 3.10 or later.\n'
+        'A) Update to Python 3.11 or later.\n'
         '- OR -\n'
         'B) Explicitly install an older deprecated-but-compatible version '
-        'of cirq (e.g. "python -m pip install cirq==1.1.*")'
+        'of Cirq (e.g. "python -m pip install cirq==1.5.0")'
     )
 
-__version__ = "1.5.0.dev20250409222543"
+__version__ = "1.6.0"

cirq/_version_test.py

@@ -2,5 +2,5 @@
 import cirq
 
 
-def test_version():
-    assert cirq.__version__ == "1.5.0.dev20250409222543"
+def test_version() -> None:
+    assert cirq.__version__ == "1.6.0"

cirq/circuits/_block_diagram_drawer.py

@@ -12,8 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import annotations
+
 import collections
-from typing import Dict, List, Optional, Tuple
 
 from cirq.circuits._box_drawing_character_data import box_draw_character, BoxDrawCharacterSet
 
@@ -55,7 +56,7 @@ class Block:
         left: bool = False,
         right: bool = False,
         bottom: bool = False,
-        crossing_char: Optional[str] = None,
+        crossing_char: str | None = None,
     ):
         """Draws lines in the box using the given character set.
 
@@ -105,7 +106,7 @@ class Block:
 
         self._prev_curve_grid_chars = grid_characters
 
-    def render(self, width: int, height: int) -> List[str]:
+    def render(self, width: int, height: int) -> list[str]:
         """Returns a list of text lines representing the block's contents.
 
         Args:
@@ -157,9 +158,9 @@ class BlockDiagramDrawer:
     """Aligns text and curve data placed onto an abstract 2d grid of blocks."""
 
     def __init__(self) -> None:
-        self._blocks: Dict[Tuple[int, int], Block] = collections.defaultdict(Block)
-        self._min_widths: Dict[int, int] = collections.defaultdict(lambda: 0)
-        self._min_heights: Dict[int, int] = collections.defaultdict(lambda: 0)
+        self._blocks: dict[tuple[int, int], Block] = collections.defaultdict(Block)
+        self._min_widths: dict[int, int] = collections.defaultdict(lambda: 0)
+        self._min_heights: dict[int, int] = collections.defaultdict(lambda: 0)
 
         # Populate the origin.
         _ = self._blocks[(0, 0)]
@@ -187,8 +188,8 @@ class BlockDiagramDrawer:
     def render(
         self,
         *,
-        block_span_x: Optional[int] = None,
-        block_span_y: Optional[int] = None,
+        block_span_x: int | None = None,
+        block_span_y: int | None = None,
         min_block_width: int = 0,
         min_block_height: int = 0,
     ) -> str:
@@ -250,10 +251,10 @@ class BlockDiagramDrawer:
         }
 
         # Paste together all of the rows of rendered block content.
-        out_lines: List[str] = []
+        out_lines: list[str] = []
         for y in range(block_span_y):
             for by in range(heights[y]):
-                out_line_chunks: List[str] = []
+                out_line_chunks: list[str] = []
                 for x in range(block_span_x):
                     out_line_chunks.extend(block_renders[x, y][by])
                 out_lines.append(''.join(out_line_chunks).rstrip())