Update to mypy 1.2

Author: maffoo

cirq-core/cirq/_compat_test.py

@@ -98,7 +98,7 @@ def test_proper_repr_data_frame():
     pd.testing.assert_frame_equal(df2, df)
 
 
-def test_dataclass_repr_simple():
+def test_dataclass_repr_simple() -> None:
     @dataclasses.dataclass
     class TestClass1:
         x: int
@@ -111,7 +111,7 @@ def __repr__(self):
     assert repr(TestClass1(5, 'hi')) == "cirq.TestClass1(x=5, y='hi')"
 
 
-def test_dataclass_repr_numpy():
+def test_dataclass_repr_numpy() -> None:
     @dataclasses.dataclass
     class TestClass2:
         x: np.ndarray
@@ -1003,7 +1003,7 @@ def bar(self):
 
 
 class Bar:
-    def __init__(self):
+    def __init__(self) -> None:
         self.foo_calls: Dict[int, int] = collections.Counter()
         self.bar_calls: Dict[int, int] = collections.Counter()
 

cirq-core/cirq/circuits/circuit.py

@@ -305,7 +305,10 @@ def _first_moment_operating_on(
         return None
 
     def next_moment_operating_on(
-        self, qubits: Iterable['cirq.Qid'], start_moment_index: int = 0, max_distance: int = None
+        self,
+        qubits: Iterable['cirq.Qid'],
+        start_moment_index: int = 0,
+        max_distance: Optional[int] = None,
     ) -> Optional[int]:
         """Finds the index of the next moment that touches the given qubits.
 
@@ -2128,7 +2131,7 @@ def _push_frontier(
         self,
         early_frontier: Dict['cirq.Qid', int],
         late_frontier: Dict['cirq.Qid', int],
-        update_qubits: Iterable['cirq.Qid'] = None,
+        update_qubits: Optional[Iterable['cirq.Qid']] = None,
     ) -> Tuple[int, int]:
         """Inserts moments to separate two frontiers.
 
@@ -2198,7 +2201,10 @@ def _insert_operations(
             )
 
     def insert_at_frontier(
-        self, operations: 'cirq.OP_TREE', start: int, frontier: Dict['cirq.Qid', int] = None
+        self,
+        operations: 'cirq.OP_TREE',
+        start: int,
+        frontier: Optional[Dict['cirq.Qid', int]] = None,
     ) -> Dict['cirq.Qid', int]:
         """Inserts operations inline at frontier.
 
@@ -2389,7 +2395,9 @@ def with_noise(self, noise: 'cirq.NOISE_MODEL_LIKE') -> 'cirq.Circuit':
 
 
 def _pick_inserted_ops_moment_indices(
-    operations: Sequence['cirq.Operation'], start: int = 0, frontier: Dict['cirq.Qid', int] = None
+    operations: Sequence['cirq.Operation'],
+    start: int = 0,
+    frontier: Optional[Dict['cirq.Qid', int]] = None,
 ) -> Tuple[Sequence[int], Dict['cirq.Qid', int]]:
     """Greedily assigns operations to moments.
 

cirq-core/cirq/circuits/circuit_operation_test.py

@@ -274,7 +274,7 @@ def test_recursive_params():
 
 @pytest.mark.parametrize('add_measurements', [True, False])
 @pytest.mark.parametrize('use_default_ids_for_initial_rep', [True, False])
-def test_repeat(add_measurements, use_default_ids_for_initial_rep):
+def test_repeat(add_measurements: bool, use_default_ids_for_initial_rep: bool) -> None:
     a, b = cirq.LineQubit.range(2)
     circuit = cirq.Circuit(cirq.H(a), cirq.CX(a, b))
     if add_measurements:
@@ -327,9 +327,9 @@ def test_repeat(add_measurements, use_default_ids_for_initial_rep):
         _ = op_base.repeat()
 
     with pytest.raises(TypeError, match='Only integer or sympy repetitions are allowed'):
-        _ = op_base.repeat(1.3)
-    assert op_base.repeat(3.00000000001).repetitions == 3
-    assert op_base.repeat(2.99999999999).repetitions == 3
+        _ = op_base.repeat(1.3)  # type: ignore[arg-type]
+    assert op_base.repeat(3.00000000001).repetitions == 3  # type: ignore[arg-type]
+    assert op_base.repeat(2.99999999999).repetitions == 3  # type: ignore[arg-type]
 
 
 @pytest.mark.parametrize('add_measurements', [True, False])

cirq-core/cirq/circuits/text_diagram_drawer.py

@@ -292,7 +292,7 @@ def render(
         self,
         horizontal_spacing: int = 1,
         vertical_spacing: int = 1,
-        crossing_char: str = None,
+        crossing_char: Optional[str] = None,
         use_unicode_characters: bool = True,
     ) -> str:
         """Outputs text containing the diagram."""

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

@@ -174,7 +174,10 @@ class GreedyExecutionStrategy(ExecutionStrategy):
     """
 
     def __init__(
-        self, gates: LogicalGates, initial_mapping: LogicalMapping, device: 'cirq.Device' = None
+        self,
+        gates: LogicalGates,
+        initial_mapping: LogicalMapping,
+        device: Optional['cirq.Device'] = None,
     ) -> None:
         """Inits GreedyExecutionStrategy.
 

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

@@ -13,7 +13,18 @@
 # limitations under the License.
 
 import abc
-from typing import Any, cast, Dict, Iterable, Sequence, Tuple, TypeVar, Union, TYPE_CHECKING
+from typing import (
+    Any,
+    cast,
+    Dict,
+    Iterable,
+    Optional,
+    Sequence,
+    Tuple,
+    TypeVar,
+    Union,
+    TYPE_CHECKING,
+)
 
 from cirq import circuits, ops, protocols, transformers, value
 from cirq.type_workarounds import NotImplementedType
@@ -72,7 +83,7 @@ def update_mapping(
                 mapping[new_key] = old_element
 
     @staticmethod
-    def validate_permutation(permutation: Dict[int, int], n_elements: int = None) -> None:
+    def validate_permutation(permutation: Dict[int, int], n_elements: Optional[int] = None) -> None:
         if not permutation:
             return
         if set(permutation.values()) != set(permutation):

cirq-core/cirq/contrib/qasm_import/_parser.py

@@ -141,7 +141,7 @@ class QasmParser:
         parsedQasm = QasmParser().parse(qasm)
     """
 
-    def __init__(self):
+    def __init__(self) -> None:
         self.parser = yacc.yacc(module=self, debug=False, write_tables=False)
         self.circuit = Circuit()
         self.qregs: Dict[str, int] = {}

cirq-core/cirq/contrib/quantum_volume/quantum_volume.py

@@ -200,7 +200,7 @@ def compile_circuit(
     *,
     device_graph: nx.Graph,
     routing_attempts: int,
-    compiler: Callable[[cirq.Circuit], cirq.Circuit] = None,
+    compiler: Optional[Callable[[cirq.Circuit], cirq.Circuit]] = None,
     routing_algo_name: Optional[str] = None,
     router: Optional[Callable[..., ccr.SwapNetwork]] = None,
     add_readout_error_correction=False,
@@ -357,7 +357,7 @@ def execute_circuits(
     samplers: List[cirq.Sampler],
     circuits: List[Tuple[cirq.Circuit, List[int]]],
     routing_attempts: int,
-    compiler: Callable[[cirq.Circuit], cirq.Circuit] = None,
+    compiler: Optional[Callable[[cirq.Circuit], cirq.Circuit]] = None,
     repetitions: int = 10_000,
     add_readout_error_correction=False,
 ) -> List[QuantumVolumeResult]:
@@ -429,7 +429,7 @@ def calculate_quantum_volume(
     device_graph: nx.Graph,
     samplers: List[cirq.Sampler],
     random_state: 'cirq.RANDOM_STATE_OR_SEED_LIKE' = None,
-    compiler: Callable[[cirq.Circuit], cirq.Circuit] = None,
+    compiler: Optional[Callable[[cirq.Circuit], cirq.Circuit]] = None,
     repetitions=10_000,
     routing_attempts=30,
     add_readout_error_correction=False,

cirq-core/cirq/contrib/quimb/mps_simulator.py

@@ -569,7 +569,7 @@ def __init__(
         simulation_options: MPSOptions = MPSOptions(),
         grouping: Optional[Dict['cirq.Qid', int]] = None,
         initial_state: int = 0,
-        classical_data: 'cirq.ClassicalDataStore' = None,
+        classical_data: Optional['cirq.ClassicalDataStore'] = None,
     ):
         """Creates and MPSState
 

cirq-core/cirq/contrib/svg/svg_test.py

@@ -1,5 +1,5 @@
 # pylint: disable=wrong-or-nonexistent-copyright-notice
-import IPython.display  # type: ignore
+import IPython.display  # type: ignore[import]
 import numpy as np
 import pytest