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

cirq/circuits/_block_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
+
 import itertools
 
 import pytest
@@ -54,7 +56,7 @@ def _curve_pieces_diagram(chars: BoxDrawCharacterSet) -> BlockDiagramDrawer:
     return d
 
 
-def test_block_curve():
+def test_block_curve() -> None:
     d = _curve_pieces_diagram(NORMAL_BOX_CHARS)
     actual = d.render(min_block_width=5, min_block_height=5)
     expected = """
@@ -177,7 +179,7 @@ def test_block_curve():
     _assert_same_diagram(actual, expected)
 
 
-def test_mixed_block_curve():
+def test_mixed_block_curve() -> None:
     diagram = BlockDiagramDrawer()
     for a, b, c, d in itertools.product(range(3), repeat=4):
         x = (a * 3 + b) * 2
@@ -244,7 +246,7 @@ def test_mixed_block_curve():
     _assert_same_diagram(actual, expected)
 
 
-def test_lines_meet_content():
+def test_lines_meet_content() -> None:
     d = BlockDiagramDrawer()
     b = d.mutable_block(0, 0)
     b.content = 'long text\nwith multiple lines'
@@ -409,7 +411,7 @@ with multiple lines
     )
 
 
-def test_content_stretches_other_blocks():
+def test_content_stretches_other_blocks() -> None:
     d = BlockDiagramDrawer()
     d.mutable_block(0, 0).horizontal_alignment = 0.5
     d.mutable_block(1, 0).horizontal_alignment = 0.5
@@ -430,7 +432,7 @@ with multiple lines│
     )
 
 
-def test_lines_stretch_content():
+def test_lines_stretch_content() -> None:
     d = BlockDiagramDrawer()
     d.mutable_block(0, 0).left = 'l'
     d.mutable_block(2, 4).right = 'r'
@@ -449,7 +451,7 @@ def test_lines_stretch_content():
     )
 
 
-def test_indices():
+def test_indices() -> None:
     d = BlockDiagramDrawer()
     with pytest.raises(IndexError):
         d.mutable_block(-1, -1)

cirq/circuits/_box_drawing_character_data.py

@@ -14,7 +14,9 @@
 
 """Exposes structured data about unicode/ascii box drawing characters."""
 
-from typing import List, NamedTuple, Optional
+from __future__ import annotations
+
+from typing import NamedTuple
 
 _BoxDrawCharacterSet = NamedTuple(
     '_BoxDrawCharacterSet',
@@ -41,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')
@@ -116,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')
@@ -338,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/_box_drawing_character_data_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 cirq.circuits._box_drawing_character_data import (
     BOLD_BOX_CHARS,
     box_draw_character,
@@ -21,7 +23,7 @@ from cirq.circuits._box_drawing_character_data import (
 )
 
 
-def test_chars():
+def test_chars() -> None:
     assert NORMAL_BOX_CHARS.char() is None
     assert NORMAL_BOX_CHARS.char(top=True, bottom=True) == '│'
     assert NORMAL_THEN_BOLD_MIXED_BOX_CHARS.char() is None

cirq/circuits/_bucket_priority_queue.py

@@ -12,7 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from typing import Any, Generic, Iterable, Iterator, List, Optional, Set, Tuple, TypeVar
+from __future__ import annotations
+
+from typing import Any, Generic, Iterable, Iterator, TypeVar
 
 TItem = TypeVar('TItem')
 
@@ -37,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.
 
@@ -48,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)
@@ -68,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:
@@ -120,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:
@@ -178,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    ')

cirq/circuits/_bucket_priority_queue_test.py

@@ -12,14 +12,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import annotations
+
 import pytest
 
 import cirq
 from cirq.circuits._bucket_priority_queue import BucketPriorityQueue
 
 
-def test_init():
-    q = BucketPriorityQueue()
+def test_init() -> None:
+    q: BucketPriorityQueue = BucketPriorityQueue()
     assert not q.drop_duplicate_entries
     assert list(q) == []
     assert len(q) == 0
@@ -40,7 +42,7 @@ def test_init():
     assert bool(q)
 
 
-def test_eq():
+def test_eq() -> None:
     eq = cirq.testing.EqualsTester()
     eq.add_equality_group(
         BucketPriorityQueue(),
@@ -69,8 +71,8 @@ def test_eq():
     )
 
 
-def test_enqueue_dequeue():
-    q = BucketPriorityQueue()
+def test_enqueue_dequeue() -> None:
+    q: BucketPriorityQueue = BucketPriorityQueue()
     q.enqueue(5, 'a')
     assert q == BucketPriorityQueue([(5, 'a')])
     q.enqueue(4, 'b')
@@ -83,10 +85,10 @@ def test_enqueue_dequeue():
         _ = q.dequeue()
 
 
-def test_drop_duplicates_enqueue():
-    q0 = BucketPriorityQueue()
-    q1 = BucketPriorityQueue(drop_duplicate_entries=False)
-    q2 = BucketPriorityQueue(drop_duplicate_entries=True)
+def test_drop_duplicates_enqueue() -> None:
+    q0: BucketPriorityQueue = BucketPriorityQueue()
+    q1: BucketPriorityQueue = BucketPriorityQueue(drop_duplicate_entries=False)
+    q2: BucketPriorityQueue = BucketPriorityQueue(drop_duplicate_entries=True)
     for q in [q0, q1, q2]:
         for _ in range(2):
             q.enqueue(0, 'a')
@@ -95,10 +97,10 @@ def test_drop_duplicates_enqueue():
     assert q2 == BucketPriorityQueue([(0, 'a')], drop_duplicate_entries=True)
 
 
-def test_drop_duplicates_dequeue():
-    q0 = BucketPriorityQueue()
-    q1 = BucketPriorityQueue(drop_duplicate_entries=False)
-    q2 = BucketPriorityQueue(drop_duplicate_entries=True)
+def test_drop_duplicates_dequeue() -> None:
+    q0: BucketPriorityQueue = BucketPriorityQueue()
+    q1: BucketPriorityQueue = BucketPriorityQueue(drop_duplicate_entries=False)
+    q2: BucketPriorityQueue = BucketPriorityQueue(drop_duplicate_entries=True)
     for q in [q0, q1, q2]:
         q.enqueue(0, 'a')
         q.enqueue(0, 'b')
@@ -111,11 +113,11 @@ def test_drop_duplicates_dequeue():
     assert q2 == BucketPriorityQueue([(0, 'b'), (0, 'a')], drop_duplicate_entries=True)
 
 
-def test_same_priority_fifo():
+def test_same_priority_fifo() -> None:
     a = (5, 'a')
     b = (5, 'b')
     for x, y in [(a, b), (b, a)]:
-        q = BucketPriorityQueue()
+        q: BucketPriorityQueue = BucketPriorityQueue()
         q.enqueue(*x)
         q.enqueue(*y)
         assert q
@@ -125,23 +127,23 @@ def test_same_priority_fifo():
         assert not q
 
 
-def test_supports_arbitrary_offsets():
+def test_supports_arbitrary_offsets() -> None:
     m = 1 << 60
 
-    q_neg = BucketPriorityQueue()
+    q_neg: BucketPriorityQueue = BucketPriorityQueue()
     q_neg.enqueue(-m + 0, 'b')
     q_neg.enqueue(-m - 4, 'a')
     q_neg.enqueue(-m + 4, 'c')
     assert list(q_neg) == [(-m - 4, 'a'), (-m, 'b'), (-m + 4, 'c')]
 
-    q_pos = BucketPriorityQueue()
+    q_pos: BucketPriorityQueue = BucketPriorityQueue()
     q_pos.enqueue(m + 0, 'b')
     q_pos.enqueue(m + 4, 'c')
     q_pos.enqueue(m - 4, 'a')
     assert list(q_pos) == [(m - 4, 'a'), (m, 'b'), (m + 4, 'c')]
 
 
-def test_repr():
+def test_repr() -> None:
     r = repr(BucketPriorityQueue(entries=[(1, 2), (3, 4)], drop_duplicate_entries=True))
     assert r.endswith('BucketPriorityQueue(entries=[(1, 2), (3, 4)], drop_duplicate_entries=True)')
 
@@ -152,7 +154,7 @@ def test_repr():
     )
 
 
-def test_str():
+def test_str() -> None:
     s = str(BucketPriorityQueue(entries=[(1, 2), (3, 4)], drop_duplicate_entries=True))
     assert (
         s