Merge branch 'main' into saurav/black-jupyter-script

Author: mhucka

cirq-aqt/cirq_aqt/aqt_device.py

@@ -24,6 +24,8 @@
 The native gate set consists of the local gates: X, Y, and XX entangling gates
 """
 
+from __future__ import annotations
+
 import json
 from enum import Enum
 from typing import Any, cast, Dict, Iterable, List, Optional, Sequence, Set, Tuple, Union

cirq-aqt/cirq_aqt/aqt_device_metadata.py

@@ -14,6 +14,8 @@
 
 """DeviceMetadata for ion trap device with mutually linked qubits placed on a line."""
 
+from __future__ import annotations
+
 from typing import Any, Iterable, Mapping
 
 import networkx as nx

cirq-aqt/cirq_aqt/aqt_device_metadata_test.py

@@ -14,6 +14,8 @@
 
 """Tests for AQTDeviceMetadata."""
 
+from __future__ import annotations
+
 from typing import List
 
 import pytest

cirq-aqt/cirq_aqt/aqt_sampler.py

@@ -22,6 +22,8 @@
 
 """
 
+from __future__ import annotations
+
 import json
 import time
 import uuid

cirq-aqt/cirq_aqt/aqt_sampler_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 json
 from unittest import mock
 

cirq-aqt/cirq_aqt/aqt_simulator_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 pytest
 
 import cirq

cirq-aqt/cirq_aqt/aqt_target_gateset.py

@@ -14,6 +14,8 @@
 
 """Target gateset for ion trap device with mutually linked qubits placed on a line."""
 
+from __future__ import annotations
+
 from typing import List
 
 import numpy as np

cirq-aqt/cirq_aqt/aqt_target_gateset_test.py

@@ -14,6 +14,8 @@
 
 """Tests for AQTTargetGateset."""
 
+from __future__ import annotations
+
 import pytest
 import sympy
 

cirq-aqt/cirq_aqt/json_resolver_cache.py

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import annotations
+
 import functools
 from typing import Dict
 

cirq-core/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

cirq-core/cirq/_doc.py

@@ -13,6 +13,8 @@
 # limitations under the License.
 """Workaround for associating docstrings with public constants."""
 
+from __future__ import annotations
+
 from typing import Any, Dict
 
 RECORDED_CONST_DOCS: Dict[int, str] = {}

cirq-core/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

cirq-core/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-core/cirq/circuits/_block_diagram_drawer.py

@@ -12,6 +12,8 @@
 # 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
 

cirq-core/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

cirq-core/cirq/circuits/_box_drawing_character_data.py

@@ -14,6 +14,8 @@
 
 """Exposes structured data about unicode/ascii box drawing characters."""
 
+from __future__ import annotations
+
 from typing import List, NamedTuple, Optional
 
 _BoxDrawCharacterSet = NamedTuple(

cirq-core/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,

cirq-core/cirq/circuits/_bucket_priority_queue.py

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import annotations
+
 from typing import Any, Generic, Iterable, Iterator, List, Optional, Set, Tuple, TypeVar
 
 TItem = TypeVar('TItem')

cirq-core/cirq/circuits/_bucket_priority_queue_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 pytest
 
 import cirq

cirq-core/cirq/circuits/circuit_operation_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 unittest.mock as mock
 from typing import Optional
 

cirq-core/cirq/circuits/circuit_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 os
 import time

cirq-core/cirq/circuits/frozen_circuit_test.py

@@ -16,6 +16,8 @@
 Behavior shared with Circuit is tested with parameters in circuit_test.py.
 """
 
+from __future__ import annotations
+
 import pytest
 import sympy
 

cirq-core/cirq/circuits/insert_strategy_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 pickle
 
 import pytest

cirq-core/cirq/circuits/moment_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 numpy as np
 import pytest
 import sympy

cirq-core/cirq/circuits/optimization_pass_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 typing import List, Optional, Set
 
 import pytest

cirq-core/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
 

cirq-core/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

cirq-core/cirq/contrib/acquaintance/bipartite_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

cirq-core/cirq/contrib/acquaintance/devices_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 pytest
 
 import cirq

cirq-core/cirq/contrib/acquaintance/executor_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 itertools import combinations
 from string import ascii_lowercase
 from typing import Dict, Sequence, Tuple

cirq-core/cirq/contrib/acquaintance/inspection_utils_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 itertools import combinations, product
 
 import pytest

cirq-core/cirq/contrib/acquaintance/mutation_utils_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 string import ascii_lowercase as alphabet
 
 import pytest

cirq-core/cirq/contrib/acquaintance/optimizers_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 cirq
 import cirq.contrib.acquaintance as cca
 import cirq.testing as ct

cirq-core/cirq/contrib/acquaintance/permutation_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 random
 
 import pytest

cirq-core/cirq/contrib/acquaintance/shift_swap_network_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 random
 

cirq-core/cirq/contrib/acquaintance/shift_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 cirq
 import cirq.contrib.acquaintance as cca
 

cirq-core/cirq/contrib/acquaintance/strategies/cubic_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

cirq-core/cirq/contrib/acquaintance/strategies/quartic_paired_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 random
 

cirq-core/cirq/contrib/acquaintance/testing.py

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import annotations
+
 from typing import cast, Sequence, TYPE_CHECKING
 
 from cirq import devices, ops, protocols

cirq-core/cirq/contrib/acquaintance/topological_sort_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 pytest
 
 import cirq

cirq-core/cirq/contrib/bayesian_network/bayesian_network_gate_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 numpy as np
 import pytest
 

cirq-core/cirq/contrib/circuitdag/circuit_dag_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 random
 

cirq-core/cirq/contrib/graph_device/graph_device_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 pytest
 
 import cirq