cirq-core 1.6.0.dev20250520054601__py3-none-any.whl → 1.6.0.dev20250520181654__py3-none-any.whl

cirq/_compat.py

@@ -28,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
@@ -79,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:
@@ -195,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__"):
@@ -288,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.
 
@@ -329,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:
@@ -348,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):
@@ -378,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.
 
@@ -447,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:
@@ -586,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:
@@ -635,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.
@@ -763,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)

cirq/_compat_test.py

@@ -27,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
@@ -764,7 +764,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')
 
@@ -882,8 +881,6 @@ def _test_new_module_is_top_level_inner():
     # 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
 
 
@@ -925,7 +922,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 (
@@ -1017,16 +1014,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

@@ -15,9 +15,9 @@
 
 from __future__ import annotations
 
-from typing import Any, Dict
+from typing import Any
 
-RECORDED_CONST_DOCS: Dict[int, str] = {}
+RECORDED_CONST_DOCS: dict[int, str] = {}
 
 
 def document(value: Any, doc_string: str = ''):

cirq/_import.py

@@ -21,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):
@@ -31,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
@@ -56,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
@@ -82,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
@@ -121,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,
 ):
@@ -157,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/_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.dev20250520054601"
+__version__ = "1.6.0.dev20250520181654"

cirq/_version_test.py

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

cirq/circuits/_block_diagram_drawer.py

@@ -15,7 +15,6 @@
 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
 
@@ -57,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.
 
@@ -107,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:
@@ -159,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)]
@@ -189,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:
@@ -252,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())

cirq/circuits/_box_drawing_character_data.py

@@ -16,7 +16,7 @@
 
 from __future__ import annotations
 
-from typing import List, NamedTuple, Optional
+from typing import NamedTuple
 
 _BoxDrawCharacterSet = NamedTuple(
     '_BoxDrawCharacterSet',
@@ -43,7 +43,7 @@ _BoxDrawCharacterSet = NamedTuple(
 class BoxDrawCharacterSet(_BoxDrawCharacterSet):
     def char(
         self, top: bool = False, bottom: bool = False, left: bool = False, right: bool = False
-    ) -> Optional[str]:
+    ) -> str | None:
         parts = []
         if top:
             parts.append('top')
@@ -118,10 +118,8 @@ _MixedBoxDrawCharacterSet = NamedTuple(
 
 
 class MixedBoxDrawCharacterSet(_MixedBoxDrawCharacterSet):
-    def char(
-        self, *, top: int = 0, bottom: int = 0, left: int = 0, right: int = 0
-    ) -> Optional[str]:
-        def parts_with(val: int) -> List[str]:
+    def char(self, *, top: int = 0, bottom: int = 0, left: int = 0, right: int = 0) -> str | None:
+        def parts_with(val: int) -> list[str]:
             parts = []
             if top == val:
                 parts.append('top')
@@ -340,14 +338,14 @@ NORMAL_THEN_DOUBLED_MIXED_BOX_CHARS = MixedBoxDrawCharacterSet(
 
 
 def box_draw_character(
-    first: Optional[BoxDrawCharacterSet],
+    first: BoxDrawCharacterSet | None,
     second: BoxDrawCharacterSet,
     *,
     top: int = 0,
     bottom: int = 0,
     left: int = 0,
     right: int = 0,
-) -> Optional[str]:
+) -> str | None:
     """Finds a box drawing character based on its connectivity.
 
     For example:

cirq/circuits/_bucket_priority_queue.py

@@ -14,7 +14,7 @@
 
 from __future__ import annotations
 
-from typing import Any, Generic, Iterable, Iterator, List, Optional, Set, Tuple, TypeVar
+from typing import Any, Generic, Iterable, Iterator, TypeVar
 
 TItem = TypeVar('TItem')
 
@@ -39,7 +39,7 @@ class BucketPriorityQueue(Generic[TItem]):
     """
 
     def __init__(
-        self, entries: Iterable[Tuple[int, TItem]] = (), *, drop_duplicate_entries: bool = False
+        self, entries: Iterable[tuple[int, TItem]] = (), *, drop_duplicate_entries: bool = False
     ):
         """Initializes a new priority queue.
 
@@ -50,10 +50,10 @@ class BucketPriorityQueue(Generic[TItem]):
                 in the priority queue. Note that duplicates of an item may still
                 be enqueued, as long as they have different priorities.
         """
-        self._buckets: List[List[TItem]] = []
+        self._buckets: list[list[TItem]] = []
         self._offset = 0
         self._len = 0
-        self._drop_set: Optional[Set[Tuple[int, TItem]]] = set() if drop_duplicate_entries else None
+        self._drop_set: set[tuple[int, TItem]] | None = set() if drop_duplicate_entries else None
 
         for p, e in entries:
             self.enqueue(p, e)
@@ -70,7 +70,7 @@ class BucketPriorityQueue(Generic[TItem]):
         """Returns how many items are in the priority queue."""
         return self._len
 
-    def __iter__(self) -> Iterator[Tuple[int, TItem]]:
+    def __iter__(self) -> Iterator[tuple[int, TItem]]:
         """Iterates the (priority, item) entries in the queue."""
         for i, bucket in enumerate(self._buckets):
             for item in bucket:
@@ -122,7 +122,7 @@ class BucketPriorityQueue(Generic[TItem]):
         self._len += 1
         return True
 
-    def dequeue(self) -> Tuple[int, TItem]:
+    def dequeue(self) -> tuple[int, TItem]:
         """Removes and returns an item from the priority queue.
 
         Returns:
@@ -180,6 +180,6 @@ class BucketPriorityQueue(Generic[TItem]):
         return not self == other
 
 
-def _indent(lines: List[Any]) -> str:
+def _indent(lines: list[Any]) -> str:
     paragraph = ''.join('\n' + str(line) for line in lines)
     return paragraph.replace('\n', '\n    ')