From 8df13cc93e473181f1712451ea8b7f9e67a64805 Mon Sep 17 00:00:00 2001 From: Pavol Juhas Date: Tue, 11 Nov 2025 15:28:42 -0800 Subject: [PATCH 1/5] ruff - check and fix useless-object-inheritance (UP004) --- cirq-core/cirq/_compat_test.py | 2 +- examples/stabilizer_code.py | 2 +- pyproject.toml | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cirq-core/cirq/_compat_test.py b/cirq-core/cirq/_compat_test.py index c7f1fc0caed..8f38756c16b 100644 --- a/cirq-core/cirq/_compat_test.py +++ b/cirq-core/cirq/_compat_test.py @@ -159,7 +159,7 @@ def f(a, b): def test_deprecated_with_property(): - class AClass(object): + class AClass: def __init__(self, a): self.a = a diff --git a/examples/stabilizer_code.py b/examples/stabilizer_code.py index 0605fb6d8d7..3ac53946af9 100644 --- a/examples/stabilizer_code.py +++ b/examples/stabilizer_code.py @@ -164,7 +164,7 @@ def _transfer_to_standard_form( return M, X, Z, r -class StabilizerCode(object): +class StabilizerCode: def __init__(self, group_generators: list[str], correctable_errors: list[str]): n = len(group_generators[0]) k = n - len(group_generators) diff --git a/pyproject.toml b/pyproject.toml index 27078a8fc69..d69f3da8896 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -136,6 +136,7 @@ select = [ "TC001", # typing-only-first-party-import "TC002", # typing-only-third-party-import # "TC003", # typing-only-standard-library-import + "UP004", # useless-object-inheritance "UP006", # non-pep585-annotation "UP007", # non-pep604-annotation-union "UP008", # super-call-with-parameters, pylint super-with-arguments From 80e74aafbdf47e150f2caf5c9d232f463326889d Mon Sep 17 00:00:00 2001 From: Pavol Juhas Date: Tue, 11 Nov 2025 15:34:35 -0800 Subject: [PATCH 2/5] ruff - check and fix native-literals (UP018) --- cirq-core/cirq/study/resolver_test.py | 2 +- pyproject.toml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/cirq-core/cirq/study/resolver_test.py b/cirq-core/cirq/study/resolver_test.py index 740d787d072..d042851be92 100644 --- a/cirq-core/cirq/study/resolver_test.py +++ b/cirq-core/cirq/study/resolver_test.py @@ -31,7 +31,7 @@ None, 3.2, np.float32(3.2), - int(1), + 1, np.int32(45), np.float64(6.3), np.int32(2), diff --git a/pyproject.toml b/pyproject.toml index d69f3da8896..0883a319f5c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -141,6 +141,7 @@ select = [ "UP007", # non-pep604-annotation-union "UP008", # super-call-with-parameters, pylint super-with-arguments "UP010", # unnecessary-future-import + "UP018", # native-literals "UP037", # quoted-annotation "W605", # invalid-escape-sequence, pylint anomalous-backslash-in-string ] From 05881e259461542a8320619a985800e7360de433 Mon Sep 17 00:00:00 2001 From: Pavol Juhas Date: Tue, 11 Nov 2025 15:41:15 -0800 Subject: [PATCH 3/5] ruff - check and fix yield-in-for-loop (UP028) --- cirq-core/cirq/ops/boolean_hamiltonian.py | 4 ++-- cirq-core/cirq/ops/clifford_gate_test.py | 3 +-- pyproject.toml | 1 + 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cirq-core/cirq/ops/boolean_hamiltonian.py b/cirq-core/cirq/ops/boolean_hamiltonian.py index 2a1ed83aecc..6141d6122cf 100644 --- a/cirq-core/cirq/ops/boolean_hamiltonian.py +++ b/cirq-core/cirq/ops/boolean_hamiltonian.py @@ -334,8 +334,8 @@ def _apply_cnots(prevh: tuple[int, ...], currh: tuple[int, ...]): cnots = _simplify_cnots(cnots) - for gate in (cirq.CNOT(qubits[c], qubits[t]) for c, t in cnots): - yield gate + for c, t in cnots: + yield cirq.CNOT(qubits[c], qubits[t]) sorted_hamiltonian_keys = sorted( hamiltonians.keys(), key=functools.cmp_to_key(_gray_code_comparator) diff --git a/cirq-core/cirq/ops/clifford_gate_test.py b/cirq-core/cirq/ops/clifford_gate_test.py index 257a6ed237f..5bd58020574 100644 --- a/cirq-core/cirq/ops/clifford_gate_test.py +++ b/cirq-core/cirq/ops/clifford_gate_test.py @@ -48,8 +48,7 @@ def _assert_no_collision(gate) -> None: def _all_rotations(): - for pauli, flip in itertools.product(_paulis, _bools): - yield (pauli, flip) + yield from itertools.product(_paulis, _bools) def _all_rotation_pairs(): diff --git a/pyproject.toml b/pyproject.toml index 0883a319f5c..d02675432a7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -142,6 +142,7 @@ select = [ "UP008", # super-call-with-parameters, pylint super-with-arguments "UP010", # unnecessary-future-import "UP018", # native-literals + "UP028", # yield-in-for-loop "UP037", # quoted-annotation "W605", # invalid-escape-sequence, pylint anomalous-backslash-in-string ] From d2b55c11aba8b71829d6c400eba58fbd209bc736 Mon Sep 17 00:00:00 2001 From: Pavol Juhas Date: Tue, 11 Nov 2025 15:49:43 -0800 Subject: [PATCH 4/5] ruff - check and fix extraneous-parentheses (UP034) --- cirq-core/cirq/contrib/acquaintance/executor.py | 6 ++---- cirq-core/cirq/contrib/acquaintance/strategies/complete.py | 2 +- cirq-core/cirq/ops/linear_combinations_test.py | 2 +- cirq-core/cirq/ops/pauli_string_test.py | 2 +- cirq-core/cirq/protocols/has_stabilizer_effect_protocol.py | 2 +- cirq-core/cirq/sim/clifford/clifford_simulator_test.py | 2 +- cirq-core/cirq/sim/clifford/stabilizer_state_ch_form.py | 2 +- cirq-ionq/cirq_ionq/results.py | 2 +- cirq-ionq/cirq_ionq/serializer.py | 2 +- examples/bcs_mean_field.py | 4 ++-- pyproject.toml | 1 + 11 files changed, 13 insertions(+), 14 deletions(-) diff --git a/cirq-core/cirq/contrib/acquaintance/executor.py b/cirq-core/cirq/contrib/acquaintance/executor.py index 160dbb22b5b..ea31bc8c938 100644 --- a/cirq-core/cirq/contrib/acquaintance/executor.py +++ b/cirq-core/cirq/contrib/acquaintance/executor.py @@ -66,10 +66,8 @@ def __call__(self, *args, **kwargs): """ if len(args) < 1 or not isinstance(args[0], circuits.AbstractCircuit): raise ValueError( - ( - "To call ExecutionStrategy, an argument of type " - "circuits.AbstractCircuit must be passed in as the first non-keyword argument" - ) + "To call ExecutionStrategy, an argument of type " + "circuits.AbstractCircuit must be passed in as the first non-keyword argument" ) input_circuit = args[0] strategy = StrategyExecutorTransformer(self) diff --git a/cirq-core/cirq/contrib/acquaintance/strategies/complete.py b/cirq-core/cirq/contrib/acquaintance/strategies/complete.py index b2a3ef6ef18..04d24579317 100755 --- a/cirq-core/cirq/contrib/acquaintance/strategies/complete.py +++ b/cirq-core/cirq/contrib/acquaintance/strategies/complete.py @@ -54,7 +54,7 @@ def complete_acquaintance_strategy( if acquaintance_size == len(qubit_order): return circuits.Circuit(acquaint(*qubit_order)) - strategy = circuits.Circuit((acquaint(q) for q in qubit_order)) + strategy = circuits.Circuit(acquaint(q) for q in qubit_order) for size_to_acquaint in range(2, acquaintance_size + 1): expose_acquaintance_gates(strategy) replace_acquaintance_with_swap_network(strategy, qubit_order, size_to_acquaint, swap_gate) diff --git a/cirq-core/cirq/ops/linear_combinations_test.py b/cirq-core/cirq/ops/linear_combinations_test.py index d95e6d35447..da515ee3859 100644 --- a/cirq-core/cirq/ops/linear_combinations_test.py +++ b/cirq-core/cirq/ops/linear_combinations_test.py @@ -1430,7 +1430,7 @@ def test_expectation_from_density_matrix_invalid_input() -> None: with pytest.raises(ValueError, match='shape'): psum.expectation_from_density_matrix(rho.reshape((8, 8, 1)), q_map) with pytest.raises(ValueError, match='shape'): - psum.expectation_from_density_matrix(rho.reshape((-1)), q_map) + psum.expectation_from_density_matrix(rho.reshape((-1,)), q_map) def test_expectation_from_density_matrix_check_preconditions() -> None: diff --git a/cirq-core/cirq/ops/pauli_string_test.py b/cirq-core/cirq/ops/pauli_string_test.py index e1a7b09f3f4..5e0d8569f98 100644 --- a/cirq-core/cirq/ops/pauli_string_test.py +++ b/cirq-core/cirq/ops/pauli_string_test.py @@ -1191,7 +1191,7 @@ def test_expectation_from_density_matrix_invalid_input() -> None: with pytest.raises(ValueError, match='shape'): ps.expectation_from_density_matrix(rho.reshape((4, 4, 1)), q_map_2) with pytest.raises(ValueError, match='shape'): - ps.expectation_from_density_matrix(rho.reshape((-1)), q_map_2) + ps.expectation_from_density_matrix(rho.reshape((-1,)), q_map_2) # Correctly shaped state_vectors. with pytest.raises(ValueError, match='shape'): diff --git a/cirq-core/cirq/protocols/has_stabilizer_effect_protocol.py b/cirq-core/cirq/protocols/has_stabilizer_effect_protocol.py index 3d79b015f0d..044eef65e38 100644 --- a/cirq-core/cirq/protocols/has_stabilizer_effect_protocol.py +++ b/cirq-core/cirq/protocols/has_stabilizer_effect_protocol.py @@ -97,7 +97,7 @@ def _strat_has_stabilizer_effect_from_unitary(val: Any) -> bool | None: ps = DensePauliString(pauli_string) p = ps._unitary_() if not pauli_string_decomposition.unitary_to_pauli_string( - (unitary @ p @ unitary.T.conj()) + unitary @ p @ unitary.T.conj() ): return False return True diff --git a/cirq-core/cirq/sim/clifford/clifford_simulator_test.py b/cirq-core/cirq/sim/clifford/clifford_simulator_test.py index 8a09947667d..b7b0283a427 100644 --- a/cirq-core/cirq/sim/clifford/clifford_simulator_test.py +++ b/cirq-core/cirq/sim/clifford/clifford_simulator_test.py @@ -470,7 +470,7 @@ def test_swap() -> None: assert r["b"][0] with pytest.raises(TypeError, match="CliffordSimulator doesn't support"): - cirq.CliffordSimulator().simulate((cirq.Circuit(cirq.SWAP(a, b) ** 3.5))) + cirq.CliffordSimulator().simulate(cirq.Circuit(cirq.SWAP(a, b) ** 3.5)) def test_sample_seed() -> None: diff --git a/cirq-core/cirq/sim/clifford/stabilizer_state_ch_form.py b/cirq-core/cirq/sim/clifford/stabilizer_state_ch_form.py index 6efce1a1186..2588dca8d86 100644 --- a/cirq-core/cirq/sim/clifford/stabilizer_state_ch_form.py +++ b/cirq-core/cirq/sim/clifford/stabilizer_state_ch_form.py @@ -214,7 +214,7 @@ def _H_decompose(self, v, y, z, delta): omega = (1j) ** (delta * int(y)) delta2 = ((-1) ** y * delta) % 4 - c = bool((delta2 >> 1)) + c = bool(delta2 >> 1) a = bool(delta2 & 1) b = True else: diff --git a/cirq-ionq/cirq_ionq/results.py b/cirq-ionq/cirq_ionq/results.py index d561986c1c6..838919de906 100644 --- a/cirq-ionq/cirq_ionq/results.py +++ b/cirq-ionq/cirq_ionq/results.py @@ -272,7 +272,7 @@ def to_cirq_result( # IonQ's pauliexp gates results are not extremely precise total = sum(weights) if np.isclose(total, 1.0, rtol=0, atol=1e-5): - weights = tuple((w / total for w in weights)) + weights = tuple(w / total for w in weights) indices = rand.choice( range(len(values)), p=weights, size=override_repetitions or self.repetitions() diff --git a/cirq-ionq/cirq_ionq/serializer.py b/cirq-ionq/cirq_ionq/serializer.py index 4cee7286fc5..16476828c01 100644 --- a/cirq-ionq/cirq_ionq/serializer.py +++ b/cirq-ionq/cirq_ionq/serializer.py @@ -196,7 +196,7 @@ def serialize_many_circuits( {'circuit': [op for op in serialized_ops if op['gate'] != 'meas']} ) measurements.append( - (self._serialize_measurements(op for op in serialized_ops if op['gate'] == 'meas')) + self._serialize_measurements(op for op in serialized_ops if op['gate'] == 'meas') ) qubit_numbers.append(self._num_qubits(circuit)) diff --git a/examples/bcs_mean_field.py b/examples/bcs_mean_field.py index 29d3150391e..b86530167f6 100644 --- a/examples/bcs_mean_field.py +++ b/examples/bcs_mean_field.py @@ -173,7 +173,7 @@ def main(): print(bog_circuit.to_text_diagram(transpose=True), '\n') # The inverse fermionic Fourier transformation on the spin-up states - print(('Circuit for the inverse fermionic Fourier transformation on the spin-up states:')) + print('Circuit for the inverse fermionic Fourier transformation on the spin-up states:') fourier_circuit_spin_up = cirq.Circuit( fermi_fourier_trans_inverse_4(upper_qubits), strategy=cirq.InsertStrategy.EARLIEST ) @@ -183,7 +183,7 @@ def main(): print(fourier_circuit_spin_up.to_text_diagram(transpose=True), '\n') # The inverse fermionic Fourier transformation on the spin-down states - print(('Circuit for the inverse fermionic Fourier transformation on the spin-down states:')) + print('Circuit for the inverse fermionic Fourier transformation on the spin-down states:') fourier_circuit_spin_down = cirq.Circuit( fermi_fourier_trans_inverse_conjugate_4(lower_qubits), strategy=cirq.InsertStrategy.EARLIEST ) diff --git a/pyproject.toml b/pyproject.toml index d02675432a7..fb05dcd83a2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -143,6 +143,7 @@ select = [ "UP010", # unnecessary-future-import "UP018", # native-literals "UP028", # yield-in-for-loop + "UP034", # extraneous-parentheses "UP037", # quoted-annotation "W605", # invalid-escape-sequence, pylint anomalous-backslash-in-string ] From b0d362f0793abe75d2b7e96ce537b998ecbd8599 Mon Sep 17 00:00:00 2001 From: Pavol Juhas Date: Tue, 11 Nov 2025 16:07:12 -0800 Subject: [PATCH 5/5] ruff - check and fix deprecated-import (UP035) --- benchmarks/circuit_construction.py | 2 +- benchmarks/randomized_benchmarking.py | 2 +- cirq-aqt/cirq_aqt/aqt_device.py | 3 ++- cirq-aqt/cirq_aqt/aqt_device_metadata.py | 3 ++- cirq-aqt/cirq_aqt/aqt_sampler.py | 3 ++- cirq-core/cirq/_compat.py | 3 ++- cirq-core/cirq/_compat_test.py | 3 ++- cirq-core/cirq/_import.py | 3 ++- .../cirq/circuits/_bucket_priority_queue.py | 3 ++- cirq-core/cirq/circuits/circuit.py | 20 +++++++------------ cirq-core/cirq/circuits/circuit_operation.py | 3 ++- cirq-core/cirq/circuits/circuit_test.py | 2 +- cirq-core/cirq/circuits/frozen_circuit.py | 5 +++-- cirq-core/cirq/circuits/moment.py | 18 +++-------------- cirq-core/cirq/circuits/optimization_pass.py | 3 ++- cirq-core/cirq/circuits/qasm_output.py | 3 ++- .../cirq/circuits/text_diagram_drawer.py | 3 ++- .../cirq/contrib/acquaintance/bipartite.py | 3 ++- .../cirq/contrib/acquaintance/executor.py | 3 ++- .../contrib/acquaintance/executor_test.py | 3 ++- cirq-core/cirq/contrib/acquaintance/gates.py | 3 ++- .../cirq/contrib/acquaintance/gates_test.py | 2 +- .../contrib/acquaintance/inspection_utils.py | 3 ++- .../contrib/acquaintance/mutation_utils.py | 3 ++- .../cirq/contrib/acquaintance/optimizers.py | 3 ++- .../cirq/contrib/acquaintance/permutation.py | 3 ++- .../contrib/acquaintance/permutation_test.py | 2 +- cirq-core/cirq/contrib/acquaintance/shift.py | 3 ++- .../acquaintance/shift_swap_network.py | 3 ++- .../acquaintance/strategies/complete.py | 3 ++- .../contrib/acquaintance/strategies/cubic.py | 3 ++- .../acquaintance/strategies/quartic_paired.py | 3 ++- .../strategies/quartic_paired_test.py | 2 +- .../cirq/contrib/acquaintance/testing.py | 3 ++- .../contrib/acquaintance/topological_sort.py | 3 ++- .../bayesian_network/bayesian_network_gate.py | 3 ++- .../cirq/contrib/circuitdag/circuit_dag.py | 3 ++- .../custom_state_simulator.py | 3 ++- .../custom_state_simulator_test.py | 2 +- .../cirq/contrib/graph_device/graph_device.py | 3 ++- .../contrib/graph_device/graph_device_test.py | 3 ++- .../cirq/contrib/graph_device/hypergraph.py | 3 ++- .../graph_device/uniform_graph_device.py | 3 ++- .../cirq/contrib/noise_models/noise_models.py | 3 ++- .../cirq/contrib/paulistring/optimize.py | 2 +- ...ing_measurement_with_readout_mitigation.py | 3 ++- ...easurement_with_readout_mitigation_test.py | 2 +- .../cirq/contrib/paulistring/recombine.py | 3 ++- .../cirq/contrib/paulistring/separate.py | 2 +- cirq-core/cirq/contrib/qasm_import/_parser.py | 3 ++- .../cirq/contrib/qasm_import/_parser_test.py | 2 +- .../contrib/quantum_volume/quantum_volume.py | 3 ++- .../cirq/contrib/quimb/density_matrix.py | 2 +- cirq-core/cirq/contrib/quimb/grid_circuits.py | 3 ++- .../cirq/contrib/quimb/grid_circuits_test.py | 2 +- cirq-core/cirq/contrib/quimb/mps_simulator.py | 3 ++- cirq-core/cirq/contrib/quimb/state_vector.py | 3 ++- .../cirq/contrib/quirk/export_to_quirk.py | 3 ++- .../cirq/contrib/quirk/linearize_circuit.py | 2 +- cirq-core/cirq/contrib/quirk/quirk_gate.py | 3 ++- cirq-core/cirq/contrib/routing/device.py | 2 +- cirq-core/cirq/contrib/routing/greedy.py | 3 ++- .../cirq/contrib/routing/initialization.py | 3 ++- cirq-core/cirq/contrib/routing/router.py | 3 ++- .../cirq/contrib/routing/swap_network.py | 3 ++- cirq-core/cirq/contrib/routing/utils.py | 3 ++- ...ffle_circuits_with_readout_benchmarking.py | 3 ++- ...circuits_with_readout_benchmarking_test.py | 2 +- cirq-core/cirq/devices/device.py | 3 ++- .../cirq/devices/grid_device_metadata.py | 3 ++- cirq-core/cirq/devices/grid_qubit.py | 3 ++- .../cirq/devices/insertion_noise_model.py | 3 ++- cirq-core/cirq/devices/line_qubit.py | 3 ++- cirq-core/cirq/devices/named_topologies.py | 3 ++- cirq-core/cirq/devices/noise_model.py | 3 ++- cirq-core/cirq/devices/noise_model_test.py | 2 +- cirq-core/cirq/devices/noise_properties.py | 3 ++- ...conducting_qubits_noise_properties_test.py | 3 ++- cirq-core/cirq/devices/thermal_noise_model.py | 3 ++- .../experiments/benchmarking/parallel_xeb.py | 3 ++- .../benchmarking/parallel_xeb_test.py | 2 +- .../cirq/experiments/fidelity_estimation.py | 3 ++- .../experiments/fidelity_estimation_test.py | 2 +- .../cirq/experiments/n_qubit_tomography.py | 3 ++- .../experiments/n_qubit_tomography_test.py | 2 +- .../cirq/experiments/purity_estimation.py | 2 +- .../experiments/qubit_characterizations.py | 3 ++- .../random_quantum_circuit_generation.py | 3 ++- .../random_quantum_circuit_generation_test.py | 3 ++- .../experiments/readout_confusion_matrix.py | 3 ++- .../readout_confusion_matrix_test.py | 2 +- .../single_qubit_readout_calibration.py | 3 ++- .../single_qubit_readout_calibration_test.py | 2 +- .../cirq/experiments/t1_decay_experiment.py | 3 ++- cirq-core/cirq/experiments/two_qubit_xeb.py | 3 ++- .../cirq/experiments/two_qubit_xeb_test.py | 2 +- cirq-core/cirq/experiments/xeb_fitting.py | 3 ++- .../cirq/experiments/xeb_fitting_test.py | 2 +- cirq-core/cirq/experiments/xeb_sampling.py | 8 +++++--- .../cirq/experiments/xeb_sampling_test.py | 2 +- cirq-core/cirq/experiments/xeb_simulation.py | 3 ++- .../cirq/experiments/xeb_simulation_test.py | 3 ++- .../cirq/experiments/z_phase_calibration.py | 3 ++- .../experiments/z_phase_calibration_test.py | 2 +- .../cirq/interop/quirk/cells/all_cells.py | 3 ++- .../interop/quirk/cells/arithmetic_cells.py | 3 ++- cirq-core/cirq/interop/quirk/cells/cell.py | 3 ++- .../interop/quirk/cells/composite_cell.py | 3 ++- .../quirk/cells/composite_cell_test.py | 2 +- .../cirq/interop/quirk/cells/control_cells.py | 3 ++- .../quirk/cells/frequency_space_cells.py | 2 +- .../cirq/interop/quirk/cells/ignored_cells.py | 2 +- .../cirq/interop/quirk/cells/input_cells.py | 3 ++- .../quirk/cells/input_rotation_cells.py | 3 ++- .../interop/quirk/cells/measurement_cells.py | 3 ++- cirq-core/cirq/interop/quirk/cells/parse.py | 13 ++---------- .../quirk/cells/qubit_permutation_cells.py | 3 ++- .../cirq/interop/quirk/cells/scalar_cells.py | 3 ++- .../cells/single_qubit_rotation_cells.py | 3 ++- .../cirq/interop/quirk/cells/swap_cell.py | 3 ++- .../interop/quirk/cells/unsupported_cells.py | 2 +- .../cirq/interop/quirk/url_to_circuit.py | 3 ++- cirq-core/cirq/linalg/decompositions.py | 3 ++- cirq-core/cirq/linalg/diagonalize.py | 2 +- cirq-core/cirq/linalg/predicates.py | 3 ++- cirq-core/cirq/linalg/tolerance.py | 3 ++- cirq-core/cirq/linalg/transformations.py | 3 ++- cirq-core/cirq/ops/arithmetic_operation.py | 3 ++- .../cirq/ops/arithmetic_operation_test.py | 2 +- cirq-core/cirq/ops/boolean_hamiltonian.py | 3 ++- .../ops/classically_controlled_operation.py | 5 +++-- cirq-core/cirq/ops/clifford_gate.py | 3 ++- cirq-core/cirq/ops/common_channels.py | 3 ++- cirq-core/cirq/ops/common_gates.py | 3 ++- cirq-core/cirq/ops/control_values.py | 3 ++- cirq-core/cirq/ops/controlled_gate.py | 5 +++-- cirq-core/cirq/ops/controlled_gate_test.py | 3 ++- cirq-core/cirq/ops/controlled_operation.py | 5 +++-- .../cirq/ops/controlled_operation_test.py | 3 ++- cirq-core/cirq/ops/dense_pauli_string.py | 16 +++------------ cirq-core/cirq/ops/diagonal_gate.py | 5 +++-- cirq-core/cirq/ops/eigen_gate.py | 5 +++-- cirq-core/cirq/ops/fourier_transform.py | 5 +++-- cirq-core/cirq/ops/fsim_gate.py | 5 +++-- cirq-core/cirq/ops/gate_operation.py | 15 +++----------- cirq-core/cirq/ops/gateset.py | 3 ++- cirq-core/cirq/ops/global_phase_op.py | 5 +++-- cirq-core/cirq/ops/greedy_qubit_manager.py | 3 ++- cirq-core/cirq/ops/identity.py | 3 ++- cirq-core/cirq/ops/kraus_channel.py | 3 ++- cirq-core/cirq/ops/linear_combinations.py | 7 ++++--- cirq-core/cirq/ops/matrix_gates.py | 3 ++- cirq-core/cirq/ops/measure_util.py | 3 ++- cirq-core/cirq/ops/measurement_gate.py | 3 ++- cirq-core/cirq/ops/mixed_unitary_channel.py | 3 ++- cirq-core/cirq/ops/op_tree.py | 3 ++- cirq-core/cirq/ops/parallel_gate.py | 5 +++-- cirq-core/cirq/ops/parity_gates.py | 3 ++- cirq-core/cirq/ops/pauli_interaction_gate.py | 3 ++- cirq-core/cirq/ops/pauli_measurement_gate.py | 3 ++- cirq-core/cirq/ops/pauli_string.py | 18 ++++++----------- cirq-core/cirq/ops/pauli_string_phasor.py | 5 +++-- cirq-core/cirq/ops/pauli_string_raw_types.py | 3 ++- cirq-core/cirq/ops/pauli_string_test.py | 2 +- cirq-core/cirq/ops/pauli_sum_exponential.py | 3 ++- cirq-core/cirq/ops/permutation_gate.py | 3 ++- cirq-core/cirq/ops/phased_iswap_gate.py | 5 +++-- cirq-core/cirq/ops/phased_x_gate.py | 5 +++-- cirq-core/cirq/ops/phased_x_z_gate.py | 5 +++-- cirq-core/cirq/ops/projector.py | 3 ++- cirq-core/cirq/ops/qubit_manager.py | 3 ++- cirq-core/cirq/ops/qubit_order.py | 3 ++- cirq-core/cirq/ops/qubit_order_or_list.py | 2 +- cirq-core/cirq/ops/random_gate_channel.py | 5 +++-- cirq-core/cirq/ops/raw_types.py | 19 ++++-------------- cirq-core/cirq/ops/raw_types_test.py | 7 ++++--- .../cirq/ops/state_preparation_channel.py | 3 ++- cirq-core/cirq/ops/three_qubit_gates.py | 5 +++-- cirq-core/cirq/ops/two_qubit_diagonal_gate.py | 5 +++-- .../cirq/ops/uniform_superposition_gate.py | 3 ++- cirq-core/cirq/ops/wait_gate.py | 5 +++-- cirq-core/cirq/protocols/act_on_protocol.py | 3 ++- .../cirq/protocols/act_on_protocol_test.py | 3 ++- .../cirq/protocols/apply_channel_protocol.py | 3 ++- .../cirq/protocols/apply_mixture_protocol.py | 3 ++- .../protocols/apply_mixture_protocol_test.py | 3 ++- .../cirq/protocols/apply_unitary_protocol.py | 3 ++- .../approximate_equality_protocol.py | 3 ++- .../circuit_diagram_info_protocol.py | 3 ++- .../cirq/protocols/decompose_protocol.py | 14 ++----------- .../cirq/protocols/hash_from_pickle_test.py | 4 ++-- cirq-core/cirq/protocols/inverse_protocol.py | 3 ++- .../cirq/protocols/json_serialization.py | 3 ++- cirq-core/cirq/protocols/kraus_protocol.py | 3 ++- .../cirq/protocols/kraus_protocol_test.py | 2 +- .../protocols/measurement_key_protocol.py | 3 ++- cirq-core/cirq/protocols/mixture_protocol.py | 3 ++- cirq-core/cirq/protocols/pow_protocol.py | 3 ++- cirq-core/cirq/protocols/qasm.py | 3 ++- .../cirq/protocols/qid_shape_protocol.py | 3 ++- .../cirq/protocols/resolve_parameters.py | 9 +++++---- .../cirq/protocols/trace_distance_bound.py | 3 ++- cirq-core/cirq/qis/channels.py | 2 +- cirq-core/cirq/qis/channels_test.py | 2 +- cirq-core/cirq/qis/clifford_tableau.py | 3 ++- cirq-core/cirq/qis/entropy.py | 4 ++-- .../cirq/qis/quantum_state_representation.py | 3 ++- cirq-core/cirq/qis/states.py | 3 ++- cirq-core/cirq/sim/classical_simulator.py | 3 ++- .../cirq/sim/clifford/clifford_simulator.py | 3 ++- .../clifford_tableau_simulation_state.py | 3 ++- .../stabilizer_ch_form_simulation_state.py | 3 ++- .../cirq/sim/clifford/stabilizer_sampler.py | 2 +- .../clifford/stabilizer_simulation_state.py | 3 ++- .../sim/clifford/stabilizer_state_ch_form.py | 3 ++- .../sim/density_matrix_simulation_state.py | 3 ++- .../cirq/sim/density_matrix_simulator.py | 3 ++- cirq-core/cirq/sim/density_matrix_utils.py | 3 ++- cirq-core/cirq/sim/mux.py | 3 ++- .../cirq/sim/simulation_product_state.py | 3 ++- .../cirq/sim/simulation_product_state_test.py | 3 ++- cirq-core/cirq/sim/simulation_state.py | 3 ++- cirq-core/cirq/sim/simulation_state_base.py | 3 ++- cirq-core/cirq/sim/simulation_state_test.py | 3 ++- cirq-core/cirq/sim/simulation_utils.py | 3 ++- cirq-core/cirq/sim/simulator.py | 3 ++- cirq-core/cirq/sim/simulator_base.py | 3 ++- cirq-core/cirq/sim/simulator_base_test.py | 3 ++- cirq-core/cirq/sim/simulator_test.py | 3 ++- cirq-core/cirq/sim/sparse_simulator.py | 3 ++- cirq-core/cirq/sim/state_vector.py | 3 ++- .../cirq/sim/state_vector_simulation_state.py | 3 ++- cirq-core/cirq/sim/state_vector_simulator.py | 3 ++- cirq-core/cirq/sim/state_vector_test.py | 2 +- cirq-core/cirq/study/flatten_expressions.py | 3 ++- cirq-core/cirq/study/resolver.py | 3 ++- cirq-core/cirq/study/result.py | 3 ++- cirq-core/cirq/study/sweepable.py | 3 ++- cirq-core/cirq/study/sweeps.py | 3 ++- cirq-core/cirq/testing/circuit_compare.py | 3 ++- .../cirq/testing/consistent_act_on_test.py | 2 +- .../testing/consistent_controlled_gate_op.py | 2 +- .../consistent_controlled_gate_op_test.py | 3 ++- .../cirq/testing/consistent_protocols.py | 3 ++- .../cirq/testing/consistent_protocols_test.py | 6 +++--- cirq-core/cirq/testing/consistent_qasm.py | 3 ++- cirq-core/cirq/testing/deprecation.py | 2 +- cirq-core/cirq/testing/devices.py | 5 +++-- cirq-core/cirq/testing/equals_tester.py | 3 ++- .../cirq/testing/equivalent_basis_map.py | 2 +- cirq-core/cirq/testing/json.py | 3 ++- cirq-core/cirq/testing/logs.py | 2 +- cirq-core/cirq/testing/pytest_utils.py | 3 ++- cirq-core/cirq/testing/random_circuit.py | 3 ++- cirq-core/cirq/testing/random_circuit_test.py | 3 ++- .../cirq/transformers/_connected_component.py | 3 ++- .../clifford_decomposition.py | 3 ++- .../controlled_gate_decomposition.py | 3 ++- .../cphase_to_fsim.py | 3 ++- .../cphase_to_fsim_test.py | 2 +- .../quantum_shannon_decomposition.py | 3 ++- .../single_qubit_decompositions_test.py | 2 +- .../three_qubit_decomposition.py | 2 +- .../two_qubit_state_preparation_test.py | 2 +- .../two_qubit_to_cz.py | 3 ++- .../two_qubit_to_fsim.py | 3 ++- .../two_qubit_to_ms.py | 3 ++- .../two_qubit_to_sqrt_iswap.py | 3 ++- .../two_qubit_to_sqrt_iswap_test.py | 2 +- .../transformers/dynamical_decoupling_test.py | 2 +- .../cirq/transformers/eject_phased_paulis.py | 3 ++- .../transformers/eject_phased_paulis_test.py | 3 ++- cirq-core/cirq/transformers/eject_z.py | 3 ++- .../cirq/transformers/expand_composite.py | 3 ++- .../gauge_compiling/gauge_compiling.py | 3 ++- .../gauge_compiling/idle_moments_gauge.py | 3 ++- .../gauge_compiling/sqrt_cz_gauge.py | 3 ++- .../gate_tabulation_math_utils.py | 2 +- .../two_qubit_gate_tabulation.py | 3 ++- .../transformers/measurement_transformers.py | 3 ++- .../cirq/transformers/merge_k_qubit_gates.py | 3 ++- .../transformers/merge_single_qubit_gates.py | 3 ++- .../optimize_for_target_gateset.py | 3 ++- .../qubit_management_transformers_test.py | 2 +- .../transformers/routing/mapping_manager.py | 3 ++- .../transformers/routing/route_circuit_cqc.py | 3 ++- cirq-core/cirq/transformers/stratify.py | 3 ++- cirq-core/cirq/transformers/symbolize.py | 3 ++- .../cirq/transformers/tag_transformers.py | 3 ++- .../compilation_target_gateset.py | 3 ++- .../target_gatesets/cz_gateset.py | 3 ++- .../target_gatesets/cz_gateset_test.py | 2 +- .../target_gatesets/sqrt_iswap_gateset.py | 3 ++- .../cirq/transformers/transformer_api.py | 3 ++- .../transformers/transformer_primitives.py | 3 ++- .../transformer_primitives_test.py | 2 +- cirq-core/cirq/value/abc_alt.py | 3 ++- cirq-core/cirq/value/classical_data.py | 3 ++- cirq-core/cirq/value/condition.py | 3 ++- cirq-core/cirq/value/digits.py | 3 ++- cirq-core/cirq/value/duration.py | 5 +++-- cirq-core/cirq/value/linear_dict.py | 13 ++++-------- cirq-core/cirq/value/measurement_key.py | 3 ++- cirq-core/cirq/value/periodic_value.py | 5 +++-- cirq-core/cirq/value/product_state.py | 3 ++- cirq-core/cirq/value/value_equality_attr.py | 3 ++- cirq-core/cirq/vis/heatmap.py | 3 ++- cirq-core/cirq/vis/histogram.py | 3 ++- cirq-core/cirq/vis/state_histogram.py | 3 ++- cirq-core/cirq/work/collector.py | 3 ++- cirq-core/cirq/work/observable_grouping.py | 3 ++- cirq-core/cirq/work/observable_measurement.py | 3 ++- .../cirq/work/observable_measurement_data.py | 3 ++- .../cirq/work/observable_measurement_test.py | 2 +- .../work/observable_readout_calibration.py | 3 ++- .../observable_readout_calibration_test.py | 2 +- cirq-core/cirq/work/observable_settings.py | 3 ++- cirq-core/cirq/work/sampler.py | 3 ++- cirq-core/cirq/work/sampler_test.py | 2 +- cirq-google/cirq_google/api/v1/programs.py | 3 ++- cirq-google/cirq_google/api/v2/results.py | 3 ++- cirq-google/cirq_google/api/v2/run_context.py | 2 +- cirq-google/cirq_google/api/v2/sweeps.py | 3 ++- cirq-google/cirq_google/api/v2/sweeps_test.py | 2 +- .../devices/google_noise_properties.py | 3 ++- .../cirq_google/devices/grid_device.py | 3 ++- .../cirq_google/devices/known_devices.py | 3 ++- .../cirq_google/engine/abstract_engine.py | 3 ++- .../cirq_google/engine/abstract_job.py | 3 ++- .../engine/abstract_local_engine.py | 3 ++- .../engine/abstract_local_job_test.py | 3 ++- .../engine/abstract_local_program.py | 3 ++- .../cirq_google/engine/abstract_program.py | 3 ++- .../cirq_google/engine/asyncio_executor.py | 3 ++- cirq-google/cirq_google/engine/calibration.py | 3 ++- .../cirq_google/engine/engine_client.py | 3 ++- cirq-google/cirq_google/engine/engine_job.py | 3 ++- .../cirq_google/engine/engine_program.py | 3 ++- .../cirq_google/engine/engine_result.py | 3 ++- .../cirq_google/engine/engine_result_test.py | 3 ++- .../cirq_google/engine/engine_validator.py | 3 ++- .../cirq_google/engine/processor_sampler.py | 3 ++- .../cirq_google/engine/qcs_notebook.py | 3 ++- .../cirq_google/engine/runtime_estimator.py | 2 +- .../cirq_google/engine/simulated_local_job.py | 3 ++- .../cirq_google/engine/stream_manager.py | 3 ++- .../cirq_google/engine/stream_manager_test.py | 2 +- .../cirq_google/engine/validating_sampler.py | 2 +- .../analog_trajectory_util.py | 5 +++-- .../experimental/noise_models/noise_models.py | 3 ++- .../experimental/ops/coupler_pulse.py | 6 ++++-- .../cirq_google/line/placement/anneal.py | 3 ++- .../cirq_google/line/placement/anneal_test.py | 2 +- .../cirq_google/line/placement/chip_test.py | 2 +- .../cirq_google/line/placement/greedy_test.py | 2 +- .../line/placement/optimization.py | 3 ++- .../cirq_google/line/placement/sequence.py | 2 +- .../cirq_google/ops/analog_detune_gates.py | 7 ++++--- .../cirq_google/ops/fsim_gate_family.py | 3 ++- cirq-google/cirq_google/ops/internal_gate.py | 4 ++-- .../serialization/arg_func_langs.py | 3 ++- .../serialization/circuit_serializer.py | 4 ++-- .../cirq_google/study/device_parameter.py | 3 ++- .../study/finite_random_variable.py | 4 ++-- cirq-google/cirq_google/study/symbol_util.py | 5 +++-- .../two_qubit_to_sycamore.py | 2 +- .../target_gatesets/google_cz_gateset.py | 3 ++- .../target_gatesets/sycamore_gateset.py | 3 ++- .../cirq_google/workflow/_device_shim.py | 3 ++- .../workflow/quantum_executable.py | 3 ++- .../cirq_google/workflow/qubit_placement.py | 3 ++- cirq-ionq/cirq_ionq/ionq_client.py | 3 ++- cirq-ionq/cirq_ionq/ionq_devices.py | 2 +- cirq-ionq/cirq_ionq/ionq_gateset.py | 3 ++- cirq-ionq/cirq_ionq/ionq_native_gates.py | 3 ++- .../cirq_ionq/ionq_native_target_gateset.py | 3 ++- cirq-ionq/cirq_ionq/job.py | 3 ++- cirq-ionq/cirq_ionq/results.py | 3 ++- cirq-ionq/cirq_ionq/sampler.py | 3 ++- cirq-ionq/cirq_ionq/serializer.py | 3 ++- cirq-ionq/cirq_ionq/service.py | 2 +- cirq-pasqal/cirq_pasqal/pasqal_device.py | 3 ++- cirq-pasqal/cirq_pasqal/pasqal_noise_model.py | 3 ++- cirq-web/cirq_web/circuits/circuit.py | 2 +- cirq-web/cirq_web/circuits/symbols.py | 2 +- dev_tools/bash_scripts_test.py | 3 ++- dev_tools/docs/run_doctest.py | 3 ++- dev_tools/env_tools.py | 3 ++- dev_tools/modules_test.py | 2 +- dev_tools/notebooks/notebook_test.py | 2 +- dev_tools/profiling/live_plot_collector.py | 2 +- dev_tools/snippets_test.py | 4 +++- examples/shor.py | 2 +- examples/swap_networks.py | 3 ++- pyproject.toml | 1 + 395 files changed, 768 insertions(+), 539 deletions(-) diff --git a/benchmarks/circuit_construction.py b/benchmarks/circuit_construction.py index fbcc023e44c..950d2fbb745 100644 --- a/benchmarks/circuit_construction.py +++ b/benchmarks/circuit_construction.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. import itertools -from typing import Sequence +from collections.abc import Sequence import cirq diff --git a/benchmarks/randomized_benchmarking.py b/benchmarks/randomized_benchmarking.py index 363a1534951..0e9a6d36ab9 100644 --- a/benchmarks/randomized_benchmarking.py +++ b/benchmarks/randomized_benchmarking.py @@ -13,7 +13,7 @@ # limitations under the License. import functools -from typing import Sequence +from collections.abc import Sequence import numpy as np diff --git a/cirq-aqt/cirq_aqt/aqt_device.py b/cirq-aqt/cirq_aqt/aqt_device.py index 619e5b43979..670cadca157 100644 --- a/cirq-aqt/cirq_aqt/aqt_device.py +++ b/cirq-aqt/cirq_aqt/aqt_device.py @@ -27,8 +27,9 @@ from __future__ import annotations import json +from collections.abc import Iterable, Sequence from enum import Enum -from typing import Any, cast, Iterable, Sequence +from typing import Any, cast import networkx as nx import numpy as np diff --git a/cirq-aqt/cirq_aqt/aqt_device_metadata.py b/cirq-aqt/cirq_aqt/aqt_device_metadata.py index 57b574cfd27..6b1bbfc82ec 100644 --- a/cirq-aqt/cirq_aqt/aqt_device_metadata.py +++ b/cirq-aqt/cirq_aqt/aqt_device_metadata.py @@ -16,7 +16,8 @@ from __future__ import annotations -from typing import Any, Iterable, Mapping +from collections.abc import Iterable, Mapping +from typing import Any import networkx as nx diff --git a/cirq-aqt/cirq_aqt/aqt_sampler.py b/cirq-aqt/cirq_aqt/aqt_sampler.py index b92532d1718..e4b6947fe9d 100644 --- a/cirq-aqt/cirq_aqt/aqt_sampler.py +++ b/cirq-aqt/cirq_aqt/aqt_sampler.py @@ -27,7 +27,8 @@ import json import time import uuid -from typing import Callable, cast, Literal, Sequence, TypedDict +from collections.abc import Callable, Sequence +from typing import cast, Literal, TypedDict from urllib.parse import urljoin import numpy as np diff --git a/cirq-core/cirq/_compat.py b/cirq-core/cirq/_compat.py index 505d7d10f20..e9b4eecf814 100644 --- a/cirq-core/cirq/_compat.py +++ b/cirq-core/cirq/_compat.py @@ -27,8 +27,9 @@ import sys import traceback import warnings +from collections.abc import Callable, Iterator from types import ModuleType -from typing import Any, Callable, Iterator, overload, TypeVar +from typing import Any, overload, TypeVar import numpy as np import pandas as pd diff --git a/cirq-core/cirq/_compat_test.py b/cirq-core/cirq/_compat_test.py index 8f38756c16b..6dd79202394 100644 --- a/cirq-core/cirq/_compat_test.py +++ b/cirq-core/cirq/_compat_test.py @@ -25,9 +25,10 @@ import traceback import types import warnings +from collections.abc import Callable from importlib.machinery import ModuleSpec from types import ModuleType -from typing import Any, Callable +from typing import Any from unittest import mock import duet diff --git a/cirq-core/cirq/_import.py b/cirq-core/cirq/_import.py index 8095daf752b..e85c221b786 100644 --- a/cirq-core/cirq/_import.py +++ b/cirq-core/cirq/_import.py @@ -16,12 +16,13 @@ import importlib import sys +from collections.abc import Callable from contextlib import contextmanager from importlib import abc from importlib.abc import Loader from importlib.machinery import ModuleSpec from types import ModuleType -from typing import Any, Callable, cast +from typing import Any, cast class InstrumentedFinder(abc.MetaPathFinder): diff --git a/cirq-core/cirq/circuits/_bucket_priority_queue.py b/cirq-core/cirq/circuits/_bucket_priority_queue.py index 034d7b2bc77..0ed08a8ff92 100644 --- a/cirq-core/cirq/circuits/_bucket_priority_queue.py +++ b/cirq-core/cirq/circuits/_bucket_priority_queue.py @@ -14,7 +14,8 @@ from __future__ import annotations -from typing import Any, Generic, Iterable, Iterator, TypeVar +from collections.abc import Iterable, Iterator +from typing import Any, Generic, TypeVar TItem = TypeVar('TItem') diff --git a/cirq-core/cirq/circuits/circuit.py b/cirq-core/cirq/circuits/circuit.py index a4eb0227ee1..c1b836a1ff1 100644 --- a/cirq-core/cirq/circuits/circuit.py +++ b/cirq-core/cirq/circuits/circuit.py @@ -27,24 +27,18 @@ import itertools import math from collections import defaultdict -from types import NotImplementedType -from typing import ( - AbstractSet, - Any, +from collections.abc import ( Callable, - cast, Hashable, Iterable, Iterator, Mapping, MutableSequence, - overload, - Self, Sequence, - TYPE_CHECKING, - TypeVar, - Union, + Set, ) +from types import NotImplementedType +from typing import Any, cast, overload, Self, TYPE_CHECKING, TypeVar, Union import networkx import numpy as np @@ -1341,7 +1335,7 @@ def _is_parameterized_(self) -> bool: protocols.is_parameterized(tag) for tag in self.tags ) - def _parameter_names_(self) -> AbstractSet[str]: + def _parameter_names_(self) -> Set[str]: op_params = {name for op in self.all_operations() for name in protocols.parameter_names(op)} tag_params = {name for tag in self.tags for name in protocols.parameter_names(tag)} return op_params | tag_params @@ -1845,7 +1839,7 @@ def __init__( self._frozen: cirq.FrozenCircuit | None = None self._is_measurement: bool | None = None self._is_parameterized: bool | None = None - self._parameter_names: AbstractSet[str] | None = None + self._parameter_names: Set[str] | None = None if not contents: return flattened_contents = tuple(ops.flatten_to_ops_or_moments(contents)) @@ -1954,7 +1948,7 @@ def _is_parameterized_(self) -> bool: self._is_parameterized = super()._is_parameterized_() return self._is_parameterized - def _parameter_names_(self) -> AbstractSet[str]: + def _parameter_names_(self) -> Set[str]: if self._parameter_names is None: self._parameter_names = super()._parameter_names_() return self._parameter_names diff --git a/cirq-core/cirq/circuits/circuit_operation.py b/cirq-core/cirq/circuits/circuit_operation.py index b7632768975..66d37c3898d 100644 --- a/cirq-core/cirq/circuits/circuit_operation.py +++ b/cirq-core/cirq/circuits/circuit_operation.py @@ -22,8 +22,9 @@ from __future__ import annotations import math +from collections.abc import Callable, Iterator, Mapping, Sequence from functools import cached_property -from typing import Any, Callable, cast, Iterator, Mapping, Sequence, TYPE_CHECKING, TypeAlias +from typing import Any, cast, TYPE_CHECKING, TypeAlias import numpy as np import sympy diff --git a/cirq-core/cirq/circuits/circuit_test.py b/cirq-core/cirq/circuits/circuit_test.py index cd8f7b00c70..eb3a8de36e8 100644 --- a/cirq-core/cirq/circuits/circuit_test.py +++ b/cirq-core/cirq/circuits/circuit_test.py @@ -18,8 +18,8 @@ import os import time from collections import defaultdict +from collections.abc import Iterator, Sequence from random import randint, random, randrange, sample -from typing import Iterator, Sequence import numpy as np import pytest diff --git a/cirq-core/cirq/circuits/frozen_circuit.py b/cirq-core/cirq/circuits/frozen_circuit.py index 2aa8d401bda..91d312e15fc 100644 --- a/cirq-core/cirq/circuits/frozen_circuit.py +++ b/cirq-core/cirq/circuits/frozen_circuit.py @@ -16,9 +16,10 @@ from __future__ import annotations +from collections.abc import Hashable, Iterable, Iterator, Sequence, Set from functools import cached_property from types import NotImplementedType -from typing import AbstractSet, Hashable, Iterable, Iterator, Sequence, TYPE_CHECKING +from typing import TYPE_CHECKING from cirq import _compat, protocols from cirq.circuits import AbstractCircuit, Alignment, Circuit @@ -172,7 +173,7 @@ def _is_parameterized_(self) -> bool: return super()._is_parameterized_() @_compat.cached_method - def _parameter_names_(self) -> AbstractSet[str]: + def _parameter_names_(self) -> Set[str]: return super()._parameter_names_() def _measurement_key_names_(self) -> frozenset[str]: diff --git a/cirq-core/cirq/circuits/moment.py b/cirq-core/cirq/circuits/moment.py index 414e2fab0f2..3eaec877251 100644 --- a/cirq-core/cirq/circuits/moment.py +++ b/cirq-core/cirq/circuits/moment.py @@ -17,22 +17,10 @@ from __future__ import annotations import itertools +from collections.abc import Callable, Hashable, Iterable, Iterator, Mapping, Sequence, Set from functools import cached_property from types import NotImplementedType -from typing import ( - AbstractSet, - Any, - Callable, - cast, - Hashable, - Iterable, - Iterator, - Mapping, - overload, - Self, - Sequence, - TYPE_CHECKING, -) +from typing import Any, cast, overload, Self, TYPE_CHECKING import numpy as np @@ -307,7 +295,7 @@ def _is_parameterized_(self) -> bool: return any(protocols.is_parameterized(op) for op in self) @_compat.cached_method() - def _parameter_names_(self) -> AbstractSet[str]: + def _parameter_names_(self) -> Set[str]: return {name for op in self for name in protocols.parameter_names(op)} def _resolve_parameters_(self, resolver: cirq.ParamResolver, recursive: bool) -> cirq.Moment: diff --git a/cirq-core/cirq/circuits/optimization_pass.py b/cirq-core/cirq/circuits/optimization_pass.py index e160151cb6f..0cd9d81552f 100644 --- a/cirq-core/cirq/circuits/optimization_pass.py +++ b/cirq-core/cirq/circuits/optimization_pass.py @@ -18,7 +18,8 @@ import abc from collections import defaultdict -from typing import Callable, cast, Iterable, Sequence, TYPE_CHECKING +from collections.abc import Callable, Iterable, Sequence +from typing import cast, TYPE_CHECKING from cirq import ops diff --git a/cirq-core/cirq/circuits/qasm_output.py b/cirq-core/cirq/circuits/qasm_output.py index 9810cde712e..971d8c2e72d 100644 --- a/cirq-core/cirq/circuits/qasm_output.py +++ b/cirq-core/cirq/circuits/qasm_output.py @@ -17,7 +17,8 @@ from __future__ import annotations import re -from typing import Callable, Iterator, Sequence, TYPE_CHECKING +from collections.abc import Callable, Iterator, Sequence +from typing import TYPE_CHECKING import numpy as np diff --git a/cirq-core/cirq/circuits/text_diagram_drawer.py b/cirq-core/cirq/circuits/text_diagram_drawer.py index 80c078f3e02..fdae7fa4564 100644 --- a/cirq-core/cirq/circuits/text_diagram_drawer.py +++ b/cirq-core/cirq/circuits/text_diagram_drawer.py @@ -14,7 +14,8 @@ from __future__ import annotations -from typing import Any, Callable, cast, Iterable, Mapping, NamedTuple, Self, Sequence, TYPE_CHECKING +from collections.abc import Callable, Iterable, Mapping, Sequence +from typing import Any, cast, NamedTuple, Self, TYPE_CHECKING import numpy as np diff --git a/cirq-core/cirq/contrib/acquaintance/bipartite.py b/cirq-core/cirq/contrib/acquaintance/bipartite.py index b1243d8b785..3e30e54aefd 100644 --- a/cirq-core/cirq/contrib/acquaintance/bipartite.py +++ b/cirq-core/cirq/contrib/acquaintance/bipartite.py @@ -16,7 +16,8 @@ import enum import itertools -from typing import Iterator, Sequence, TYPE_CHECKING +from collections.abc import Iterator, Sequence +from typing import TYPE_CHECKING from cirq import ops from cirq.contrib.acquaintance.gates import acquaint diff --git a/cirq-core/cirq/contrib/acquaintance/executor.py b/cirq-core/cirq/contrib/acquaintance/executor.py index ea31bc8c938..eee237da59d 100644 --- a/cirq-core/cirq/contrib/acquaintance/executor.py +++ b/cirq-core/cirq/contrib/acquaintance/executor.py @@ -16,7 +16,8 @@ import abc from collections import defaultdict -from typing import Iterator, Sequence, TYPE_CHECKING +from collections.abc import Iterator, Sequence +from typing import TYPE_CHECKING from cirq import circuits, devices, ops, protocols, transformers from cirq.contrib.acquaintance.gates import AcquaintanceOpportunityGate diff --git a/cirq-core/cirq/contrib/acquaintance/executor_test.py b/cirq-core/cirq/contrib/acquaintance/executor_test.py index 83f29b7cda8..5003882c492 100644 --- a/cirq-core/cirq/contrib/acquaintance/executor_test.py +++ b/cirq-core/cirq/contrib/acquaintance/executor_test.py @@ -14,9 +14,10 @@ from __future__ import annotations +from collections.abc import Sequence from itertools import combinations from string import ascii_lowercase -from typing import Any, Sequence +from typing import Any import numpy as np import pytest diff --git a/cirq-core/cirq/contrib/acquaintance/gates.py b/cirq-core/cirq/contrib/acquaintance/gates.py index cf9db5c289f..c2df6406805 100644 --- a/cirq-core/cirq/contrib/acquaintance/gates.py +++ b/cirq-core/cirq/contrib/acquaintance/gates.py @@ -18,7 +18,8 @@ import itertools import math import operator -from typing import Iterable, Iterator, NamedTuple, Sequence, TYPE_CHECKING +from collections.abc import Iterable, Iterator, Sequence +from typing import NamedTuple, TYPE_CHECKING from cirq import ops, protocols, value from cirq.contrib.acquaintance.permutation import ( diff --git a/cirq-core/cirq/contrib/acquaintance/gates_test.py b/cirq-core/cirq/contrib/acquaintance/gates_test.py index 21546dac50c..ddaddaa176e 100644 --- a/cirq-core/cirq/contrib/acquaintance/gates_test.py +++ b/cirq-core/cirq/contrib/acquaintance/gates_test.py @@ -14,10 +14,10 @@ from __future__ import annotations +from collections.abc import Sequence from itertools import combinations, product from random import randint from string import ascii_lowercase as alphabet -from typing import Sequence import numpy import pytest diff --git a/cirq-core/cirq/contrib/acquaintance/inspection_utils.py b/cirq-core/cirq/contrib/acquaintance/inspection_utils.py index bd7f2714005..448094589b4 100644 --- a/cirq-core/cirq/contrib/acquaintance/inspection_utils.py +++ b/cirq-core/cirq/contrib/acquaintance/inspection_utils.py @@ -14,7 +14,8 @@ from __future__ import annotations -from typing import Iterator, Sequence, TYPE_CHECKING +from collections.abc import Iterator, Sequence +from typing import TYPE_CHECKING from cirq import devices from cirq.contrib import circuitdag diff --git a/cirq-core/cirq/contrib/acquaintance/mutation_utils.py b/cirq-core/cirq/contrib/acquaintance/mutation_utils.py index b18ee69fcbc..660be53540f 100644 --- a/cirq-core/cirq/contrib/acquaintance/mutation_utils.py +++ b/cirq-core/cirq/contrib/acquaintance/mutation_utils.py @@ -15,7 +15,8 @@ from __future__ import annotations import collections -from typing import cast, Sequence, TYPE_CHECKING +from collections.abc import Sequence +from typing import cast, TYPE_CHECKING from cirq import circuits, ops, transformers from cirq.contrib.acquaintance.devices import get_acquaintance_size diff --git a/cirq-core/cirq/contrib/acquaintance/optimizers.py b/cirq-core/cirq/contrib/acquaintance/optimizers.py index ed908ed6cb4..bdce8f6b054 100644 --- a/cirq-core/cirq/contrib/acquaintance/optimizers.py +++ b/cirq-core/cirq/contrib/acquaintance/optimizers.py @@ -14,7 +14,8 @@ from __future__ import annotations -from typing import cast, Sequence, TYPE_CHECKING +from collections.abc import Sequence +from typing import cast, TYPE_CHECKING from cirq import circuits from cirq.contrib.acquaintance.executor import AcquaintanceOperation diff --git a/cirq-core/cirq/contrib/acquaintance/permutation.py b/cirq-core/cirq/contrib/acquaintance/permutation.py index 192d39949e0..db53c8a17bc 100644 --- a/cirq-core/cirq/contrib/acquaintance/permutation.py +++ b/cirq-core/cirq/contrib/acquaintance/permutation.py @@ -15,8 +15,9 @@ from __future__ import annotations import abc +from collections.abc import Iterable, Iterator, Sequence from types import NotImplementedType -from typing import Any, cast, Iterable, Iterator, Sequence, TYPE_CHECKING, TypeVar +from typing import Any, cast, TYPE_CHECKING, TypeVar from cirq import circuits, ops, protocols, transformers, value diff --git a/cirq-core/cirq/contrib/acquaintance/permutation_test.py b/cirq-core/cirq/contrib/acquaintance/permutation_test.py index 5d06bc8d5b3..9147d2ec609 100644 --- a/cirq-core/cirq/contrib/acquaintance/permutation_test.py +++ b/cirq-core/cirq/contrib/acquaintance/permutation_test.py @@ -15,7 +15,7 @@ from __future__ import annotations import random -from typing import Iterator +from collections.abc import Iterator import pytest diff --git a/cirq-core/cirq/contrib/acquaintance/shift.py b/cirq-core/cirq/contrib/acquaintance/shift.py index e328d425b13..9bfbfcf285d 100644 --- a/cirq-core/cirq/contrib/acquaintance/shift.py +++ b/cirq-core/cirq/contrib/acquaintance/shift.py @@ -15,7 +15,8 @@ from __future__ import annotations import itertools -from typing import Any, Iterator, Sequence, TYPE_CHECKING +from collections.abc import Iterator, Sequence +from typing import Any, TYPE_CHECKING from cirq import ops, value from cirq.contrib.acquaintance.permutation import PermutationGate, SwapPermutationGate diff --git a/cirq-core/cirq/contrib/acquaintance/shift_swap_network.py b/cirq-core/cirq/contrib/acquaintance/shift_swap_network.py index 2e042f726a2..4ba5291597d 100644 --- a/cirq-core/cirq/contrib/acquaintance/shift_swap_network.py +++ b/cirq-core/cirq/contrib/acquaintance/shift_swap_network.py @@ -16,7 +16,8 @@ import functools import itertools -from typing import Iterable, Iterator, Sequence, TYPE_CHECKING +from collections.abc import Iterable, Iterator, Sequence +from typing import TYPE_CHECKING from cirq import ops from cirq.contrib.acquaintance.gates import acquaint diff --git a/cirq-core/cirq/contrib/acquaintance/strategies/complete.py b/cirq-core/cirq/contrib/acquaintance/strategies/complete.py index 04d24579317..3e5d6aac321 100755 --- a/cirq-core/cirq/contrib/acquaintance/strategies/complete.py +++ b/cirq-core/cirq/contrib/acquaintance/strategies/complete.py @@ -14,7 +14,8 @@ from __future__ import annotations -from typing import Sequence, TYPE_CHECKING +from collections.abc import Sequence +from typing import TYPE_CHECKING from cirq import circuits, ops from cirq.contrib.acquaintance.gates import acquaint diff --git a/cirq-core/cirq/contrib/acquaintance/strategies/cubic.py b/cirq-core/cirq/contrib/acquaintance/strategies/cubic.py index 35e58924315..db7d99385eb 100644 --- a/cirq-core/cirq/contrib/acquaintance/strategies/cubic.py +++ b/cirq-core/cirq/contrib/acquaintance/strategies/cubic.py @@ -15,7 +15,8 @@ from __future__ import annotations import itertools -from typing import Iterable, Sequence, TYPE_CHECKING, TypeVar +from collections.abc import Iterable, Sequence +from typing import TYPE_CHECKING, TypeVar from cirq import circuits, ops from cirq.contrib.acquaintance.gates import acquaint diff --git a/cirq-core/cirq/contrib/acquaintance/strategies/quartic_paired.py b/cirq-core/cirq/contrib/acquaintance/strategies/quartic_paired.py index 456c56d9d4c..35736ea496f 100644 --- a/cirq-core/cirq/contrib/acquaintance/strategies/quartic_paired.py +++ b/cirq-core/cirq/contrib/acquaintance/strategies/quartic_paired.py @@ -14,7 +14,8 @@ from __future__ import annotations -from typing import cast, Iterable, Sequence, TYPE_CHECKING +from collections.abc import Iterable, Sequence +from typing import cast, TYPE_CHECKING from cirq import circuits from cirq.contrib.acquaintance.gates import acquaint, SwapNetworkGate diff --git a/cirq-core/cirq/contrib/acquaintance/strategies/quartic_paired_test.py b/cirq-core/cirq/contrib/acquaintance/strategies/quartic_paired_test.py index 6a8385524c4..9005a46dd71 100644 --- a/cirq-core/cirq/contrib/acquaintance/strategies/quartic_paired_test.py +++ b/cirq-core/cirq/contrib/acquaintance/strategies/quartic_paired_test.py @@ -16,7 +16,7 @@ import itertools import random -from typing import Iterable +from collections.abc import Iterable import pytest diff --git a/cirq-core/cirq/contrib/acquaintance/testing.py b/cirq-core/cirq/contrib/acquaintance/testing.py index dafd75fe55e..3a0e619b310 100644 --- a/cirq-core/cirq/contrib/acquaintance/testing.py +++ b/cirq-core/cirq/contrib/acquaintance/testing.py @@ -14,7 +14,8 @@ from __future__ import annotations -from typing import cast, Sequence, TYPE_CHECKING +from collections.abc import Sequence +from typing import cast, TYPE_CHECKING from cirq import devices, ops, protocols from cirq.contrib.acquaintance.permutation import PermutationGate, update_mapping diff --git a/cirq-core/cirq/contrib/acquaintance/topological_sort.py b/cirq-core/cirq/contrib/acquaintance/topological_sort.py index 28682b4400b..cf51ef87b1b 100644 --- a/cirq-core/cirq/contrib/acquaintance/topological_sort.py +++ b/cirq-core/cirq/contrib/acquaintance/topological_sort.py @@ -16,7 +16,8 @@ import operator import random -from typing import Any, Callable, cast, Iterable, TYPE_CHECKING +from collections.abc import Callable, Iterable +from typing import Any, cast, TYPE_CHECKING from cirq import ops diff --git a/cirq-core/cirq/contrib/bayesian_network/bayesian_network_gate.py b/cirq-core/cirq/contrib/bayesian_network/bayesian_network_gate.py index 5e2bed9d6d8..0b6f69962c5 100644 --- a/cirq-core/cirq/contrib/bayesian_network/bayesian_network_gate.py +++ b/cirq-core/cirq/contrib/bayesian_network/bayesian_network_gate.py @@ -15,7 +15,8 @@ from __future__ import annotations import math -from typing import Any, cast, Iterator, Sequence, TYPE_CHECKING +from collections.abc import Iterator, Sequence +from typing import Any, cast, TYPE_CHECKING from sympy.combinatorics import GrayCode diff --git a/cirq-core/cirq/contrib/circuitdag/circuit_dag.py b/cirq-core/cirq/contrib/circuitdag/circuit_dag.py index f270979cdc1..4d2750e411c 100644 --- a/cirq-core/cirq/contrib/circuitdag/circuit_dag.py +++ b/cirq-core/cirq/contrib/circuitdag/circuit_dag.py @@ -15,7 +15,8 @@ from __future__ import annotations import functools -from typing import Any, Callable, cast, Generic, Iterator, TypeVar +from collections.abc import Callable, Iterator +from typing import Any, cast, Generic, TypeVar import networkx diff --git a/cirq-core/cirq/contrib/custom_simulators/custom_state_simulator.py b/cirq-core/cirq/contrib/custom_simulators/custom_state_simulator.py index c3b394dab13..ef4fdfe1534 100644 --- a/cirq-core/cirq/contrib/custom_simulators/custom_state_simulator.py +++ b/cirq-core/cirq/contrib/custom_simulators/custom_state_simulator.py @@ -14,7 +14,8 @@ from __future__ import annotations -from typing import Any, Generic, Sequence, TYPE_CHECKING +from collections.abc import Sequence +from typing import Any, Generic, TYPE_CHECKING from cirq import sim from cirq.sim.simulation_state import TSimulationState diff --git a/cirq-core/cirq/contrib/custom_simulators/custom_state_simulator_test.py b/cirq-core/cirq/contrib/custom_simulators/custom_state_simulator_test.py index dc87c32528d..c3e4677cc0a 100644 --- a/cirq-core/cirq/contrib/custom_simulators/custom_state_simulator_test.py +++ b/cirq-core/cirq/contrib/custom_simulators/custom_state_simulator_test.py @@ -14,7 +14,7 @@ from __future__ import annotations -from typing import Sequence +from collections.abc import Sequence import numpy as np import sympy diff --git a/cirq-core/cirq/contrib/graph_device/graph_device.py b/cirq-core/cirq/contrib/graph_device/graph_device.py index 4fe54d0ad7b..49b5652a44a 100644 --- a/cirq-core/cirq/contrib/graph_device/graph_device.py +++ b/cirq-core/cirq/contrib/graph_device/graph_device.py @@ -16,7 +16,8 @@ import abc import itertools -from typing import Any, cast, Hashable, Iterable, NoReturn, TYPE_CHECKING +from collections.abc import Hashable, Iterable +from typing import Any, cast, NoReturn, TYPE_CHECKING from cirq import devices, ops, value from cirq.contrib.graph_device.hypergraph import UndirectedHypergraph diff --git a/cirq-core/cirq/contrib/graph_device/graph_device_test.py b/cirq-core/cirq/contrib/graph_device/graph_device_test.py index 54915e4b005..cfe167de076 100644 --- a/cirq-core/cirq/contrib/graph_device/graph_device_test.py +++ b/cirq-core/cirq/contrib/graph_device/graph_device_test.py @@ -14,7 +14,8 @@ from __future__ import annotations -from typing import Any, Hashable, Iterable +from collections.abc import Hashable, Iterable +from typing import Any import pytest diff --git a/cirq-core/cirq/contrib/graph_device/hypergraph.py b/cirq-core/cirq/contrib/graph_device/hypergraph.py index bd75c7036b9..4397e5fe22d 100644 --- a/cirq-core/cirq/contrib/graph_device/hypergraph.py +++ b/cirq-core/cirq/contrib/graph_device/hypergraph.py @@ -16,7 +16,8 @@ import itertools import random -from typing import Any, Hashable, Iterable, Mapping +from collections.abc import Hashable, Iterable, Mapping +from typing import Any AdjacencyList = set[frozenset[Hashable]] diff --git a/cirq-core/cirq/contrib/graph_device/uniform_graph_device.py b/cirq-core/cirq/contrib/graph_device/uniform_graph_device.py index 653f61fd716..3fd10c4bb87 100644 --- a/cirq-core/cirq/contrib/graph_device/uniform_graph_device.py +++ b/cirq-core/cirq/contrib/graph_device/uniform_graph_device.py @@ -14,7 +14,8 @@ from __future__ import annotations -from typing import Any, Hashable, Iterable, Mapping +from collections.abc import Hashable, Iterable, Mapping +from typing import Any from cirq import devices, ops from cirq.contrib.graph_device.graph_device import UndirectedGraphDevice, UndirectedGraphDeviceEdge diff --git a/cirq-core/cirq/contrib/noise_models/noise_models.py b/cirq-core/cirq/contrib/noise_models/noise_models.py index cabf2857427..a9f9ae3ae6c 100644 --- a/cirq-core/cirq/contrib/noise_models/noise_models.py +++ b/cirq-core/cirq/contrib/noise_models/noise_models.py @@ -14,7 +14,8 @@ from __future__ import annotations -from typing import Sequence, TYPE_CHECKING +from collections.abc import Sequence +from typing import TYPE_CHECKING from cirq import circuits, devices, ops, value from cirq.devices.noise_model import validate_all_measurements diff --git a/cirq-core/cirq/contrib/paulistring/optimize.py b/cirq-core/cirq/contrib/paulistring/optimize.py index 85ba8cc960d..fdf0238f5a1 100644 --- a/cirq-core/cirq/contrib/paulistring/optimize.py +++ b/cirq-core/cirq/contrib/paulistring/optimize.py @@ -14,7 +14,7 @@ from __future__ import annotations -from typing import Callable +from collections.abc import Callable from cirq import circuits, ops, transformers from cirq.contrib.paulistring.clifford_optimize import clifford_optimized_circuit diff --git a/cirq-core/cirq/contrib/paulistring/pauli_string_measurement_with_readout_mitigation.py b/cirq-core/cirq/contrib/paulistring/pauli_string_measurement_with_readout_mitigation.py index 6c7fc1e6dc5..e69d097b014 100644 --- a/cirq-core/cirq/contrib/paulistring/pauli_string_measurement_with_readout_mitigation.py +++ b/cirq-core/cirq/contrib/paulistring/pauli_string_measurement_with_readout_mitigation.py @@ -18,7 +18,8 @@ import itertools import time -from typing import cast, Sequence, TYPE_CHECKING +from collections.abc import Sequence +from typing import cast, TYPE_CHECKING import attrs import numpy as np diff --git a/cirq-core/cirq/contrib/paulistring/pauli_string_measurement_with_readout_mitigation_test.py b/cirq-core/cirq/contrib/paulistring/pauli_string_measurement_with_readout_mitigation_test.py index da367c4cfc5..2d052713078 100644 --- a/cirq-core/cirq/contrib/paulistring/pauli_string_measurement_with_readout_mitigation_test.py +++ b/cirq-core/cirq/contrib/paulistring/pauli_string_measurement_with_readout_mitigation_test.py @@ -16,7 +16,7 @@ import itertools import random -from typing import Sequence +from collections.abc import Sequence import numpy as np import pytest diff --git a/cirq-core/cirq/contrib/paulistring/recombine.py b/cirq-core/cirq/contrib/paulistring/recombine.py index 2b1de073c97..b11dd76a238 100644 --- a/cirq-core/cirq/contrib/paulistring/recombine.py +++ b/cirq-core/cirq/contrib/paulistring/recombine.py @@ -14,7 +14,8 @@ from __future__ import annotations -from typing import Any, Callable, cast, Iterable, Sequence +from collections.abc import Callable, Iterable, Sequence +from typing import Any, cast from cirq import circuits, ops, protocols from cirq.contrib import circuitdag diff --git a/cirq-core/cirq/contrib/paulistring/separate.py b/cirq-core/cirq/contrib/paulistring/separate.py index a4919962725..5d9ec4bc8ad 100644 --- a/cirq-core/cirq/contrib/paulistring/separate.py +++ b/cirq-core/cirq/contrib/paulistring/separate.py @@ -14,7 +14,7 @@ from __future__ import annotations -from typing import Iterator +from collections.abc import Iterator from cirq import circuits, ops, transformers from cirq.contrib.paulistring.clifford_target_gateset import CliffordTargetGateset diff --git a/cirq-core/cirq/contrib/qasm_import/_parser.py b/cirq-core/cirq/contrib/qasm_import/_parser.py index 29c99aa86db..70e0b4d2f0f 100644 --- a/cirq-core/cirq/contrib/qasm_import/_parser.py +++ b/cirq-core/cirq/contrib/qasm_import/_parser.py @@ -17,7 +17,8 @@ import dataclasses import functools import operator -from typing import Any, Callable, cast, Iterable, TYPE_CHECKING +from collections.abc import Callable, Iterable +from typing import Any, cast, TYPE_CHECKING import numpy as np import sympy diff --git a/cirq-core/cirq/contrib/qasm_import/_parser_test.py b/cirq-core/cirq/contrib/qasm_import/_parser_test.py index 5e2a3222dfd..b21b6f7ea86 100644 --- a/cirq-core/cirq/contrib/qasm_import/_parser_test.py +++ b/cirq-core/cirq/contrib/qasm_import/_parser_test.py @@ -16,7 +16,7 @@ import re import textwrap -from typing import Callable +from collections.abc import Callable import numpy as np import pytest diff --git a/cirq-core/cirq/contrib/quantum_volume/quantum_volume.py b/cirq-core/cirq/contrib/quantum_volume/quantum_volume.py index 676a6193689..78131e7fa1f 100644 --- a/cirq-core/cirq/contrib/quantum_volume/quantum_volume.py +++ b/cirq-core/cirq/contrib/quantum_volume/quantum_volume.py @@ -5,8 +5,9 @@ from __future__ import annotations +from collections.abc import Callable from dataclasses import dataclass -from typing import Callable, TYPE_CHECKING +from typing import TYPE_CHECKING import numpy as np diff --git a/cirq-core/cirq/contrib/quimb/density_matrix.py b/cirq-core/cirq/contrib/quimb/density_matrix.py index 0abc85fb0e0..4ae63e10450 100644 --- a/cirq-core/cirq/contrib/quimb/density_matrix.py +++ b/cirq-core/cirq/contrib/quimb/density_matrix.py @@ -2,8 +2,8 @@ from __future__ import annotations +from collections.abc import Sequence from functools import lru_cache -from typing import Sequence import numpy as np import quimb diff --git a/cirq-core/cirq/contrib/quimb/grid_circuits.py b/cirq-core/cirq/contrib/quimb/grid_circuits.py index cdf4cc66cc2..10f241532b9 100644 --- a/cirq-core/cirq/contrib/quimb/grid_circuits.py +++ b/cirq-core/cirq/contrib/quimb/grid_circuits.py @@ -14,7 +14,8 @@ from __future__ import annotations -from typing import Iterator, TYPE_CHECKING +from collections.abc import Iterator +from typing import TYPE_CHECKING import cirq diff --git a/cirq-core/cirq/contrib/quimb/grid_circuits_test.py b/cirq-core/cirq/contrib/quimb/grid_circuits_test.py index 1b2db4427b5..edfd469ead9 100644 --- a/cirq-core/cirq/contrib/quimb/grid_circuits_test.py +++ b/cirq-core/cirq/contrib/quimb/grid_circuits_test.py @@ -2,7 +2,7 @@ from __future__ import annotations -from typing import Sequence +from collections.abc import Sequence import networkx as nx import numpy as np diff --git a/cirq-core/cirq/contrib/quimb/mps_simulator.py b/cirq-core/cirq/contrib/quimb/mps_simulator.py index beddac6185a..a7cc373dbb1 100644 --- a/cirq-core/cirq/contrib/quimb/mps_simulator.py +++ b/cirq-core/cirq/contrib/quimb/mps_simulator.py @@ -21,7 +21,8 @@ import dataclasses import math -from typing import Any, Sequence, TYPE_CHECKING +from collections.abc import Sequence +from typing import Any, TYPE_CHECKING import numpy as np import quimb.tensor as qtn diff --git a/cirq-core/cirq/contrib/quimb/state_vector.py b/cirq-core/cirq/contrib/quimb/state_vector.py index 97164d5223d..e7c9e8dc44b 100644 --- a/cirq-core/cirq/contrib/quimb/state_vector.py +++ b/cirq-core/cirq/contrib/quimb/state_vector.py @@ -3,7 +3,8 @@ from __future__ import annotations import warnings -from typing import cast, Sequence, TYPE_CHECKING +from collections.abc import Sequence +from typing import cast, TYPE_CHECKING import quimb import quimb.tensor as qtn diff --git a/cirq-core/cirq/contrib/quirk/export_to_quirk.py b/cirq-core/cirq/contrib/quirk/export_to_quirk.py index f37ad75467d..2a3557144e4 100644 --- a/cirq-core/cirq/contrib/quirk/export_to_quirk.py +++ b/cirq-core/cirq/contrib/quirk/export_to_quirk.py @@ -16,7 +16,8 @@ import json import urllib.parse -from typing import Any, cast, Iterable +from collections.abc import Iterable +from typing import Any, cast from cirq import circuits, devices, ops, protocols from cirq.contrib.quirk.linearize_circuit import linearize_circuit_qubits diff --git a/cirq-core/cirq/contrib/quirk/linearize_circuit.py b/cirq-core/cirq/contrib/quirk/linearize_circuit.py index 58a39d789fd..0f665ed9442 100644 --- a/cirq-core/cirq/contrib/quirk/linearize_circuit.py +++ b/cirq-core/cirq/contrib/quirk/linearize_circuit.py @@ -14,7 +14,7 @@ from __future__ import annotations -from typing import Callable +from collections.abc import Callable from cirq import circuits, devices, ops diff --git a/cirq-core/cirq/contrib/quirk/quirk_gate.py b/cirq-core/cirq/contrib/quirk/quirk_gate.py index e5b820c00f5..585a95342a1 100644 --- a/cirq-core/cirq/contrib/quirk/quirk_gate.py +++ b/cirq-core/cirq/contrib/quirk/quirk_gate.py @@ -14,7 +14,8 @@ from __future__ import annotations -from typing import Any, Callable, cast +from collections.abc import Callable +from typing import Any, cast import numpy as np import sympy diff --git a/cirq-core/cirq/contrib/routing/device.py b/cirq-core/cirq/contrib/routing/device.py index ade199d2343..686a781a67e 100644 --- a/cirq-core/cirq/contrib/routing/device.py +++ b/cirq-core/cirq/contrib/routing/device.py @@ -15,7 +15,7 @@ from __future__ import annotations import itertools -from typing import Iterable +from collections.abc import Iterable import networkx as nx diff --git a/cirq-core/cirq/contrib/routing/greedy.py b/cirq-core/cirq/contrib/routing/greedy.py index bf078dc7ccd..6b8c148125e 100644 --- a/cirq-core/cirq/contrib/routing/greedy.py +++ b/cirq-core/cirq/contrib/routing/greedy.py @@ -15,7 +15,8 @@ from __future__ import annotations import itertools -from typing import Callable, cast, Iterable, Sequence, TYPE_CHECKING +from collections.abc import Callable, Iterable, Sequence +from typing import cast, TYPE_CHECKING import networkx as nx import numpy as np diff --git a/cirq-core/cirq/contrib/routing/initialization.py b/cirq-core/cirq/contrib/routing/initialization.py index f68339772ff..7c8ca699e0d 100644 --- a/cirq-core/cirq/contrib/routing/initialization.py +++ b/cirq-core/cirq/contrib/routing/initialization.py @@ -15,7 +15,8 @@ from __future__ import annotations import itertools -from typing import cast, Hashable, TYPE_CHECKING +from collections.abc import Hashable +from typing import cast, TYPE_CHECKING import networkx as nx from sortedcontainers import SortedDict, SortedSet diff --git a/cirq-core/cirq/contrib/routing/router.py b/cirq-core/cirq/contrib/routing/router.py index c37ae2131dd..c04840926b7 100644 --- a/cirq-core/cirq/contrib/routing/router.py +++ b/cirq-core/cirq/contrib/routing/router.py @@ -14,7 +14,8 @@ from __future__ import annotations -from typing import Callable, TYPE_CHECKING +from collections.abc import Callable +from typing import TYPE_CHECKING from cirq import circuits, protocols from cirq.contrib.routing.greedy import route_circuit_greedily diff --git a/cirq-core/cirq/contrib/routing/swap_network.py b/cirq-core/cirq/contrib/routing/swap_network.py index 6d5931852f2..719cb50c955 100644 --- a/cirq-core/cirq/contrib/routing/swap_network.py +++ b/cirq-core/cirq/contrib/routing/swap_network.py @@ -14,7 +14,8 @@ from __future__ import annotations -from typing import Iterable, TYPE_CHECKING +from collections.abc import Iterable +from typing import TYPE_CHECKING import cirq.contrib.acquaintance as cca from cirq import ops diff --git a/cirq-core/cirq/contrib/routing/utils.py b/cirq-core/cirq/contrib/routing/utils.py index 72a26bdd76b..83722491685 100644 --- a/cirq-core/cirq/contrib/routing/utils.py +++ b/cirq-core/cirq/contrib/routing/utils.py @@ -16,7 +16,8 @@ import operator import re -from typing import Callable, Iterable, TYPE_CHECKING +from collections.abc import Callable, Iterable +from typing import TYPE_CHECKING import networkx as nx diff --git a/cirq-core/cirq/contrib/shuffle_circuits/shuffle_circuits_with_readout_benchmarking.py b/cirq-core/cirq/contrib/shuffle_circuits/shuffle_circuits_with_readout_benchmarking.py index dac7056f8c6..4d833f4c08f 100644 --- a/cirq-core/cirq/contrib/shuffle_circuits/shuffle_circuits_with_readout_benchmarking.py +++ b/cirq-core/cirq/contrib/shuffle_circuits/shuffle_circuits_with_readout_benchmarking.py @@ -17,7 +17,8 @@ from __future__ import annotations import time -from typing import Sequence, TYPE_CHECKING +from collections.abc import Sequence +from typing import TYPE_CHECKING import attrs import numpy as np diff --git a/cirq-core/cirq/contrib/shuffle_circuits/shuffle_circuits_with_readout_benchmarking_test.py b/cirq-core/cirq/contrib/shuffle_circuits/shuffle_circuits_with_readout_benchmarking_test.py index 2c32e44f3b0..172257abfd5 100644 --- a/cirq-core/cirq/contrib/shuffle_circuits/shuffle_circuits_with_readout_benchmarking_test.py +++ b/cirq-core/cirq/contrib/shuffle_circuits/shuffle_circuits_with_readout_benchmarking_test.py @@ -15,7 +15,7 @@ from __future__ import annotations import itertools -from typing import Sequence +from collections.abc import Sequence import numpy as np import pytest diff --git a/cirq-core/cirq/devices/device.py b/cirq-core/cirq/devices/device.py index fa015461f48..b3e5cc3e878 100644 --- a/cirq-core/cirq/devices/device.py +++ b/cirq-core/cirq/devices/device.py @@ -15,7 +15,8 @@ from __future__ import annotations import abc -from typing import Iterable, TYPE_CHECKING +from collections.abc import Iterable +from typing import TYPE_CHECKING import networkx as nx diff --git a/cirq-core/cirq/devices/grid_device_metadata.py b/cirq-core/cirq/devices/grid_device_metadata.py index 3941dc514cc..bcdc3b39b2a 100644 --- a/cirq-core/cirq/devices/grid_device_metadata.py +++ b/cirq-core/cirq/devices/grid_device_metadata.py @@ -16,7 +16,8 @@ from __future__ import annotations -from typing import cast, Iterable, Mapping, TYPE_CHECKING +from collections.abc import Iterable, Mapping +from typing import cast, TYPE_CHECKING import networkx as nx diff --git a/cirq-core/cirq/devices/grid_qubit.py b/cirq-core/cirq/devices/grid_qubit.py index 236819b7511..d9ea9947691 100644 --- a/cirq-core/cirq/devices/grid_qubit.py +++ b/cirq-core/cirq/devices/grid_qubit.py @@ -17,7 +17,8 @@ import abc import functools import weakref -from typing import Any, Iterable, Self, TYPE_CHECKING +from collections.abc import Iterable +from typing import Any, Self, TYPE_CHECKING import numpy as np diff --git a/cirq-core/cirq/devices/insertion_noise_model.py b/cirq-core/cirq/devices/insertion_noise_model.py index 25f3aa09f59..bd49c8261cc 100644 --- a/cirq-core/cirq/devices/insertion_noise_model.py +++ b/cirq-core/cirq/devices/insertion_noise_model.py @@ -15,7 +15,8 @@ from __future__ import annotations import dataclasses -from typing import Any, Mapping, Sequence, TYPE_CHECKING +from collections.abc import Mapping, Sequence +from typing import Any, TYPE_CHECKING from cirq import devices from cirq.devices import noise_utils diff --git a/cirq-core/cirq/devices/line_qubit.py b/cirq-core/cirq/devices/line_qubit.py index 05b6a1ef3f4..8f5dfedf537 100644 --- a/cirq-core/cirq/devices/line_qubit.py +++ b/cirq-core/cirq/devices/line_qubit.py @@ -17,7 +17,8 @@ import abc import functools import weakref -from typing import Any, Iterable, Self, Sequence, TYPE_CHECKING +from collections.abc import Iterable, Sequence +from typing import Any, Self, TYPE_CHECKING from cirq import ops, protocols diff --git a/cirq-core/cirq/devices/named_topologies.py b/cirq-core/cirq/devices/named_topologies.py index f38761e896d..023e2bfd861 100644 --- a/cirq-core/cirq/devices/named_topologies.py +++ b/cirq-core/cirq/devices/named_topologies.py @@ -16,8 +16,9 @@ import abc import warnings +from collections.abc import Callable, Iterable, Sequence from dataclasses import dataclass -from typing import Any, Callable, Iterable, Sequence, TYPE_CHECKING, Union +from typing import Any, TYPE_CHECKING, Union import networkx as nx from matplotlib import pyplot as plt diff --git a/cirq-core/cirq/devices/noise_model.py b/cirq-core/cirq/devices/noise_model.py index 563b8bcdf7a..275f2b08da6 100644 --- a/cirq-core/cirq/devices/noise_model.py +++ b/cirq-core/cirq/devices/noise_model.py @@ -14,7 +14,8 @@ from __future__ import annotations -from typing import Any, Callable, Iterable, Sequence, TYPE_CHECKING, Union +from collections.abc import Callable, Iterable, Sequence +from typing import Any, TYPE_CHECKING, Union from cirq import ops, protocols, value from cirq._doc import document diff --git a/cirq-core/cirq/devices/noise_model_test.py b/cirq-core/cirq/devices/noise_model_test.py index 2c5ba13422f..397538e7cad 100644 --- a/cirq-core/cirq/devices/noise_model_test.py +++ b/cirq-core/cirq/devices/noise_model_test.py @@ -14,7 +14,7 @@ from __future__ import annotations -from typing import Sequence +from collections.abc import Sequence import numpy as np import pytest diff --git a/cirq-core/cirq/devices/noise_properties.py b/cirq-core/cirq/devices/noise_properties.py index ad9703af971..2a44ed90d80 100644 --- a/cirq-core/cirq/devices/noise_properties.py +++ b/cirq-core/cirq/devices/noise_properties.py @@ -22,7 +22,8 @@ from __future__ import annotations import abc -from typing import Iterable, Sequence, TYPE_CHECKING +from collections.abc import Iterable, Sequence +from typing import TYPE_CHECKING from cirq import _import, devices, ops, protocols, value from cirq.devices.noise_utils import PHYSICAL_GATE_TAG diff --git a/cirq-core/cirq/devices/superconducting_qubits_noise_properties_test.py b/cirq-core/cirq/devices/superconducting_qubits_noise_properties_test.py index 9a98ae1883b..575b04f3c6d 100644 --- a/cirq-core/cirq/devices/superconducting_qubits_noise_properties_test.py +++ b/cirq-core/cirq/devices/superconducting_qubits_noise_properties_test.py @@ -14,7 +14,8 @@ from __future__ import annotations -from typing import Any, Sequence +from collections.abc import Sequence +from typing import Any import numpy as np import pytest diff --git a/cirq-core/cirq/devices/thermal_noise_model.py b/cirq-core/cirq/devices/thermal_noise_model.py index e2e445f07aa..6c84e0898f1 100644 --- a/cirq-core/cirq/devices/thermal_noise_model.py +++ b/cirq-core/cirq/devices/thermal_noise_model.py @@ -15,7 +15,8 @@ from __future__ import annotations import functools -from typing import Sequence, TYPE_CHECKING +from collections.abc import Sequence +from typing import TYPE_CHECKING import numpy as np import sympy diff --git a/cirq-core/cirq/experiments/benchmarking/parallel_xeb.py b/cirq-core/cirq/experiments/benchmarking/parallel_xeb.py index ed3af1c9d8c..c1982601afc 100644 --- a/cirq-core/cirq/experiments/benchmarking/parallel_xeb.py +++ b/cirq-core/cirq/experiments/benchmarking/parallel_xeb.py @@ -16,8 +16,9 @@ from __future__ import annotations +from collections.abc import Iterable, Mapping, Sequence from concurrent import futures -from typing import Iterable, Mapping, overload, Sequence, TYPE_CHECKING, Union +from typing import overload, TYPE_CHECKING, Union import attrs import networkx as nx diff --git a/cirq-core/cirq/experiments/benchmarking/parallel_xeb_test.py b/cirq-core/cirq/experiments/benchmarking/parallel_xeb_test.py index a5e7e7fb0e6..d37273e40a4 100644 --- a/cirq-core/cirq/experiments/benchmarking/parallel_xeb_test.py +++ b/cirq-core/cirq/experiments/benchmarking/parallel_xeb_test.py @@ -15,8 +15,8 @@ from __future__ import annotations import itertools +from collections.abc import Iterator from concurrent import futures -from typing import Iterator import networkx as nx import numpy as np diff --git a/cirq-core/cirq/experiments/fidelity_estimation.py b/cirq-core/cirq/experiments/fidelity_estimation.py index 98af77b2531..33f18cc5927 100644 --- a/cirq-core/cirq/experiments/fidelity_estimation.py +++ b/cirq-core/cirq/experiments/fidelity_estimation.py @@ -16,7 +16,8 @@ from __future__ import annotations -from typing import Callable, Mapping, Sequence, TYPE_CHECKING +from collections.abc import Callable, Mapping, Sequence +from typing import TYPE_CHECKING import numpy as np diff --git a/cirq-core/cirq/experiments/fidelity_estimation_test.py b/cirq-core/cirq/experiments/fidelity_estimation_test.py index c17c848aa28..1e748061611 100644 --- a/cirq-core/cirq/experiments/fidelity_estimation_test.py +++ b/cirq-core/cirq/experiments/fidelity_estimation_test.py @@ -15,7 +15,7 @@ from __future__ import annotations import itertools -from typing import Sequence +from collections.abc import Sequence import numpy as np import pytest diff --git a/cirq-core/cirq/experiments/n_qubit_tomography.py b/cirq-core/cirq/experiments/n_qubit_tomography.py index 1cfafbd6d9d..8a1a3a4858c 100644 --- a/cirq-core/cirq/experiments/n_qubit_tomography.py +++ b/cirq-core/cirq/experiments/n_qubit_tomography.py @@ -20,7 +20,8 @@ from __future__ import annotations -from typing import Sequence, TYPE_CHECKING +from collections.abc import Sequence +from typing import TYPE_CHECKING import numpy as np import sympy diff --git a/cirq-core/cirq/experiments/n_qubit_tomography_test.py b/cirq-core/cirq/experiments/n_qubit_tomography_test.py index 92219ab0fdd..aa9ff663082 100644 --- a/cirq-core/cirq/experiments/n_qubit_tomography_test.py +++ b/cirq-core/cirq/experiments/n_qubit_tomography_test.py @@ -14,7 +14,7 @@ from __future__ import annotations -from typing import Sequence +from collections.abc import Sequence import numpy as np import pytest diff --git a/cirq-core/cirq/experiments/purity_estimation.py b/cirq-core/cirq/experiments/purity_estimation.py index b1d5341f4c3..b1f69375504 100644 --- a/cirq-core/cirq/experiments/purity_estimation.py +++ b/cirq-core/cirq/experiments/purity_estimation.py @@ -14,7 +14,7 @@ from __future__ import annotations -from typing import Sequence +from collections.abc import Sequence import numpy as np diff --git a/cirq-core/cirq/experiments/qubit_characterizations.py b/cirq-core/cirq/experiments/qubit_characterizations.py index 5d0709af416..f7f627b054b 100644 --- a/cirq-core/cirq/experiments/qubit_characterizations.py +++ b/cirq-core/cirq/experiments/qubit_characterizations.py @@ -18,7 +18,8 @@ import functools import itertools import uuid -from typing import Any, cast, Iterator, Mapping, Optional, Sequence, TYPE_CHECKING +from collections.abc import Iterator, Mapping, Sequence +from typing import Any, cast, Optional, TYPE_CHECKING import attrs import numpy as np diff --git a/cirq-core/cirq/experiments/random_quantum_circuit_generation.py b/cirq-core/cirq/experiments/random_quantum_circuit_generation.py index 95e594ecf14..a3f4e3fc0b7 100644 --- a/cirq-core/cirq/experiments/random_quantum_circuit_generation.py +++ b/cirq-core/cirq/experiments/random_quantum_circuit_generation.py @@ -17,7 +17,8 @@ import dataclasses import itertools -from typing import Any, Callable, Container, Iterable, Iterator, Sequence, TYPE_CHECKING +from collections.abc import Callable, Container, Iterable, Iterator, Sequence +from typing import Any, TYPE_CHECKING import numpy as np diff --git a/cirq-core/cirq/experiments/random_quantum_circuit_generation_test.py b/cirq-core/cirq/experiments/random_quantum_circuit_generation_test.py index 9df4f3d2aea..b18e2d79928 100644 --- a/cirq-core/cirq/experiments/random_quantum_circuit_generation_test.py +++ b/cirq-core/cirq/experiments/random_quantum_circuit_generation_test.py @@ -15,7 +15,8 @@ from __future__ import annotations import itertools -from typing import Callable, cast, Iterable, Sequence +from collections.abc import Callable, Iterable, Sequence +from typing import cast import networkx as nx import numpy as np diff --git a/cirq-core/cirq/experiments/readout_confusion_matrix.py b/cirq-core/cirq/experiments/readout_confusion_matrix.py index ec82a71e0f7..16be17cfa91 100644 --- a/cirq-core/cirq/experiments/readout_confusion_matrix.py +++ b/cirq-core/cirq/experiments/readout_confusion_matrix.py @@ -17,7 +17,8 @@ from __future__ import annotations import time -from typing import Any, cast, Sequence, TYPE_CHECKING +from collections.abc import Sequence +from typing import Any, cast, TYPE_CHECKING import numpy as np import scipy.optimize diff --git a/cirq-core/cirq/experiments/readout_confusion_matrix_test.py b/cirq-core/cirq/experiments/readout_confusion_matrix_test.py index c63a9de0f85..9c3b08f071d 100644 --- a/cirq-core/cirq/experiments/readout_confusion_matrix_test.py +++ b/cirq-core/cirq/experiments/readout_confusion_matrix_test.py @@ -14,7 +14,7 @@ from __future__ import annotations -from typing import Sequence +from collections.abc import Sequence import numpy as np import pytest diff --git a/cirq-core/cirq/experiments/single_qubit_readout_calibration.py b/cirq-core/cirq/experiments/single_qubit_readout_calibration.py index eaa1ce55b41..5fcf3e0e30d 100644 --- a/cirq-core/cirq/experiments/single_qubit_readout_calibration.py +++ b/cirq-core/cirq/experiments/single_qubit_readout_calibration.py @@ -18,7 +18,8 @@ import dataclasses import time -from typing import Any, cast, Iterable, TYPE_CHECKING +from collections.abc import Iterable +from typing import Any, cast, TYPE_CHECKING import matplotlib.pyplot as plt import numpy as np diff --git a/cirq-core/cirq/experiments/single_qubit_readout_calibration_test.py b/cirq-core/cirq/experiments/single_qubit_readout_calibration_test.py index 827c3981117..954358d5b28 100644 --- a/cirq-core/cirq/experiments/single_qubit_readout_calibration_test.py +++ b/cirq-core/cirq/experiments/single_qubit_readout_calibration_test.py @@ -14,7 +14,7 @@ from __future__ import annotations -from typing import Sequence +from collections.abc import Sequence import numpy as np import pytest diff --git a/cirq-core/cirq/experiments/t1_decay_experiment.py b/cirq-core/cirq/experiments/t1_decay_experiment.py index 5796fa463db..f66f138c22e 100644 --- a/cirq-core/cirq/experiments/t1_decay_experiment.py +++ b/cirq-core/cirq/experiments/t1_decay_experiment.py @@ -15,7 +15,8 @@ from __future__ import annotations import warnings -from typing import Any, cast, Sequence, TYPE_CHECKING +from collections.abc import Sequence +from typing import Any, cast, TYPE_CHECKING import numpy as np import pandas as pd diff --git a/cirq-core/cirq/experiments/two_qubit_xeb.py b/cirq-core/cirq/experiments/two_qubit_xeb.py index 149edcfcd64..5418062c4ad 100644 --- a/cirq-core/cirq/experiments/two_qubit_xeb.py +++ b/cirq-core/cirq/experiments/two_qubit_xeb.py @@ -18,9 +18,10 @@ import functools import itertools +from collections.abc import Mapping, Sequence from dataclasses import dataclass from types import MappingProxyType -from typing import Any, cast, Mapping, Sequence, TYPE_CHECKING +from typing import Any, cast, TYPE_CHECKING import networkx as nx import numpy as np diff --git a/cirq-core/cirq/experiments/two_qubit_xeb_test.py b/cirq-core/cirq/experiments/two_qubit_xeb_test.py index e48d91e2918..36cecb17452 100644 --- a/cirq-core/cirq/experiments/two_qubit_xeb_test.py +++ b/cirq-core/cirq/experiments/two_qubit_xeb_test.py @@ -18,7 +18,7 @@ import io import itertools -from typing import Sequence +from collections.abc import Sequence import matplotlib.pyplot as plt import networkx as nx diff --git a/cirq-core/cirq/experiments/xeb_fitting.py b/cirq-core/cirq/experiments/xeb_fitting.py index 544528f66e6..c48e8043562 100644 --- a/cirq-core/cirq/experiments/xeb_fitting.py +++ b/cirq-core/cirq/experiments/xeb_fitting.py @@ -18,7 +18,8 @@ import dataclasses from abc import ABC, abstractmethod -from typing import Iterable, Sequence, TYPE_CHECKING +from collections.abc import Iterable, Sequence +from typing import TYPE_CHECKING import numpy as np import pandas as pd diff --git a/cirq-core/cirq/experiments/xeb_fitting_test.py b/cirq-core/cirq/experiments/xeb_fitting_test.py index 1c867c7006e..c13ecf06111 100644 --- a/cirq-core/cirq/experiments/xeb_fitting_test.py +++ b/cirq-core/cirq/experiments/xeb_fitting_test.py @@ -16,7 +16,7 @@ import itertools import multiprocessing -from typing import Iterable, Iterator, Sequence +from collections.abc import Iterable, Iterator, Sequence import networkx as nx import numpy as np diff --git a/cirq-core/cirq/experiments/xeb_sampling.py b/cirq-core/cirq/experiments/xeb_sampling.py index 7d2ca4ab738..f9cafba6e78 100644 --- a/cirq-core/cirq/experiments/xeb_sampling.py +++ b/cirq-core/cirq/experiments/xeb_sampling.py @@ -19,8 +19,10 @@ import os import time import uuid +from collections.abc import Callable, Sequence +from contextlib import AbstractContextManager from dataclasses import dataclass -from typing import Any, Callable, ContextManager, Sequence, TYPE_CHECKING +from typing import Any, TYPE_CHECKING import numpy as np import pandas as pd @@ -257,7 +259,7 @@ def _execute_sample_2q_xeb_tasks_in_batches( combinations_by_layer: list[CircuitLibraryCombination], repetitions: int, batch_size: int, - progress_bar: Callable[..., ContextManager], + progress_bar: Callable[..., AbstractContextManager], dataset_directory: str | None = None, ) -> list[dict[str, Any]]: """Helper function used in `sample_2q_xeb_circuits` to batch and execute sampling tasks.""" @@ -287,7 +289,7 @@ def sample_2q_xeb_circuits( *, repetitions: int = 10_000, batch_size: int = 9, - progress_bar: Callable[..., ContextManager] | None = tqdm.tqdm, + progress_bar: Callable[..., AbstractContextManager] | None = tqdm.tqdm, combinations_by_layer: list[CircuitLibraryCombination] | None = None, shuffle: cirq.RANDOM_STATE_OR_SEED_LIKE | None = None, dataset_directory: str | None = None, diff --git a/cirq-core/cirq/experiments/xeb_sampling_test.py b/cirq-core/cirq/experiments/xeb_sampling_test.py index 2ecfa594571..af6bccde4f7 100644 --- a/cirq-core/cirq/experiments/xeb_sampling_test.py +++ b/cirq-core/cirq/experiments/xeb_sampling_test.py @@ -16,7 +16,7 @@ import glob import itertools -from typing import Iterable +from collections.abc import Iterable import networkx as nx import numpy as np diff --git a/cirq-core/cirq/experiments/xeb_simulation.py b/cirq-core/cirq/experiments/xeb_simulation.py index 61177daa210..8d4a06e0658 100644 --- a/cirq-core/cirq/experiments/xeb_simulation.py +++ b/cirq-core/cirq/experiments/xeb_simulation.py @@ -16,8 +16,9 @@ from __future__ import annotations +from collections.abc import Sequence from dataclasses import dataclass -from typing import Any, Sequence, TYPE_CHECKING +from typing import Any, TYPE_CHECKING import numpy as np import pandas as pd diff --git a/cirq-core/cirq/experiments/xeb_simulation_test.py b/cirq-core/cirq/experiments/xeb_simulation_test.py index 5d4ff4dd2b2..ece53a128f6 100644 --- a/cirq-core/cirq/experiments/xeb_simulation_test.py +++ b/cirq-core/cirq/experiments/xeb_simulation_test.py @@ -15,7 +15,8 @@ from __future__ import annotations import multiprocessing -from typing import Any, Iterator, Sequence +from collections.abc import Iterator, Sequence +from typing import Any import numpy as np import pandas as pd diff --git a/cirq-core/cirq/experiments/z_phase_calibration.py b/cirq-core/cirq/experiments/z_phase_calibration.py index 0ade3c6ab06..61aebd01b5d 100644 --- a/cirq-core/cirq/experiments/z_phase_calibration.py +++ b/cirq-core/cirq/experiments/z_phase_calibration.py @@ -18,7 +18,8 @@ import multiprocessing import multiprocessing.pool -from typing import Any, Sequence, TYPE_CHECKING +from collections.abc import Sequence +from typing import Any, TYPE_CHECKING import matplotlib.pyplot as plt import numpy as np diff --git a/cirq-core/cirq/experiments/z_phase_calibration_test.py b/cirq-core/cirq/experiments/z_phase_calibration_test.py index ef5e2b6af37..a7f48466922 100644 --- a/cirq-core/cirq/experiments/z_phase_calibration_test.py +++ b/cirq-core/cirq/experiments/z_phase_calibration_test.py @@ -15,7 +15,7 @@ from __future__ import annotations import multiprocessing -from typing import Iterator +from collections.abc import Iterator import numpy as np import pandas as pd diff --git a/cirq-core/cirq/interop/quirk/cells/all_cells.py b/cirq-core/cirq/interop/quirk/cells/all_cells.py index 2cc78168b83..5a748b21434 100644 --- a/cirq-core/cirq/interop/quirk/cells/all_cells.py +++ b/cirq-core/cirq/interop/quirk/cells/all_cells.py @@ -14,7 +14,8 @@ from __future__ import annotations -from typing import Iterator, TYPE_CHECKING +from collections.abc import Iterator +from typing import TYPE_CHECKING from cirq.interop.quirk.cells.arithmetic_cells import generate_all_arithmetic_cell_makers from cirq.interop.quirk.cells.control_cells import generate_all_control_cell_makers diff --git a/cirq-core/cirq/interop/quirk/cells/arithmetic_cells.py b/cirq-core/cirq/interop/quirk/cells/arithmetic_cells.py index 096ed167bf8..b4050195cad 100644 --- a/cirq-core/cirq/interop/quirk/cells/arithmetic_cells.py +++ b/cirq-core/cirq/interop/quirk/cells/arithmetic_cells.py @@ -15,7 +15,8 @@ from __future__ import annotations import inspect -from typing import Any, Callable, cast, Iterable, Iterator, Sequence, TYPE_CHECKING +from collections.abc import Callable, Iterable, Iterator, Sequence +from typing import Any, cast, TYPE_CHECKING from cirq import ops, value from cirq.interop.quirk.cells.cell import Cell, CELL_SIZES, CellMaker diff --git a/cirq-core/cirq/interop/quirk/cells/cell.py b/cirq-core/cirq/interop/quirk/cells/cell.py index c8cbef85101..ab910e8f145 100644 --- a/cirq-core/cirq/interop/quirk/cells/cell.py +++ b/cirq-core/cirq/interop/quirk/cells/cell.py @@ -15,7 +15,8 @@ from __future__ import annotations import abc -from typing import Any, Callable, Iterable, NamedTuple, Sequence, TYPE_CHECKING, Union +from collections.abc import Callable, Iterable, Sequence +from typing import Any, NamedTuple, TYPE_CHECKING, Union from cirq import devices, ops, value diff --git a/cirq-core/cirq/interop/quirk/cells/composite_cell.py b/cirq-core/cirq/interop/quirk/cells/composite_cell.py index f4db96b6cf5..e67ed978f5b 100644 --- a/cirq-core/cirq/interop/quirk/cells/composite_cell.py +++ b/cirq-core/cirq/interop/quirk/cells/composite_cell.py @@ -14,7 +14,8 @@ from __future__ import annotations -from typing import Callable, cast, Iterable, Iterator, Sequence, TYPE_CHECKING, TypeVar +from collections.abc import Callable, Iterable, Iterator, Sequence +from typing import cast, TYPE_CHECKING, TypeVar from cirq import circuits from cirq.interop.quirk.cells.cell import Cell diff --git a/cirq-core/cirq/interop/quirk/cells/composite_cell_test.py b/cirq-core/cirq/interop/quirk/cells/composite_cell_test.py index 61c3e68f7e1..ec9a17dd904 100644 --- a/cirq-core/cirq/interop/quirk/cells/composite_cell_test.py +++ b/cirq-core/cirq/interop/quirk/cells/composite_cell_test.py @@ -14,7 +14,7 @@ from __future__ import annotations -from typing import Iterable +from collections.abc import Iterable import pytest diff --git a/cirq-core/cirq/interop/quirk/cells/control_cells.py b/cirq-core/cirq/interop/quirk/cells/control_cells.py index 58d148b0955..4939865e344 100644 --- a/cirq-core/cirq/interop/quirk/cells/control_cells.py +++ b/cirq-core/cirq/interop/quirk/cells/control_cells.py @@ -14,7 +14,8 @@ from __future__ import annotations -from typing import Any, Iterable, Iterator, TYPE_CHECKING +from collections.abc import Iterable, Iterator +from typing import Any, TYPE_CHECKING from cirq import ops, value from cirq.interop.quirk.cells.cell import Cell, CellMaker diff --git a/cirq-core/cirq/interop/quirk/cells/frequency_space_cells.py b/cirq-core/cirq/interop/quirk/cells/frequency_space_cells.py index b54883c956f..8021a594201 100644 --- a/cirq-core/cirq/interop/quirk/cells/frequency_space_cells.py +++ b/cirq-core/cirq/interop/quirk/cells/frequency_space_cells.py @@ -14,7 +14,7 @@ from __future__ import annotations -from typing import Callable, Iterator +from collections.abc import Callable, Iterator import sympy diff --git a/cirq-core/cirq/interop/quirk/cells/ignored_cells.py b/cirq-core/cirq/interop/quirk/cells/ignored_cells.py index 5ae78f73d90..84885896f5e 100644 --- a/cirq-core/cirq/interop/quirk/cells/ignored_cells.py +++ b/cirq-core/cirq/interop/quirk/cells/ignored_cells.py @@ -14,7 +14,7 @@ from __future__ import annotations -from typing import Iterator +from collections.abc import Iterator from cirq.interop.quirk.cells.cell import CELL_SIZES, CellMaker diff --git a/cirq-core/cirq/interop/quirk/cells/input_cells.py b/cirq-core/cirq/interop/quirk/cells/input_cells.py index 2d1ab98274d..b512dd96de8 100644 --- a/cirq-core/cirq/interop/quirk/cells/input_cells.py +++ b/cirq-core/cirq/interop/quirk/cells/input_cells.py @@ -14,7 +14,8 @@ from __future__ import annotations -from typing import Callable, Iterable, Iterator, TYPE_CHECKING +from collections.abc import Callable, Iterable, Iterator +from typing import TYPE_CHECKING from cirq.interop.quirk.cells.cell import Cell, CELL_SIZES, CellMaker diff --git a/cirq-core/cirq/interop/quirk/cells/input_rotation_cells.py b/cirq-core/cirq/interop/quirk/cells/input_rotation_cells.py index dc141203eb0..48e31f60f19 100644 --- a/cirq-core/cirq/interop/quirk/cells/input_rotation_cells.py +++ b/cirq-core/cirq/interop/quirk/cells/input_rotation_cells.py @@ -14,7 +14,8 @@ from __future__ import annotations -from typing import Any, Iterable, Iterator, Sequence +from collections.abc import Iterable, Iterator, Sequence +from typing import Any import numpy as np diff --git a/cirq-core/cirq/interop/quirk/cells/measurement_cells.py b/cirq-core/cirq/interop/quirk/cells/measurement_cells.py index 721e98f7422..52f7be1622e 100644 --- a/cirq-core/cirq/interop/quirk/cells/measurement_cells.py +++ b/cirq-core/cirq/interop/quirk/cells/measurement_cells.py @@ -14,7 +14,8 @@ from __future__ import annotations -from typing import cast, Iterable, Iterator, TYPE_CHECKING +from collections.abc import Iterable, Iterator +from typing import cast, TYPE_CHECKING from cirq import ops from cirq.interop.quirk.cells.cell import CellMaker, ExplicitOperationsCell diff --git a/cirq-core/cirq/interop/quirk/cells/parse.py b/cirq-core/cirq/interop/quirk/cells/parse.py index ee4a2d93055..2ce15292f7e 100644 --- a/cirq-core/cirq/interop/quirk/cells/parse.py +++ b/cirq-core/cirq/interop/quirk/cells/parse.py @@ -16,17 +16,8 @@ import cmath import re -from typing import ( - Any, - Callable, - cast, - Iterable, - Iterator, - Mapping, - SupportsFloat, - TypeAlias, - TypeVar, -) +from collections.abc import Callable, Iterable, Iterator, Mapping +from typing import Any, cast, SupportsFloat, TypeAlias, TypeVar import numpy as np import sympy diff --git a/cirq-core/cirq/interop/quirk/cells/qubit_permutation_cells.py b/cirq-core/cirq/interop/quirk/cells/qubit_permutation_cells.py index db55024b313..5d26256dc92 100644 --- a/cirq-core/cirq/interop/quirk/cells/qubit_permutation_cells.py +++ b/cirq-core/cirq/interop/quirk/cells/qubit_permutation_cells.py @@ -14,7 +14,8 @@ from __future__ import annotations -from typing import Callable, Iterator, Sequence, TYPE_CHECKING +from collections.abc import Callable, Iterator, Sequence +from typing import TYPE_CHECKING from cirq import ops, value from cirq.interop.quirk.cells.cell import CELL_SIZES, CellMaker diff --git a/cirq-core/cirq/interop/quirk/cells/scalar_cells.py b/cirq-core/cirq/interop/quirk/cells/scalar_cells.py index 7d087eb6102..fe48e8ab15e 100644 --- a/cirq-core/cirq/interop/quirk/cells/scalar_cells.py +++ b/cirq-core/cirq/interop/quirk/cells/scalar_cells.py @@ -14,7 +14,8 @@ from __future__ import annotations -from typing import Iterator, TYPE_CHECKING +from collections.abc import Iterator +from typing import TYPE_CHECKING from cirq import ops from cirq.interop.quirk.cells.cell import CellMaker diff --git a/cirq-core/cirq/interop/quirk/cells/single_qubit_rotation_cells.py b/cirq-core/cirq/interop/quirk/cells/single_qubit_rotation_cells.py index dc16594bc2a..f55265eeaf8 100644 --- a/cirq-core/cirq/interop/quirk/cells/single_qubit_rotation_cells.py +++ b/cirq-core/cirq/interop/quirk/cells/single_qubit_rotation_cells.py @@ -14,7 +14,8 @@ from __future__ import annotations -from typing import Callable, Iterator, TYPE_CHECKING +from collections.abc import Callable, Iterator +from typing import TYPE_CHECKING import sympy diff --git a/cirq-core/cirq/interop/quirk/cells/swap_cell.py b/cirq-core/cirq/interop/quirk/cells/swap_cell.py index cfdc43f6e61..74162f1fee7 100644 --- a/cirq-core/cirq/interop/quirk/cells/swap_cell.py +++ b/cirq-core/cirq/interop/quirk/cells/swap_cell.py @@ -14,7 +14,8 @@ from __future__ import annotations -from typing import Any, Iterable, Iterator, TYPE_CHECKING +from collections.abc import Iterable, Iterator +from typing import Any, TYPE_CHECKING from cirq import ops, value from cirq.interop.quirk.cells.cell import Cell, CellMaker diff --git a/cirq-core/cirq/interop/quirk/cells/unsupported_cells.py b/cirq-core/cirq/interop/quirk/cells/unsupported_cells.py index c339872de00..f6df7e1ddd2 100644 --- a/cirq-core/cirq/interop/quirk/cells/unsupported_cells.py +++ b/cirq-core/cirq/interop/quirk/cells/unsupported_cells.py @@ -14,7 +14,7 @@ from __future__ import annotations -from typing import Iterator +from collections.abc import Iterator from cirq.interop.quirk.cells.cell import CELL_SIZES, CellMaker diff --git a/cirq-core/cirq/interop/quirk/url_to_circuit.py b/cirq-core/cirq/interop/quirk/url_to_circuit.py index ef3c105de13..8346aa5f410 100644 --- a/cirq-core/cirq/interop/quirk/url_to_circuit.py +++ b/cirq-core/cirq/interop/quirk/url_to_circuit.py @@ -16,7 +16,8 @@ import json import urllib.parse -from typing import Any, cast, Iterable, Mapping, Sequence, TYPE_CHECKING +from collections.abc import Iterable, Mapping, Sequence +from typing import Any, cast, TYPE_CHECKING import numpy as np diff --git a/cirq-core/cirq/linalg/decompositions.py b/cirq-core/cirq/linalg/decompositions.py index adf444bd70f..74659807f5c 100644 --- a/cirq-core/cirq/linalg/decompositions.py +++ b/cirq-core/cirq/linalg/decompositions.py @@ -18,7 +18,8 @@ import cmath import math -from typing import Any, Callable, cast, Iterable, TYPE_CHECKING, TypeVar +from collections.abc import Callable, Iterable +from typing import Any, cast, TYPE_CHECKING, TypeVar import matplotlib.pyplot as plt import numpy as np diff --git a/cirq-core/cirq/linalg/diagonalize.py b/cirq-core/cirq/linalg/diagonalize.py index f26c22eefb6..5143d855326 100644 --- a/cirq-core/cirq/linalg/diagonalize.py +++ b/cirq-core/cirq/linalg/diagonalize.py @@ -16,7 +16,7 @@ from __future__ import annotations -from typing import Callable +from collections.abc import Callable import numpy as np diff --git a/cirq-core/cirq/linalg/predicates.py b/cirq-core/cirq/linalg/predicates.py index c60b5d38468..f09670e21d4 100644 --- a/cirq-core/cirq/linalg/predicates.py +++ b/cirq-core/cirq/linalg/predicates.py @@ -16,8 +16,9 @@ from __future__ import annotations +from collections.abc import Sequence from types import EllipsisType -from typing import cast, Sequence +from typing import cast import numpy as np diff --git a/cirq-core/cirq/linalg/tolerance.py b/cirq-core/cirq/linalg/tolerance.py index 6557e81f4cc..ad0500c71cd 100644 --- a/cirq-core/cirq/linalg/tolerance.py +++ b/cirq-core/cirq/linalg/tolerance.py @@ -17,7 +17,8 @@ from __future__ import annotations -from typing import Iterable, TYPE_CHECKING +from collections.abc import Iterable +from typing import TYPE_CHECKING import numpy as np diff --git a/cirq-core/cirq/linalg/transformations.py b/cirq-core/cirq/linalg/transformations.py index 5ab17f50be5..5daea293684 100644 --- a/cirq-core/cirq/linalg/transformations.py +++ b/cirq-core/cirq/linalg/transformations.py @@ -18,8 +18,9 @@ import dataclasses import functools +from collections.abc import Sequence from types import EllipsisType -from typing import Any, Sequence +from typing import Any import numpy as np diff --git a/cirq-core/cirq/ops/arithmetic_operation.py b/cirq-core/cirq/ops/arithmetic_operation.py index 21c139cd0d9..d9031fb7d18 100644 --- a/cirq-core/cirq/ops/arithmetic_operation.py +++ b/cirq-core/cirq/ops/arithmetic_operation.py @@ -17,7 +17,8 @@ import abc import itertools -from typing import cast, Iterable, Self, Sequence, TYPE_CHECKING +from collections.abc import Iterable, Sequence +from typing import cast, Self, TYPE_CHECKING import numpy as np diff --git a/cirq-core/cirq/ops/arithmetic_operation_test.py b/cirq-core/cirq/ops/arithmetic_operation_test.py index c8b50a04f8c..c53668cf00a 100644 --- a/cirq-core/cirq/ops/arithmetic_operation_test.py +++ b/cirq-core/cirq/ops/arithmetic_operation_test.py @@ -14,7 +14,7 @@ from __future__ import annotations -from typing import Sequence +from collections.abc import Sequence import numpy as np import pytest diff --git a/cirq-core/cirq/ops/boolean_hamiltonian.py b/cirq-core/cirq/ops/boolean_hamiltonian.py index 6141d6122cf..6d12dd59f4d 100644 --- a/cirq-core/cirq/ops/boolean_hamiltonian.py +++ b/cirq-core/cirq/ops/boolean_hamiltonian.py @@ -27,7 +27,8 @@ import functools import itertools -from typing import Any, Generator, Sequence +from collections.abc import Generator, Sequence +from typing import Any import sympy.parsing.sympy_parser as sympy_parser diff --git a/cirq-core/cirq/ops/classically_controlled_operation.py b/cirq-core/cirq/ops/classically_controlled_operation.py index bbb80823e0d..06b9771fd1d 100644 --- a/cirq-core/cirq/ops/classically_controlled_operation.py +++ b/cirq-core/cirq/ops/classically_controlled_operation.py @@ -14,7 +14,8 @@ from __future__ import annotations -from typing import AbstractSet, Any, Mapping, Sequence, TYPE_CHECKING +from collections.abc import Mapping, Sequence, Set +from typing import Any, TYPE_CHECKING import sympy @@ -150,7 +151,7 @@ def __repr__(self): def _is_parameterized_(self) -> bool: return protocols.is_parameterized(self._sub_operation) - def _parameter_names_(self) -> AbstractSet[str]: + def _parameter_names_(self) -> Set[str]: return protocols.parameter_names(self._sub_operation) def _resolve_parameters_( diff --git a/cirq-core/cirq/ops/clifford_gate.py b/cirq-core/cirq/ops/clifford_gate.py index 95a8487ca2c..cf68bf360ab 100644 --- a/cirq-core/cirq/ops/clifford_gate.py +++ b/cirq-core/cirq/ops/clifford_gate.py @@ -15,9 +15,10 @@ from __future__ import annotations import functools +from collections.abc import Sequence from dataclasses import dataclass from types import NotImplementedType -from typing import Any, Sequence, TYPE_CHECKING +from typing import Any, TYPE_CHECKING import numpy as np diff --git a/cirq-core/cirq/ops/common_channels.py b/cirq-core/cirq/ops/common_channels.py index 31f9d172b16..e8b7f7198e9 100644 --- a/cirq-core/cirq/ops/common_channels.py +++ b/cirq-core/cirq/ops/common_channels.py @@ -17,7 +17,8 @@ from __future__ import annotations import itertools -from typing import Any, Iterable, Sequence, TYPE_CHECKING +from collections.abc import Iterable, Sequence +from typing import Any, TYPE_CHECKING import numpy as np diff --git a/cirq-core/cirq/ops/common_gates.py b/cirq-core/cirq/ops/common_gates.py index 9115e6b4108..133de6dc9cf 100644 --- a/cirq-core/cirq/ops/common_gates.py +++ b/cirq-core/cirq/ops/common_gates.py @@ -27,8 +27,9 @@ from __future__ import annotations +from collections.abc import Collection, Sequence from types import NotImplementedType -from typing import Any, cast, Collection, Sequence +from typing import Any, cast import numpy as np import sympy diff --git a/cirq-core/cirq/ops/control_values.py b/cirq-core/cirq/ops/control_values.py index a7524619764..b2569eb5af1 100644 --- a/cirq-core/cirq/ops/control_values.py +++ b/cirq-core/cirq/ops/control_values.py @@ -16,8 +16,9 @@ import abc import itertools +from collections.abc import Collection, Iterator, Sequence from functools import cached_property -from typing import Any, Collection, Iterator, Sequence, TYPE_CHECKING +from typing import Any, TYPE_CHECKING from cirq import protocols, value diff --git a/cirq-core/cirq/ops/controlled_gate.py b/cirq-core/cirq/ops/controlled_gate.py index bd2967dddb9..0e7c3973c18 100644 --- a/cirq-core/cirq/ops/controlled_gate.py +++ b/cirq-core/cirq/ops/controlled_gate.py @@ -14,8 +14,9 @@ from __future__ import annotations +from collections.abc import Collection, Sequence, Set from types import NotImplementedType -from typing import AbstractSet, Any, Collection, Sequence, TYPE_CHECKING +from typing import Any, TYPE_CHECKING import numpy as np @@ -244,7 +245,7 @@ def __pow__(self, exponent: Any) -> ControlledGate: def _is_parameterized_(self) -> bool: return protocols.is_parameterized(self.sub_gate) - def _parameter_names_(self) -> AbstractSet[str]: + def _parameter_names_(self) -> Set[str]: return protocols.parameter_names(self.sub_gate) def _resolve_parameters_(self, resolver: cirq.ParamResolver, recursive: bool) -> ControlledGate: diff --git a/cirq-core/cirq/ops/controlled_gate_test.py b/cirq-core/cirq/ops/controlled_gate_test.py index a1bd39c89f5..2a155919211 100644 --- a/cirq-core/cirq/ops/controlled_gate_test.py +++ b/cirq-core/cirq/ops/controlled_gate_test.py @@ -14,8 +14,9 @@ from __future__ import annotations +from collections.abc import Sequence from types import EllipsisType, NotImplementedType -from typing import Any, cast, Sequence +from typing import Any, cast import numpy as np import pytest diff --git a/cirq-core/cirq/ops/controlled_operation.py b/cirq-core/cirq/ops/controlled_operation.py index 532e46d13d4..a7a5d957898 100644 --- a/cirq-core/cirq/ops/controlled_operation.py +++ b/cirq-core/cirq/ops/controlled_operation.py @@ -14,8 +14,9 @@ from __future__ import annotations +from collections.abc import Collection, Sequence, Set from types import EllipsisType, NotImplementedType -from typing import AbstractSet, Any, Collection, Sequence, TYPE_CHECKING +from typing import Any, TYPE_CHECKING import numpy as np @@ -261,7 +262,7 @@ def __repr__(self): def _is_parameterized_(self) -> bool: return protocols.is_parameterized(self.sub_operation) - def _parameter_names_(self) -> AbstractSet[str]: + def _parameter_names_(self) -> Set[str]: return protocols.parameter_names(self.sub_operation) def _resolve_parameters_( diff --git a/cirq-core/cirq/ops/controlled_operation_test.py b/cirq-core/cirq/ops/controlled_operation_test.py index 868273b7efc..f996571e99f 100644 --- a/cirq-core/cirq/ops/controlled_operation_test.py +++ b/cirq-core/cirq/ops/controlled_operation_test.py @@ -16,8 +16,9 @@ import itertools import re +from collections.abc import Sequence from types import EllipsisType, NotImplementedType -from typing import cast, Sequence +from typing import cast import numpy as np import pytest diff --git a/cirq-core/cirq/ops/dense_pauli_string.py b/cirq-core/cirq/ops/dense_pauli_string.py index 13451ebf544..0be1c66e350 100644 --- a/cirq-core/cirq/ops/dense_pauli_string.py +++ b/cirq-core/cirq/ops/dense_pauli_string.py @@ -16,19 +16,9 @@ import abc import numbers +from collections.abc import Callable, Iterable, Iterator, Sequence, Set from types import NotImplementedType -from typing import ( - AbstractSet, - Any, - Callable, - cast, - Iterable, - Iterator, - overload, - Self, - Sequence, - TYPE_CHECKING, -) +from typing import Any, cast, overload, Self, TYPE_CHECKING import numpy as np import sympy @@ -187,7 +177,7 @@ def _decompose_(self, qubits: Sequence[cirq.Qid]) -> NotImplementedType | cirq.O def _is_parameterized_(self) -> bool: return protocols.is_parameterized(self.coefficient) - def _parameter_names_(self) -> AbstractSet[str]: + def _parameter_names_(self) -> Set[str]: return protocols.parameter_names(self.coefficient) def _resolve_parameters_(self, resolver: cirq.ParamResolver, recursive: bool) -> Self: diff --git a/cirq-core/cirq/ops/diagonal_gate.py b/cirq-core/cirq/ops/diagonal_gate.py index 10fb699e64d..7a6e04d663b 100644 --- a/cirq-core/cirq/ops/diagonal_gate.py +++ b/cirq-core/cirq/ops/diagonal_gate.py @@ -20,7 +20,8 @@ from __future__ import annotations -from typing import AbstractSet, Any, Iterator, Sequence, TYPE_CHECKING +from collections.abc import Iterator, Sequence, Set +from typing import Any, TYPE_CHECKING import numpy as np import sympy @@ -95,7 +96,7 @@ def _num_qubits_(self): def _is_parameterized_(self) -> bool: return any(protocols.is_parameterized(angle) for angle in self._diag_angles_radians) - def _parameter_names_(self) -> AbstractSet[str]: + def _parameter_names_(self) -> Set[str]: return { name for angle in self._diag_angles_radians for name in protocols.parameter_names(angle) } diff --git a/cirq-core/cirq/ops/eigen_gate.py b/cirq-core/cirq/ops/eigen_gate.py index 0982bee597f..c1a970782fd 100644 --- a/cirq-core/cirq/ops/eigen_gate.py +++ b/cirq-core/cirq/ops/eigen_gate.py @@ -18,8 +18,9 @@ import fractions import math import numbers +from collections.abc import Iterable, Set from types import NotImplementedType -from typing import AbstractSet, Any, cast, Iterable, NamedTuple, TYPE_CHECKING +from typing import Any, cast, NamedTuple, TYPE_CHECKING import numpy as np import sympy @@ -341,7 +342,7 @@ def _unitary_(self) -> np.ndarray | NotImplementedType: def _is_parameterized_(self) -> bool: return protocols.is_parameterized(self._exponent) - def _parameter_names_(self) -> AbstractSet[str]: + def _parameter_names_(self) -> Set[str]: return protocols.parameter_names(self._exponent) def _resolve_parameters_(self, resolver: cirq.ParamResolver, recursive: bool) -> EigenGate: diff --git a/cirq-core/cirq/ops/fourier_transform.py b/cirq-core/cirq/ops/fourier_transform.py index 1e155e39d15..cd3a1bada6d 100644 --- a/cirq-core/cirq/ops/fourier_transform.py +++ b/cirq-core/cirq/ops/fourier_transform.py @@ -14,7 +14,8 @@ from __future__ import annotations -from typing import AbstractSet, Any +from collections.abc import Set +from typing import Any import numpy as np import sympy @@ -163,7 +164,7 @@ def _has_unitary_(self) -> bool: def _is_parameterized_(self) -> bool: return cirq.is_parameterized(self.exponent) - def _parameter_names_(self) -> AbstractSet[str]: + def _parameter_names_(self) -> Set[str]: return cirq.parameter_names(self.exponent) def _resolve_parameters_( diff --git a/cirq-core/cirq/ops/fsim_gate.py b/cirq-core/cirq/ops/fsim_gate.py index 55e68814aec..689cc7dc332 100644 --- a/cirq-core/cirq/ops/fsim_gate.py +++ b/cirq-core/cirq/ops/fsim_gate.py @@ -26,7 +26,8 @@ import cmath import math -from typing import AbstractSet, Any, Iterator +from collections.abc import Iterator, Set +from typing import Any import numpy as np import sympy @@ -125,7 +126,7 @@ def _value_equality_values_(self) -> Any: def _is_parameterized_(self) -> bool: return cirq.is_parameterized(self.theta) or cirq.is_parameterized(self.phi) - def _parameter_names_(self) -> AbstractSet[str]: + def _parameter_names_(self) -> Set[str]: return cirq.parameter_names(self.theta) | cirq.parameter_names(self.phi) def _has_unitary_(self): diff --git a/cirq-core/cirq/ops/gate_operation.py b/cirq-core/cirq/ops/gate_operation.py index f565b13d2c8..9c8f2ed8657 100644 --- a/cirq-core/cirq/ops/gate_operation.py +++ b/cirq-core/cirq/ops/gate_operation.py @@ -18,18 +18,9 @@ import re import warnings +from collections.abc import Collection, Mapping, Sequence, Set from types import NotImplementedType -from typing import ( - AbstractSet, - Any, - cast, - Collection, - Mapping, - Self, - Sequence, - TYPE_CHECKING, - TypeVar, -) +from typing import Any, cast, Self, TYPE_CHECKING, TypeVar from cirq import ops, protocols, value from cirq.ops import control_values as cv, gate_features, raw_types @@ -269,7 +260,7 @@ def _is_parameterized_(self) -> bool: return getter() return NotImplemented - def _parameter_names_(self) -> AbstractSet[str]: + def _parameter_names_(self) -> Set[str]: getter = getattr(self.gate, '_parameter_names_', None) if getter is not None: return getter() diff --git a/cirq-core/cirq/ops/gateset.py b/cirq-core/cirq/ops/gateset.py index 1f299e8fc03..c799a213ba7 100644 --- a/cirq-core/cirq/ops/gateset.py +++ b/cirq-core/cirq/ops/gateset.py @@ -16,7 +16,8 @@ from __future__ import annotations -from typing import Any, Callable, cast, Hashable, Iterable, TYPE_CHECKING +from collections.abc import Callable, Hashable, Iterable +from typing import Any, cast, TYPE_CHECKING from cirq import protocols, value from cirq.ops import global_phase_op, op_tree, raw_types diff --git a/cirq-core/cirq/ops/global_phase_op.py b/cirq-core/cirq/ops/global_phase_op.py index 45bc1332520..ac71d7461de 100644 --- a/cirq-core/cirq/ops/global_phase_op.py +++ b/cirq-core/cirq/ops/global_phase_op.py @@ -15,8 +15,9 @@ from __future__ import annotations +from collections.abc import Collection, Sequence, Set from types import NotImplementedType -from typing import AbstractSet, Any, cast, Collection, Sequence +from typing import Any, cast import numpy as np import sympy @@ -83,7 +84,7 @@ def _qid_shape_(self) -> tuple[int, ...]: def _is_parameterized_(self) -> bool: return protocols.is_parameterized(self.coefficient) - def _parameter_names_(self) -> AbstractSet[str]: + def _parameter_names_(self) -> Set[str]: return protocols.parameter_names(self.coefficient) def _resolve_parameters_( diff --git a/cirq-core/cirq/ops/greedy_qubit_manager.py b/cirq-core/cirq/ops/greedy_qubit_manager.py index e1da0b408e2..d3ad352fad7 100644 --- a/cirq-core/cirq/ops/greedy_qubit_manager.py +++ b/cirq-core/cirq/ops/greedy_qubit_manager.py @@ -14,7 +14,8 @@ from __future__ import annotations -from typing import Iterable, TYPE_CHECKING +from collections.abc import Iterable +from typing import TYPE_CHECKING from cirq.ops import named_qubit, qid_util, qubit_manager diff --git a/cirq-core/cirq/ops/identity.py b/cirq-core/cirq/ops/identity.py index 165b0b3671a..05b46c89fc6 100644 --- a/cirq-core/cirq/ops/identity.py +++ b/cirq-core/cirq/ops/identity.py @@ -16,8 +16,9 @@ from __future__ import annotations import numbers +from collections.abc import Sequence from types import NotImplementedType -from typing import Any, Sequence, TYPE_CHECKING +from typing import Any, TYPE_CHECKING import numpy as np import sympy diff --git a/cirq-core/cirq/ops/kraus_channel.py b/cirq-core/cirq/ops/kraus_channel.py index 275c7dd30f0..315afcaae5d 100644 --- a/cirq-core/cirq/ops/kraus_channel.py +++ b/cirq-core/cirq/ops/kraus_channel.py @@ -2,7 +2,8 @@ from __future__ import annotations -from typing import Any, Iterable, Mapping, TYPE_CHECKING +from collections.abc import Iterable, Mapping +from typing import Any, TYPE_CHECKING import numpy as np diff --git a/cirq-core/cirq/ops/linear_combinations.py b/cirq-core/cirq/ops/linear_combinations.py index 3dfcaff536b..275d8e4782f 100644 --- a/cirq-core/cirq/ops/linear_combinations.py +++ b/cirq-core/cirq/ops/linear_combinations.py @@ -16,7 +16,8 @@ import numbers from collections import defaultdict -from typing import AbstractSet, Any, Iterable, Mapping, TYPE_CHECKING, Union +from collections.abc import Iterable, Mapping, Set +from typing import Any, TYPE_CHECKING, Union import numpy as np import sympy @@ -136,7 +137,7 @@ def __pow__(self, exponent: int) -> LinearCombinationOfGates: def _is_parameterized_(self) -> bool: return any(protocols.is_parameterized(item) for item in self.items()) - def _parameter_names_(self) -> AbstractSet[str]: + def _parameter_names_(self) -> Set[str]: return {name for item in self.items() for name in protocols.parameter_names(item)} def _resolve_parameters_( @@ -253,7 +254,7 @@ def __pow__(self, exponent: int) -> LinearCombinationOfOperations: def _is_parameterized_(self) -> bool: return any(protocols.is_parameterized(item) for item in self.items()) - def _parameter_names_(self) -> AbstractSet[str]: + def _parameter_names_(self) -> Set[str]: return {name for item in self.items() for name in protocols.parameter_names(item)} def _resolve_parameters_( diff --git a/cirq-core/cirq/ops/matrix_gates.py b/cirq-core/cirq/ops/matrix_gates.py index 68dcf2d9e74..12adf2df7c5 100644 --- a/cirq-core/cirq/ops/matrix_gates.py +++ b/cirq-core/cirq/ops/matrix_gates.py @@ -16,7 +16,8 @@ from __future__ import annotations -from typing import Any, Iterable, TYPE_CHECKING +from collections.abc import Iterable +from typing import Any, TYPE_CHECKING import numpy as np diff --git a/cirq-core/cirq/ops/measure_util.py b/cirq-core/cirq/ops/measure_util.py index 5b02164479a..fa8f46e6803 100644 --- a/cirq-core/cirq/ops/measure_util.py +++ b/cirq-core/cirq/ops/measure_util.py @@ -14,7 +14,8 @@ from __future__ import annotations -from typing import Callable, cast, Iterable, overload, TYPE_CHECKING +from collections.abc import Callable, Iterable +from typing import cast, overload, TYPE_CHECKING import numpy as np diff --git a/cirq-core/cirq/ops/measurement_gate.py b/cirq-core/cirq/ops/measurement_gate.py index fbc400587fa..dde17ee3a91 100644 --- a/cirq-core/cirq/ops/measurement_gate.py +++ b/cirq-core/cirq/ops/measurement_gate.py @@ -14,7 +14,8 @@ from __future__ import annotations -from typing import Any, Iterable, Mapping, Sequence, TYPE_CHECKING +from collections.abc import Iterable, Mapping, Sequence +from typing import Any, TYPE_CHECKING import numpy as np diff --git a/cirq-core/cirq/ops/mixed_unitary_channel.py b/cirq-core/cirq/ops/mixed_unitary_channel.py index 0f1124c500c..b70795efdeb 100644 --- a/cirq-core/cirq/ops/mixed_unitary_channel.py +++ b/cirq-core/cirq/ops/mixed_unitary_channel.py @@ -2,7 +2,8 @@ from __future__ import annotations -from typing import Any, Iterable, Mapping, TYPE_CHECKING +from collections.abc import Iterable, Mapping +from typing import Any, TYPE_CHECKING import numpy as np diff --git a/cirq-core/cirq/ops/op_tree.py b/cirq-core/cirq/ops/op_tree.py index 2c982b61005..43ebdfc01e6 100644 --- a/cirq-core/cirq/ops/op_tree.py +++ b/cirq-core/cirq/ops/op_tree.py @@ -16,7 +16,8 @@ from __future__ import annotations -from typing import Callable, Iterable, Iterator, NoReturn, TYPE_CHECKING +from collections.abc import Callable, Iterable, Iterator +from typing import NoReturn, TYPE_CHECKING from cirq._doc import document from cirq._import import LazyLoader diff --git a/cirq-core/cirq/ops/parallel_gate.py b/cirq-core/cirq/ops/parallel_gate.py index 085f317eef0..8f2c1a7ed0f 100644 --- a/cirq-core/cirq/ops/parallel_gate.py +++ b/cirq-core/cirq/ops/parallel_gate.py @@ -14,8 +14,9 @@ from __future__ import annotations +from collections.abc import Set from types import NotImplementedType -from typing import AbstractSet, Any, TYPE_CHECKING +from typing import Any, TYPE_CHECKING import numpy as np @@ -90,7 +91,7 @@ def _has_unitary_(self) -> bool: def _is_parameterized_(self) -> bool: return protocols.is_parameterized(self.sub_gate) - def _parameter_names_(self) -> AbstractSet[str]: + def _parameter_names_(self) -> Set[str]: return protocols.parameter_names(self.sub_gate) def _resolve_parameters_(self, resolver: cirq.ParamResolver, recursive: bool) -> ParallelGate: diff --git a/cirq-core/cirq/ops/parity_gates.py b/cirq-core/cirq/ops/parity_gates.py index 5980b13b68e..273561204aa 100644 --- a/cirq-core/cirq/ops/parity_gates.py +++ b/cirq-core/cirq/ops/parity_gates.py @@ -16,7 +16,8 @@ from __future__ import annotations -from typing import Any, Iterator, Self, Sequence, TYPE_CHECKING +from collections.abc import Iterator, Sequence +from typing import Any, Self, TYPE_CHECKING import numpy as np diff --git a/cirq-core/cirq/ops/pauli_interaction_gate.py b/cirq-core/cirq/ops/pauli_interaction_gate.py index 1c6b02de4c3..f969d03d55b 100644 --- a/cirq-core/cirq/ops/pauli_interaction_gate.py +++ b/cirq-core/cirq/ops/pauli_interaction_gate.py @@ -14,7 +14,8 @@ from __future__ import annotations -from typing import Any, Iterator, Sequence, TYPE_CHECKING +from collections.abc import Iterator, Sequence +from typing import Any, TYPE_CHECKING import numpy as np diff --git a/cirq-core/cirq/ops/pauli_measurement_gate.py b/cirq-core/cirq/ops/pauli_measurement_gate.py index 72a2ba23493..d87fee97710 100644 --- a/cirq-core/cirq/ops/pauli_measurement_gate.py +++ b/cirq-core/cirq/ops/pauli_measurement_gate.py @@ -14,7 +14,8 @@ from __future__ import annotations -from typing import Any, cast, Iterable, Iterator, Mapping, Sequence, TYPE_CHECKING +from collections.abc import Iterable, Iterator, Mapping, Sequence +from typing import Any, cast, TYPE_CHECKING from cirq import protocols, value from cirq.ops import ( diff --git a/cirq-core/cirq/ops/pauli_string.py b/cirq-core/cirq/ops/pauli_string.py index fb2e649d05f..23f09540f60 100644 --- a/cirq-core/cirq/ops/pauli_string.py +++ b/cirq-core/cirq/ops/pauli_string.py @@ -17,25 +17,19 @@ import cmath import math import numbers -from types import NotImplementedType -from typing import ( - AbstractSet, - Any, +from collections.abc import ( Callable, - cast, - Generic, ItemsView, Iterable, Iterator, KeysView, Mapping, - overload, Sequence, - TYPE_CHECKING, - TypeVar, - Union, + Set, ValuesView, ) +from types import NotImplementedType +from typing import Any, cast, Generic, overload, TYPE_CHECKING, TypeVar, Union import numpy as np import sympy @@ -1040,7 +1034,7 @@ def pass_operations_over( def _is_parameterized_(self) -> bool: return protocols.is_parameterized(self.coefficient) - def _parameter_names_(self) -> AbstractSet[str]: + def _parameter_names_(self) -> Set[str]: return protocols.parameter_names(self.coefficient) def _resolve_parameters_( @@ -1233,7 +1227,7 @@ def _imul_atom_helper(self, key: TKey, pauli_lhs: int, sign: int) -> int: return sign return -sign - def keys(self) -> AbstractSet[TKey]: + def keys(self) -> Set[TKey]: """Returns the sequence of qubits on which this pauli string acts.""" return self.pauli_int_dict.keys() diff --git a/cirq-core/cirq/ops/pauli_string_phasor.py b/cirq-core/cirq/ops/pauli_string_phasor.py index 977611d1848..e01b181f800 100644 --- a/cirq-core/cirq/ops/pauli_string_phasor.py +++ b/cirq-core/cirq/ops/pauli_string_phasor.py @@ -15,7 +15,8 @@ from __future__ import annotations import numbers -from typing import AbstractSet, cast, Iterable, Iterator, Sequence, TYPE_CHECKING +from collections.abc import Iterable, Iterator, Sequence, Set +from typing import cast, TYPE_CHECKING from cirq import protocols, value from cirq._compat import deprecated, proper_repr @@ -388,7 +389,7 @@ def _is_parameterized_(self) -> bool: self.exponent_pos ) - def _parameter_names_(self) -> AbstractSet[str]: + def _parameter_names_(self) -> Set[str]: return protocols.parameter_names(self.exponent_neg) | protocols.parameter_names( self.exponent_pos ) diff --git a/cirq-core/cirq/ops/pauli_string_raw_types.py b/cirq-core/cirq/ops/pauli_string_raw_types.py index 5fdb97ce6f2..0cc7101c70a 100644 --- a/cirq-core/cirq/ops/pauli_string_raw_types.py +++ b/cirq-core/cirq/ops/pauli_string_raw_types.py @@ -15,7 +15,8 @@ from __future__ import annotations import abc -from typing import Any, Self, Sequence, TYPE_CHECKING +from collections.abc import Sequence +from typing import Any, Self, TYPE_CHECKING from cirq import protocols from cirq.ops import pauli_string as ps, raw_types diff --git a/cirq-core/cirq/ops/pauli_string_test.py b/cirq-core/cirq/ops/pauli_string_test.py index 5e0d8569f98..2661d6e42c7 100644 --- a/cirq-core/cirq/ops/pauli_string_test.py +++ b/cirq-core/cirq/ops/pauli_string_test.py @@ -16,7 +16,7 @@ import itertools import math -from typing import Iterator +from collections.abc import Iterator import numpy as np import pytest diff --git a/cirq-core/cirq/ops/pauli_sum_exponential.py b/cirq-core/cirq/ops/pauli_sum_exponential.py index a73e80fe042..86e3655c76b 100644 --- a/cirq-core/cirq/ops/pauli_sum_exponential.py +++ b/cirq-core/cirq/ops/pauli_sum_exponential.py @@ -14,7 +14,8 @@ from __future__ import annotations -from typing import Any, Iterator, TYPE_CHECKING +from collections.abc import Iterator +from typing import Any, TYPE_CHECKING import numpy as np diff --git a/cirq-core/cirq/ops/permutation_gate.py b/cirq-core/cirq/ops/permutation_gate.py index af209fa44b0..823773be6c3 100644 --- a/cirq-core/cirq/ops/permutation_gate.py +++ b/cirq-core/cirq/ops/permutation_gate.py @@ -14,7 +14,8 @@ from __future__ import annotations -from typing import Any, Iterator, Sequence, TYPE_CHECKING +from collections.abc import Iterator, Sequence +from typing import Any, TYPE_CHECKING from cirq import protocols, value from cirq.ops import raw_types, swap_gates diff --git a/cirq-core/cirq/ops/phased_iswap_gate.py b/cirq-core/cirq/ops/phased_iswap_gate.py index 11ec449ea7f..f15293a53f1 100644 --- a/cirq-core/cirq/ops/phased_iswap_gate.py +++ b/cirq-core/cirq/ops/phased_iswap_gate.py @@ -15,7 +15,8 @@ from __future__ import annotations -from typing import AbstractSet, Any, cast, Iterator, Sequence +from collections.abc import Iterator, Sequence, Set +from typing import Any, cast import numpy as np import sympy @@ -108,7 +109,7 @@ def _is_parameterized_(self) -> bool: self._phase_exponent ) - def _parameter_names_(self) -> AbstractSet[str]: + def _parameter_names_(self) -> Set[str]: return protocols.parameter_names(self._iswap) | protocols.parameter_names( self._phase_exponent ) diff --git a/cirq-core/cirq/ops/phased_x_gate.py b/cirq-core/cirq/ops/phased_x_gate.py index 43fdbab5250..2af275e1adf 100644 --- a/cirq-core/cirq/ops/phased_x_gate.py +++ b/cirq-core/cirq/ops/phased_x_gate.py @@ -18,8 +18,9 @@ import math import numbers +from collections.abc import Sequence, Set from types import NotImplementedType -from typing import AbstractSet, Any, cast, Sequence +from typing import Any, cast import numpy as np import sympy @@ -166,7 +167,7 @@ def _is_parameterized_(self) -> bool: self._phase_exponent ) - def _parameter_names_(self) -> AbstractSet[str]: + def _parameter_names_(self) -> Set[str]: """See `cirq.SupportsParameterization`.""" return protocols.parameter_names(self._exponent) | protocols.parameter_names( self._phase_exponent diff --git a/cirq-core/cirq/ops/phased_x_z_gate.py b/cirq-core/cirq/ops/phased_x_z_gate.py index 1bee0dc619e..333a122a201 100644 --- a/cirq-core/cirq/ops/phased_x_z_gate.py +++ b/cirq-core/cirq/ops/phased_x_z_gate.py @@ -15,7 +15,8 @@ from __future__ import annotations import numbers -from typing import AbstractSet, Any, Iterator, Sequence, TYPE_CHECKING +from collections.abc import Iterator, Sequence, Set +from typing import Any, TYPE_CHECKING import numpy as np import sympy @@ -220,7 +221,7 @@ def _is_parameterized_(self) -> bool: or protocols.is_parameterized(self._axis_phase_exponent) ) - def _parameter_names_(self) -> AbstractSet[str]: + def _parameter_names_(self) -> Set[str]: """See `cirq.SupportsParameterization`.""" return ( protocols.parameter_names(self._x_exponent) diff --git a/cirq-core/cirq/ops/projector.py b/cirq-core/cirq/ops/projector.py index 7e3b7f310ac..4ac071d228f 100644 --- a/cirq-core/cirq/ops/projector.py +++ b/cirq-core/cirq/ops/projector.py @@ -4,7 +4,8 @@ import itertools import math -from typing import Any, Iterable, Mapping, TYPE_CHECKING +from collections.abc import Iterable, Mapping +from typing import Any, TYPE_CHECKING import numpy as np from scipy.sparse import csr_matrix diff --git a/cirq-core/cirq/ops/qubit_manager.py b/cirq-core/cirq/ops/qubit_manager.py index 9ffb9987b19..84e95d27aa4 100644 --- a/cirq-core/cirq/ops/qubit_manager.py +++ b/cirq-core/cirq/ops/qubit_manager.py @@ -16,7 +16,8 @@ import abc import dataclasses -from typing import Iterable, TYPE_CHECKING +from collections.abc import Iterable +from typing import TYPE_CHECKING from cirq.ops import raw_types diff --git a/cirq-core/cirq/ops/qubit_order.py b/cirq-core/cirq/ops/qubit_order.py index 26aa96dd56c..360dd6918d0 100644 --- a/cirq-core/cirq/ops/qubit_order.py +++ b/cirq-core/cirq/ops/qubit_order.py @@ -14,7 +14,8 @@ from __future__ import annotations -from typing import Any, Callable, Iterable, TYPE_CHECKING, TypeVar +from collections.abc import Callable, Iterable +from typing import Any, TYPE_CHECKING, TypeVar if TYPE_CHECKING: import cirq diff --git a/cirq-core/cirq/ops/qubit_order_or_list.py b/cirq-core/cirq/ops/qubit_order_or_list.py index ea6f1d8911f..198f54ba945 100644 --- a/cirq-core/cirq/ops/qubit_order_or_list.py +++ b/cirq-core/cirq/ops/qubit_order_or_list.py @@ -20,7 +20,7 @@ from __future__ import annotations -from typing import Iterable +from collections.abc import Iterable from cirq._doc import document from cirq.ops import qubit_order, raw_types diff --git a/cirq-core/cirq/ops/random_gate_channel.py b/cirq-core/cirq/ops/random_gate_channel.py index 63f8a7ad50c..3318525db5f 100644 --- a/cirq-core/cirq/ops/random_gate_channel.py +++ b/cirq-core/cirq/ops/random_gate_channel.py @@ -15,7 +15,8 @@ from __future__ import annotations import numbers -from typing import AbstractSet, Any, cast, SupportsFloat, TYPE_CHECKING +from collections.abc import Set +from typing import Any, cast, SupportsFloat, TYPE_CHECKING import numpy as np @@ -74,7 +75,7 @@ def _is_parameterized_(self) -> bool: self.sub_gate ) - def _parameter_names_(self) -> AbstractSet[str]: + def _parameter_names_(self) -> Set[str]: return protocols.parameter_names(self.probability) | protocols.parameter_names( self.sub_gate ) diff --git a/cirq-core/cirq/ops/raw_types.py b/cirq-core/cirq/ops/raw_types.py index 86b147ef56f..df6c4514c96 100644 --- a/cirq-core/cirq/ops/raw_types.py +++ b/cirq-core/cirq/ops/raw_types.py @@ -18,20 +18,9 @@ import abc import functools +from collections.abc import Callable, Collection, Hashable, Iterable, Mapping, Sequence, Set from types import NotImplementedType -from typing import ( - AbstractSet, - Any, - Callable, - cast, - Collection, - Hashable, - Iterable, - Mapping, - overload, - Sequence, - TYPE_CHECKING, -) +from typing import Any, cast, overload, TYPE_CHECKING import numpy as np @@ -912,7 +901,7 @@ def _act_on_(self, sim_state: cirq.SimulationStateBase) -> bool: return NotImplemented @cached_method - def _parameter_names_(self) -> AbstractSet[str]: + def _parameter_names_(self) -> Set[str]: tag_params = {name for tag in self.tags for name in protocols.parameter_names(tag)} return protocols.parameter_names(self.sub_operation) | tag_params @@ -1026,7 +1015,7 @@ def _is_parameterized_(self) -> bool: return protocols.is_parameterized(self._original) @cached_method - def _parameter_names_(self) -> AbstractSet[str]: + def _parameter_names_(self) -> Set[str]: return protocols.parameter_names(self._original) def _resolve_parameters_( diff --git a/cirq-core/cirq/ops/raw_types_test.py b/cirq-core/cirq/ops/raw_types_test.py index d7447a0126c..d9e7a206c33 100644 --- a/cirq-core/cirq/ops/raw_types_test.py +++ b/cirq-core/cirq/ops/raw_types_test.py @@ -14,7 +14,8 @@ from __future__ import annotations -from typing import AbstractSet, Any, cast, Iterator +from collections.abc import Iterator, Set +from typing import Any, cast import numpy as np import pytest @@ -739,7 +740,7 @@ def __eq__(self, other): def _is_parameterized_(self) -> bool: return cirq.is_parameterized(self.value) - def _parameter_names_(self) -> AbstractSet[str]: + def _parameter_names_(self) -> Set[str]: return cirq.parameter_names(self.value) def _resolve_parameters_( @@ -781,7 +782,7 @@ def _has_unitary_(self): def _value_equality_values_(self): return (self._param,) - def _parameter_names_(self) -> AbstractSet[str]: + def _parameter_names_(self) -> Set[str]: return cirq.parameter_names(self._param) def _is_parameterized_(self) -> bool: diff --git a/cirq-core/cirq/ops/state_preparation_channel.py b/cirq-core/cirq/ops/state_preparation_channel.py index 895f5040241..fd617d97e0a 100644 --- a/cirq-core/cirq/ops/state_preparation_channel.py +++ b/cirq-core/cirq/ops/state_preparation_channel.py @@ -16,7 +16,8 @@ from __future__ import annotations -from typing import Any, Iterable, TYPE_CHECKING +from collections.abc import Iterable +from typing import Any, TYPE_CHECKING import numpy as np diff --git a/cirq-core/cirq/ops/three_qubit_gates.py b/cirq-core/cirq/ops/three_qubit_gates.py index 65958124351..f5212f72cbd 100644 --- a/cirq-core/cirq/ops/three_qubit_gates.py +++ b/cirq-core/cirq/ops/three_qubit_gates.py @@ -16,7 +16,8 @@ from __future__ import annotations -from typing import AbstractSet, Any, Collection, Iterator, Sequence, TYPE_CHECKING +from collections.abc import Collection, Iterator, Sequence, Set +from typing import Any, TYPE_CHECKING import numpy as np import sympy @@ -224,7 +225,7 @@ def diag_angles_radians(self) -> tuple[value.TParamVal, ...]: def _is_parameterized_(self) -> bool: return any(protocols.is_parameterized(angle) for angle in self._diag_angles_radians) - def _parameter_names_(self) -> AbstractSet[str]: + def _parameter_names_(self) -> Set[str]: return { name for angle in self._diag_angles_radians for name in protocols.parameter_names(angle) } diff --git a/cirq-core/cirq/ops/two_qubit_diagonal_gate.py b/cirq-core/cirq/ops/two_qubit_diagonal_gate.py index 5691e10ece2..45c65f4c052 100644 --- a/cirq-core/cirq/ops/two_qubit_diagonal_gate.py +++ b/cirq-core/cirq/ops/two_qubit_diagonal_gate.py @@ -20,7 +20,8 @@ from __future__ import annotations -from typing import AbstractSet, Any, Iterator, Sequence, TYPE_CHECKING +from collections.abc import Iterator, Sequence, Set +from typing import Any, TYPE_CHECKING import numpy as np import sympy @@ -76,7 +77,7 @@ def _num_qubits_(self) -> int: def _is_parameterized_(self) -> bool: return any(protocols.is_parameterized(angle) for angle in self._diag_angles_radians) - def _parameter_names_(self) -> AbstractSet[str]: + def _parameter_names_(self) -> Set[str]: return { name for angle in self._diag_angles_radians for name in protocols.parameter_names(angle) } diff --git a/cirq-core/cirq/ops/uniform_superposition_gate.py b/cirq-core/cirq/ops/uniform_superposition_gate.py index 1ee0304bc18..48de8b25df9 100644 --- a/cirq-core/cirq/ops/uniform_superposition_gate.py +++ b/cirq-core/cirq/ops/uniform_superposition_gate.py @@ -14,7 +14,8 @@ from __future__ import annotations -from typing import Any, Iterator, Sequence, TYPE_CHECKING +from collections.abc import Iterator, Sequence +from typing import Any, TYPE_CHECKING import numpy as np diff --git a/cirq-core/cirq/ops/wait_gate.py b/cirq-core/cirq/ops/wait_gate.py index fd5d860102d..406448e9328 100644 --- a/cirq-core/cirq/ops/wait_gate.py +++ b/cirq-core/cirq/ops/wait_gate.py @@ -14,7 +14,8 @@ from __future__ import annotations -from typing import AbstractSet, Any, TYPE_CHECKING +from collections.abc import Set +from typing import Any, TYPE_CHECKING import sympy @@ -80,7 +81,7 @@ def duration(self) -> cirq.Duration: def _is_parameterized_(self) -> bool: return protocols.is_parameterized(self.duration) - def _parameter_names_(self) -> AbstractSet[str]: + def _parameter_names_(self) -> Set[str]: return protocols.parameter_names(self.duration) def _resolve_parameters_(self, resolver: cirq.ParamResolver, recursive: bool) -> WaitGate: diff --git a/cirq-core/cirq/protocols/act_on_protocol.py b/cirq-core/cirq/protocols/act_on_protocol.py index 6c8f62b3766..bbf2a10999c 100644 --- a/cirq-core/cirq/protocols/act_on_protocol.py +++ b/cirq-core/cirq/protocols/act_on_protocol.py @@ -14,8 +14,9 @@ from __future__ import annotations +from collections.abc import Sequence from types import NotImplementedType -from typing import Any, Protocol, Sequence, TYPE_CHECKING +from typing import Any, Protocol, TYPE_CHECKING from cirq import ops from cirq._doc import doc_private diff --git a/cirq-core/cirq/protocols/act_on_protocol_test.py b/cirq-core/cirq/protocols/act_on_protocol_test.py index 4858ad07bd3..f5a01f159da 100644 --- a/cirq-core/cirq/protocols/act_on_protocol_test.py +++ b/cirq-core/cirq/protocols/act_on_protocol_test.py @@ -14,7 +14,8 @@ from __future__ import annotations -from typing import Any, Self, Sequence +from collections.abc import Sequence +from typing import Any, Self import numpy as np import pytest diff --git a/cirq-core/cirq/protocols/apply_channel_protocol.py b/cirq-core/cirq/protocols/apply_channel_protocol.py index fb78fe841ed..bf1fcccfe3b 100644 --- a/cirq-core/cirq/protocols/apply_channel_protocol.py +++ b/cirq-core/cirq/protocols/apply_channel_protocol.py @@ -16,8 +16,9 @@ from __future__ import annotations +from collections.abc import Iterable, Sequence from types import NotImplementedType -from typing import Any, Iterable, Protocol, Sequence, TypeVar +from typing import Any, Protocol, TypeVar import numpy as np diff --git a/cirq-core/cirq/protocols/apply_mixture_protocol.py b/cirq-core/cirq/protocols/apply_mixture_protocol.py index ba60606286a..091e2d291b4 100644 --- a/cirq-core/cirq/protocols/apply_mixture_protocol.py +++ b/cirq-core/cirq/protocols/apply_mixture_protocol.py @@ -16,8 +16,9 @@ from __future__ import annotations +from collections.abc import Iterable from types import NotImplementedType -from typing import Any, cast, Iterable, Protocol, TypeVar +from typing import Any, cast, Protocol, TypeVar import numpy as np diff --git a/cirq-core/cirq/protocols/apply_mixture_protocol_test.py b/cirq-core/cirq/protocols/apply_mixture_protocol_test.py index aeb2a46f7b1..b0ae20dabd6 100644 --- a/cirq-core/cirq/protocols/apply_mixture_protocol_test.py +++ b/cirq-core/cirq/protocols/apply_mixture_protocol_test.py @@ -13,7 +13,8 @@ # limitations under the License. from __future__ import annotations -from typing import Any, cast, Iterable +from collections.abc import Iterable +from typing import Any, cast import numpy as np import pytest diff --git a/cirq-core/cirq/protocols/apply_unitary_protocol.py b/cirq-core/cirq/protocols/apply_unitary_protocol.py index f7a3022b6b1..1231ac8d983 100644 --- a/cirq-core/cirq/protocols/apply_unitary_protocol.py +++ b/cirq-core/cirq/protocols/apply_unitary_protocol.py @@ -17,8 +17,9 @@ from __future__ import annotations import warnings +from collections.abc import Iterable, Sequence from types import EllipsisType, NotImplementedType -from typing import Any, cast, Iterable, Protocol, Sequence, TYPE_CHECKING, TypeVar +from typing import Any, cast, Protocol, TYPE_CHECKING, TypeVar import numpy as np diff --git a/cirq-core/cirq/protocols/approximate_equality_protocol.py b/cirq-core/cirq/protocols/approximate_equality_protocol.py index 6739ab7a85c..5612c2d7283 100644 --- a/cirq-core/cirq/protocols/approximate_equality_protocol.py +++ b/cirq-core/cirq/protocols/approximate_equality_protocol.py @@ -15,9 +15,10 @@ from __future__ import annotations import numbers +from collections.abc import Iterable from decimal import Decimal from fractions import Fraction -from typing import Any, Iterable, Protocol +from typing import Any, Protocol import numpy as np import sympy diff --git a/cirq-core/cirq/protocols/circuit_diagram_info_protocol.py b/cirq-core/cirq/protocols/circuit_diagram_info_protocol.py index 13c83dc859a..8ab80d59313 100644 --- a/cirq-core/cirq/protocols/circuit_diagram_info_protocol.py +++ b/cirq-core/cirq/protocols/circuit_diagram_info_protocol.py @@ -15,8 +15,9 @@ from __future__ import annotations import re +from collections.abc import Iterable, Sequence from fractions import Fraction -from typing import Any, Iterable, overload, Protocol, Self, Sequence, TYPE_CHECKING, TypeVar, Union +from typing import Any, overload, Protocol, Self, TYPE_CHECKING, TypeVar, Union import numpy as np import sympy diff --git a/cirq-core/cirq/protocols/decompose_protocol.py b/cirq-core/cirq/protocols/decompose_protocol.py index 4b14be53257..aef644913af 100644 --- a/cirq-core/cirq/protocols/decompose_protocol.py +++ b/cirq-core/cirq/protocols/decompose_protocol.py @@ -18,19 +18,9 @@ import inspect import itertools from collections import defaultdict +from collections.abc import Callable, Iterable, Iterator, Sequence from types import NotImplementedType -from typing import ( - Any, - Callable, - Iterable, - Iterator, - overload, - Protocol, - Sequence, - TYPE_CHECKING, - TypeVar, - Union, -) +from typing import Any, overload, Protocol, TYPE_CHECKING, TypeVar, Union from cirq import devices, ops from cirq._doc import doc_private diff --git a/cirq-core/cirq/protocols/hash_from_pickle_test.py b/cirq-core/cirq/protocols/hash_from_pickle_test.py index 63f772856fd..8591274dccc 100644 --- a/cirq-core/cirq/protocols/hash_from_pickle_test.py +++ b/cirq-core/cirq/protocols/hash_from_pickle_test.py @@ -18,8 +18,8 @@ import os import pathlib import pickle -from collections.abc import Iterator -from typing import Any, Hashable +from collections.abc import Hashable, Iterator +from typing import Any import pytest diff --git a/cirq-core/cirq/protocols/inverse_protocol.py b/cirq-core/cirq/protocols/inverse_protocol.py index 2191bc173b0..bd319c19179 100644 --- a/cirq-core/cirq/protocols/inverse_protocol.py +++ b/cirq-core/cirq/protocols/inverse_protocol.py @@ -14,7 +14,8 @@ from __future__ import annotations -from typing import Any, Iterable, overload, TYPE_CHECKING, TypeVar +from collections.abc import Iterable +from typing import Any, overload, TYPE_CHECKING, TypeVar from cirq import ops diff --git a/cirq-core/cirq/protocols/json_serialization.py b/cirq-core/cirq/protocols/json_serialization.py index e92febf6d48..bc8c5c6c879 100644 --- a/cirq-core/cirq/protocols/json_serialization.py +++ b/cirq-core/cirq/protocols/json_serialization.py @@ -20,8 +20,9 @@ import json import numbers import pathlib +from collections.abc import Callable, Iterable, Sequence from types import NotImplementedType -from typing import Any, Callable, cast, IO, Iterable, overload, Protocol, Sequence +from typing import Any, cast, IO, overload, Protocol import attrs import numpy as np diff --git a/cirq-core/cirq/protocols/kraus_protocol.py b/cirq-core/cirq/protocols/kraus_protocol.py index e8daca186e8..6ad2f813836 100644 --- a/cirq-core/cirq/protocols/kraus_protocol.py +++ b/cirq-core/cirq/protocols/kraus_protocol.py @@ -17,8 +17,9 @@ from __future__ import annotations import warnings +from collections.abc import Iterable from types import NotImplementedType -from typing import Any, Iterable, Protocol, TypeVar +from typing import Any, Protocol, TypeVar import numpy as np diff --git a/cirq-core/cirq/protocols/kraus_protocol_test.py b/cirq-core/cirq/protocols/kraus_protocol_test.py index e7b794ede7e..0229510489f 100644 --- a/cirq-core/cirq/protocols/kraus_protocol_test.py +++ b/cirq-core/cirq/protocols/kraus_protocol_test.py @@ -16,7 +16,7 @@ from __future__ import annotations -from typing import Iterable +from collections.abc import Iterable import numpy as np import pytest diff --git a/cirq-core/cirq/protocols/measurement_key_protocol.py b/cirq-core/cirq/protocols/measurement_key_protocol.py index 6346e577540..a141e759107 100644 --- a/cirq-core/cirq/protocols/measurement_key_protocol.py +++ b/cirq-core/cirq/protocols/measurement_key_protocol.py @@ -16,8 +16,9 @@ from __future__ import annotations +from collections.abc import Mapping from types import NotImplementedType -from typing import Any, Mapping, overload, Protocol, TYPE_CHECKING, TypeVar +from typing import Any, overload, Protocol, TYPE_CHECKING, TypeVar from cirq import value from cirq._doc import doc_private diff --git a/cirq-core/cirq/protocols/mixture_protocol.py b/cirq-core/cirq/protocols/mixture_protocol.py index 2d51349f1e2..a4933c825e8 100644 --- a/cirq-core/cirq/protocols/mixture_protocol.py +++ b/cirq-core/cirq/protocols/mixture_protocol.py @@ -16,8 +16,9 @@ from __future__ import annotations +from collections.abc import Sequence from types import NotImplementedType -from typing import Any, Protocol, Sequence +from typing import Any, Protocol import numpy as np diff --git a/cirq-core/cirq/protocols/pow_protocol.py b/cirq-core/cirq/protocols/pow_protocol.py index c5d6b262aee..69360cb3006 100644 --- a/cirq-core/cirq/protocols/pow_protocol.py +++ b/cirq-core/cirq/protocols/pow_protocol.py @@ -16,7 +16,8 @@ from __future__ import annotations -from typing import Any, Callable, overload, TYPE_CHECKING, TypeVar +from collections.abc import Callable +from typing import Any, overload, TYPE_CHECKING, TypeVar if TYPE_CHECKING: import cirq diff --git a/cirq-core/cirq/protocols/qasm.py b/cirq-core/cirq/protocols/qasm.py index 36216ff6a89..c7dacd8c4c6 100644 --- a/cirq-core/cirq/protocols/qasm.py +++ b/cirq-core/cirq/protocols/qasm.py @@ -15,8 +15,9 @@ from __future__ import annotations import string +from collections.abc import Iterable, Mapping from types import NotImplementedType -from typing import Any, Iterable, Mapping, Protocol, TYPE_CHECKING, TypeVar +from typing import Any, Protocol, TYPE_CHECKING, TypeVar from cirq import ops from cirq._doc import doc_private diff --git a/cirq-core/cirq/protocols/qid_shape_protocol.py b/cirq-core/cirq/protocols/qid_shape_protocol.py index d02eeecef05..86331d2d98d 100644 --- a/cirq-core/cirq/protocols/qid_shape_protocol.py +++ b/cirq-core/cirq/protocols/qid_shape_protocol.py @@ -14,8 +14,9 @@ from __future__ import annotations +from collections.abc import Sequence from types import NotImplementedType -from typing import Any, Protocol, Sequence, TypeVar +from typing import Any, Protocol, TypeVar from cirq import ops from cirq._doc import doc_private, document diff --git a/cirq-core/cirq/protocols/resolve_parameters.py b/cirq-core/cirq/protocols/resolve_parameters.py index 95c7229d33c..e7875a6e429 100644 --- a/cirq-core/cirq/protocols/resolve_parameters.py +++ b/cirq-core/cirq/protocols/resolve_parameters.py @@ -15,7 +15,8 @@ from __future__ import annotations import numbers -from typing import AbstractSet, Any, cast, Protocol, Self, TYPE_CHECKING, TypeVar +from collections.abc import Set +from typing import Any, cast, Protocol, Self, TYPE_CHECKING, TypeVar import sympy @@ -40,7 +41,7 @@ def _is_parameterized_(self) -> bool: and False otherwise.""" @doc_private - def _parameter_names_(self) -> AbstractSet[str]: + def _parameter_names_(self) -> Set[str]: """Returns a collection of string names of parameters that require resolution. If _is_parameterized_ is False, the collection is empty. The converse is not necessarily true, because some objects may report @@ -92,7 +93,7 @@ def is_parameterized(val: Any) -> bool: return bool(parameter_names(val)) -def parameter_names(val: Any) -> AbstractSet[str]: +def parameter_names(val: Any) -> Set[str]: """Returns parameter names for this object. Args: @@ -119,7 +120,7 @@ def parameter_names(val: Any) -> AbstractSet[str]: return set() -def parameter_symbols(val: Any) -> AbstractSet[sympy.Symbol]: +def parameter_symbols(val: Any) -> Set[sympy.Symbol]: """Returns parameter symbols for this object. Args: diff --git a/cirq-core/cirq/protocols/trace_distance_bound.py b/cirq-core/cirq/protocols/trace_distance_bound.py index 6be63fa3951..c1803a5f814 100644 --- a/cirq-core/cirq/protocols/trace_distance_bound.py +++ b/cirq-core/cirq/protocols/trace_distance_bound.py @@ -14,7 +14,8 @@ from __future__ import annotations -from typing import Any, Protocol, Sequence, TypeVar +from collections.abc import Sequence +from typing import Any, Protocol, TypeVar import numpy as np diff --git a/cirq-core/cirq/qis/channels.py b/cirq-core/cirq/qis/channels.py index 0e750b92678..e0cd51b792a 100644 --- a/cirq-core/cirq/qis/channels.py +++ b/cirq-core/cirq/qis/channels.py @@ -16,7 +16,7 @@ from __future__ import annotations -from typing import Sequence +from collections.abc import Sequence import numpy as np diff --git a/cirq-core/cirq/qis/channels_test.py b/cirq-core/cirq/qis/channels_test.py index d24108d6437..3dd7a47345b 100644 --- a/cirq-core/cirq/qis/channels_test.py +++ b/cirq-core/cirq/qis/channels_test.py @@ -16,7 +16,7 @@ from __future__ import annotations -from typing import Iterable, Sequence +from collections.abc import Iterable, Sequence import numpy as np import pytest diff --git a/cirq-core/cirq/qis/clifford_tableau.py b/cirq-core/cirq/qis/clifford_tableau.py index f9b66d95f25..0734f6dbe3d 100644 --- a/cirq-core/cirq/qis/clifford_tableau.py +++ b/cirq-core/cirq/qis/clifford_tableau.py @@ -15,7 +15,8 @@ from __future__ import annotations import abc -from typing import Any, Sequence, TYPE_CHECKING +from collections.abc import Sequence +from typing import Any, TYPE_CHECKING import numpy as np diff --git a/cirq-core/cirq/qis/entropy.py b/cirq-core/cirq/qis/entropy.py index 982dbb055ef..02d39b9aaba 100644 --- a/cirq-core/cirq/qis/entropy.py +++ b/cirq-core/cirq/qis/entropy.py @@ -14,10 +14,10 @@ from __future__ import annotations -from collections.abc import Sequence +from collections.abc import Iterator, Sequence from concurrent.futures import ThreadPoolExecutor from itertools import product -from typing import Any, cast, Iterator +from typing import Any, cast import numpy as np import numpy.typing as npt diff --git a/cirq-core/cirq/qis/quantum_state_representation.py b/cirq-core/cirq/qis/quantum_state_representation.py index 8a953908da5..973fb4b43a2 100644 --- a/cirq-core/cirq/qis/quantum_state_representation.py +++ b/cirq-core/cirq/qis/quantum_state_representation.py @@ -15,7 +15,8 @@ from __future__ import annotations import abc -from typing import Self, Sequence, TYPE_CHECKING +from collections.abc import Sequence +from typing import Self, TYPE_CHECKING import numpy as np diff --git a/cirq-core/cirq/qis/states.py b/cirq-core/cirq/qis/states.py index e33ed14a22a..25a69a2b5b7 100644 --- a/cirq-core/cirq/qis/states.py +++ b/cirq-core/cirq/qis/states.py @@ -17,7 +17,8 @@ from __future__ import annotations import itertools -from typing import Any, cast, Iterable, Sequence, TYPE_CHECKING, Union +from collections.abc import Iterable, Sequence +from typing import Any, cast, TYPE_CHECKING, Union import numpy as np diff --git a/cirq-core/cirq/sim/classical_simulator.py b/cirq-core/cirq/sim/classical_simulator.py index 60dd190720e..d8b70558b37 100644 --- a/cirq-core/cirq/sim/classical_simulator.py +++ b/cirq-core/cirq/sim/classical_simulator.py @@ -14,8 +14,9 @@ from __future__ import annotations +from collections.abc import Sequence from copy import copy, deepcopy -from typing import Any, Generic, Sequence, TYPE_CHECKING +from typing import Any, Generic, TYPE_CHECKING import numpy as np diff --git a/cirq-core/cirq/sim/clifford/clifford_simulator.py b/cirq-core/cirq/sim/clifford/clifford_simulator.py index 0e7d62f06c3..f00e9dbc0ed 100644 --- a/cirq-core/cirq/sim/clifford/clifford_simulator.py +++ b/cirq-core/cirq/sim/clifford/clifford_simulator.py @@ -32,7 +32,8 @@ from __future__ import annotations -from typing import Any, Sequence +from collections.abc import Sequence +from typing import Any import numpy as np diff --git a/cirq-core/cirq/sim/clifford/clifford_tableau_simulation_state.py b/cirq-core/cirq/sim/clifford/clifford_tableau_simulation_state.py index b5f26965281..9dde849bfcb 100644 --- a/cirq-core/cirq/sim/clifford/clifford_tableau_simulation_state.py +++ b/cirq-core/cirq/sim/clifford/clifford_tableau_simulation_state.py @@ -17,7 +17,8 @@ from __future__ import annotations -from typing import Sequence, TYPE_CHECKING +from collections.abc import Sequence +from typing import TYPE_CHECKING from cirq.qis import clifford_tableau from cirq.sim.clifford.stabilizer_simulation_state import StabilizerSimulationState diff --git a/cirq-core/cirq/sim/clifford/stabilizer_ch_form_simulation_state.py b/cirq-core/cirq/sim/clifford/stabilizer_ch_form_simulation_state.py index 981ee226f33..afb7c83307d 100644 --- a/cirq-core/cirq/sim/clifford/stabilizer_ch_form_simulation_state.py +++ b/cirq-core/cirq/sim/clifford/stabilizer_ch_form_simulation_state.py @@ -14,7 +14,8 @@ from __future__ import annotations -from typing import Sequence, TYPE_CHECKING +from collections.abc import Sequence +from typing import TYPE_CHECKING from cirq._compat import proper_repr from cirq.sim.clifford import stabilizer_state_ch_form diff --git a/cirq-core/cirq/sim/clifford/stabilizer_sampler.py b/cirq-core/cirq/sim/clifford/stabilizer_sampler.py index a1d87fc7103..dc84a8d2046 100644 --- a/cirq-core/cirq/sim/clifford/stabilizer_sampler.py +++ b/cirq-core/cirq/sim/clifford/stabilizer_sampler.py @@ -14,7 +14,7 @@ from __future__ import annotations -from typing import Sequence +from collections.abc import Sequence import numpy as np diff --git a/cirq-core/cirq/sim/clifford/stabilizer_simulation_state.py b/cirq-core/cirq/sim/clifford/stabilizer_simulation_state.py index 469c179b8c6..fd0aec71276 100644 --- a/cirq-core/cirq/sim/clifford/stabilizer_simulation_state.py +++ b/cirq-core/cirq/sim/clifford/stabilizer_simulation_state.py @@ -15,8 +15,9 @@ from __future__ import annotations import abc +from collections.abc import Sequence from types import NotImplementedType -from typing import Any, cast, Generic, Sequence, TYPE_CHECKING, TypeVar +from typing import Any, cast, Generic, TYPE_CHECKING, TypeVar import sympy diff --git a/cirq-core/cirq/sim/clifford/stabilizer_state_ch_form.py b/cirq-core/cirq/sim/clifford/stabilizer_state_ch_form.py index 2588dca8d86..fdd4ed54d49 100644 --- a/cirq-core/cirq/sim/clifford/stabilizer_state_ch_form.py +++ b/cirq-core/cirq/sim/clifford/stabilizer_state_ch_form.py @@ -14,7 +14,8 @@ from __future__ import annotations -from typing import Any, Sequence +from collections.abc import Sequence +from typing import Any import numpy as np diff --git a/cirq-core/cirq/sim/density_matrix_simulation_state.py b/cirq-core/cirq/sim/density_matrix_simulation_state.py index e782a728fd2..d87adbc2e74 100644 --- a/cirq-core/cirq/sim/density_matrix_simulation_state.py +++ b/cirq-core/cirq/sim/density_matrix_simulation_state.py @@ -16,7 +16,8 @@ from __future__ import annotations -from typing import Any, Callable, Self, Sequence, TYPE_CHECKING +from collections.abc import Callable, Sequence +from typing import Any, Self, TYPE_CHECKING import numpy as np diff --git a/cirq-core/cirq/sim/density_matrix_simulator.py b/cirq-core/cirq/sim/density_matrix_simulator.py index 434ea78f50f..a74dca30bf9 100644 --- a/cirq-core/cirq/sim/density_matrix_simulator.py +++ b/cirq-core/cirq/sim/density_matrix_simulator.py @@ -16,7 +16,8 @@ from __future__ import annotations -from typing import Any, Sequence, TYPE_CHECKING +from collections.abc import Sequence +from typing import Any, TYPE_CHECKING import numpy as np diff --git a/cirq-core/cirq/sim/density_matrix_utils.py b/cirq-core/cirq/sim/density_matrix_utils.py index 140ee8bf42a..6e2a8d8d9ff 100644 --- a/cirq-core/cirq/sim/density_matrix_utils.py +++ b/cirq-core/cirq/sim/density_matrix_utils.py @@ -16,7 +16,8 @@ from __future__ import annotations -from typing import Sequence, TYPE_CHECKING +from collections.abc import Sequence +from typing import TYPE_CHECKING import numpy as np diff --git a/cirq-core/cirq/sim/mux.py b/cirq-core/cirq/sim/mux.py index 513ab282690..5b894a49d3e 100644 --- a/cirq-core/cirq/sim/mux.py +++ b/cirq-core/cirq/sim/mux.py @@ -19,7 +19,8 @@ from __future__ import annotations -from typing import Sequence, TYPE_CHECKING +from collections.abc import Sequence +from typing import TYPE_CHECKING import numpy as np diff --git a/cirq-core/cirq/sim/simulation_product_state.py b/cirq-core/cirq/sim/simulation_product_state.py index da2db0da46d..ac4249d9d50 100644 --- a/cirq-core/cirq/sim/simulation_product_state.py +++ b/cirq-core/cirq/sim/simulation_product_state.py @@ -15,7 +15,8 @@ from __future__ import annotations from collections import abc -from typing import Any, Generic, Iterator, Mapping, Sequence, TYPE_CHECKING +from collections.abc import Iterator, Mapping, Sequence +from typing import Any, Generic, TYPE_CHECKING import numpy as np diff --git a/cirq-core/cirq/sim/simulation_product_state_test.py b/cirq-core/cirq/sim/simulation_product_state_test.py index fe60b384b17..68490499030 100644 --- a/cirq-core/cirq/sim/simulation_product_state_test.py +++ b/cirq-core/cirq/sim/simulation_product_state_test.py @@ -14,7 +14,8 @@ from __future__ import annotations -from typing import Any, Self, Sequence +from collections.abc import Sequence +from typing import Any, Self import cirq diff --git a/cirq-core/cirq/sim/simulation_state.py b/cirq-core/cirq/sim/simulation_state.py index b0148d6151c..f0778116f72 100644 --- a/cirq-core/cirq/sim/simulation_state.py +++ b/cirq-core/cirq/sim/simulation_state.py @@ -18,7 +18,8 @@ import abc import copy -from typing import Any, cast, Generic, Iterator, Self, Sequence, TYPE_CHECKING, TypeVar +from collections.abc import Iterator, Sequence +from typing import Any, cast, Generic, Self, TYPE_CHECKING, TypeVar import numpy as np diff --git a/cirq-core/cirq/sim/simulation_state_base.py b/cirq-core/cirq/sim/simulation_state_base.py index 9507d9f84cf..d8dfae4cee5 100644 --- a/cirq-core/cirq/sim/simulation_state_base.py +++ b/cirq-core/cirq/sim/simulation_state_base.py @@ -17,8 +17,9 @@ from __future__ import annotations import abc +from collections.abc import Iterator, Mapping, Sequence from types import NotImplementedType -from typing import Any, Generic, Iterator, Mapping, Self, Sequence, TYPE_CHECKING, TypeVar +from typing import Any, Generic, Self, TYPE_CHECKING, TypeVar from cirq import protocols, value diff --git a/cirq-core/cirq/sim/simulation_state_test.py b/cirq-core/cirq/sim/simulation_state_test.py index 92a6e3050fe..62c408598ef 100644 --- a/cirq-core/cirq/sim/simulation_state_test.py +++ b/cirq-core/cirq/sim/simulation_state_test.py @@ -14,7 +14,8 @@ from __future__ import annotations -from typing import Any, Sequence +from collections.abc import Sequence +from typing import Any import numpy as np import pytest diff --git a/cirq-core/cirq/sim/simulation_utils.py b/cirq-core/cirq/sim/simulation_utils.py index 9f3b01cc0c4..51e5ce273c0 100644 --- a/cirq-core/cirq/sim/simulation_utils.py +++ b/cirq-core/cirq/sim/simulation_utils.py @@ -13,7 +13,8 @@ # limitations under the License. from __future__ import annotations -from typing import Any, Sequence +from collections.abc import Sequence +from typing import Any import numpy as np diff --git a/cirq-core/cirq/sim/simulator.py b/cirq-core/cirq/sim/simulator.py index 56b54b9290b..40c396fd0cc 100644 --- a/cirq-core/cirq/sim/simulator.py +++ b/cirq-core/cirq/sim/simulator.py @@ -31,7 +31,8 @@ import abc import collections -from typing import Any, Callable, cast, Generic, Iterator, Mapping, Sequence, TYPE_CHECKING, TypeVar +from collections.abc import Callable, Iterator, Mapping, Sequence +from typing import Any, cast, Generic, TYPE_CHECKING, TypeVar import numpy as np diff --git a/cirq-core/cirq/sim/simulator_base.py b/cirq-core/cirq/sim/simulator_base.py index 7e7b46768f0..802fa5465c5 100644 --- a/cirq-core/cirq/sim/simulator_base.py +++ b/cirq-core/cirq/sim/simulator_base.py @@ -18,7 +18,8 @@ import abc import collections -from typing import Any, cast, Generic, Iterator, Sequence, TYPE_CHECKING, TypeVar +from collections.abc import Iterator, Sequence +from typing import Any, cast, Generic, TYPE_CHECKING, TypeVar import numpy as np diff --git a/cirq-core/cirq/sim/simulator_base_test.py b/cirq-core/cirq/sim/simulator_base_test.py index dee6f8beaf9..bb14c229281 100644 --- a/cirq-core/cirq/sim/simulator_base_test.py +++ b/cirq-core/cirq/sim/simulator_base_test.py @@ -15,7 +15,8 @@ from __future__ import annotations import math -from typing import Any, Sequence +from collections.abc import Sequence +from typing import Any import numpy as np import pytest diff --git a/cirq-core/cirq/sim/simulator_test.py b/cirq-core/cirq/sim/simulator_test.py index 60478f1aa67..597498626c1 100644 --- a/cirq-core/cirq/sim/simulator_test.py +++ b/cirq-core/cirq/sim/simulator_test.py @@ -17,7 +17,8 @@ from __future__ import annotations import abc -from typing import Any, Generic, Iterator, Sequence +from collections.abc import Iterator, Sequence +from typing import Any, Generic from unittest import mock import duet diff --git a/cirq-core/cirq/sim/sparse_simulator.py b/cirq-core/cirq/sim/sparse_simulator.py index 43e933cd244..de308739732 100644 --- a/cirq-core/cirq/sim/sparse_simulator.py +++ b/cirq-core/cirq/sim/sparse_simulator.py @@ -16,7 +16,8 @@ from __future__ import annotations -from typing import Any, Iterator, Sequence, TYPE_CHECKING +from collections.abc import Iterator, Sequence +from typing import Any, TYPE_CHECKING import numpy as np diff --git a/cirq-core/cirq/sim/state_vector.py b/cirq-core/cirq/sim/state_vector.py index 52919f4abb8..e610d362af1 100644 --- a/cirq-core/cirq/sim/state_vector.py +++ b/cirq-core/cirq/sim/state_vector.py @@ -17,7 +17,8 @@ from __future__ import annotations import abc -from typing import Mapping, Sequence, TYPE_CHECKING +from collections.abc import Mapping, Sequence +from typing import TYPE_CHECKING import numpy as np diff --git a/cirq-core/cirq/sim/state_vector_simulation_state.py b/cirq-core/cirq/sim/state_vector_simulation_state.py index cd3ea0d4a93..0e611a4c415 100644 --- a/cirq-core/cirq/sim/state_vector_simulation_state.py +++ b/cirq-core/cirq/sim/state_vector_simulation_state.py @@ -16,7 +16,8 @@ from __future__ import annotations -from typing import Any, Callable, Self, Sequence, TYPE_CHECKING +from collections.abc import Callable, Sequence +from typing import Any, Self, TYPE_CHECKING import numpy as np diff --git a/cirq-core/cirq/sim/state_vector_simulator.py b/cirq-core/cirq/sim/state_vector_simulator.py index d8de8f62edf..22bfb2ae083 100644 --- a/cirq-core/cirq/sim/state_vector_simulator.py +++ b/cirq-core/cirq/sim/state_vector_simulator.py @@ -18,8 +18,9 @@ import abc import warnings +from collections.abc import Iterator, Sequence from functools import cached_property -from typing import Any, Generic, Iterator, Sequence, TYPE_CHECKING, TypeVar +from typing import Any, Generic, TYPE_CHECKING, TypeVar import numpy as np diff --git a/cirq-core/cirq/sim/state_vector_test.py b/cirq-core/cirq/sim/state_vector_test.py index 2ae6797f592..b628ddfe0c2 100644 --- a/cirq-core/cirq/sim/state_vector_test.py +++ b/cirq-core/cirq/sim/state_vector_test.py @@ -17,7 +17,7 @@ from __future__ import annotations import itertools -from typing import Iterator +from collections.abc import Iterator from unittest import mock import numpy as np diff --git a/cirq-core/cirq/study/flatten_expressions.py b/cirq-core/cirq/study/flatten_expressions.py index d7e5fc9bca0..2a4dd2dc5b4 100644 --- a/cirq-core/cirq/study/flatten_expressions.py +++ b/cirq-core/cirq/study/flatten_expressions.py @@ -17,7 +17,8 @@ from __future__ import annotations import numbers -from typing import Any, Callable, TYPE_CHECKING +from collections.abc import Callable +from typing import Any, TYPE_CHECKING import sympy diff --git a/cirq-core/cirq/study/resolver.py b/cirq-core/cirq/study/resolver.py index aaf2343b90f..76379e09b99 100644 --- a/cirq-core/cirq/study/resolver.py +++ b/cirq-core/cirq/study/resolver.py @@ -17,7 +17,8 @@ from __future__ import annotations import numbers -from typing import Any, cast, Iterator, Mapping, TYPE_CHECKING, Union +from collections.abc import Iterator, Mapping +from typing import Any, cast, TYPE_CHECKING, Union import numpy as np import sympy diff --git a/cirq-core/cirq/study/result.py b/cirq-core/cirq/study/result.py index a0bd96280eb..16ca6dde8a1 100644 --- a/cirq-core/cirq/study/result.py +++ b/cirq-core/cirq/study/result.py @@ -19,7 +19,8 @@ import abc import collections import io -from typing import Any, Callable, cast, Iterable, Mapping, Sequence, TYPE_CHECKING, TypeVar, Union +from collections.abc import Callable, Iterable, Mapping, Sequence +from typing import Any, cast, TYPE_CHECKING, TypeVar, Union import numpy as np import pandas as pd diff --git a/cirq-core/cirq/study/sweepable.py b/cirq-core/cirq/study/sweepable.py index b5840b86702..36c9ef99b4d 100644 --- a/cirq-core/cirq/study/sweepable.py +++ b/cirq-core/cirq/study/sweepable.py @@ -17,7 +17,8 @@ from __future__ import annotations import warnings -from typing import cast, Iterable, Iterator, Protocol, Sequence +from collections.abc import Iterable, Iterator, Sequence +from typing import cast, Protocol from cirq._doc import document from cirq.study.resolver import ParamResolver, ParamResolverOrSimilarType diff --git a/cirq-core/cirq/study/sweeps.py b/cirq-core/cirq/study/sweeps.py index 20f3774b13d..64bcec271b6 100644 --- a/cirq-core/cirq/study/sweeps.py +++ b/cirq-core/cirq/study/sweeps.py @@ -17,7 +17,8 @@ import abc import collections import itertools -from typing import Any, cast, Iterable, Iterator, overload, Sequence, TYPE_CHECKING, Union +from collections.abc import Iterable, Iterator, Sequence +from typing import Any, cast, overload, TYPE_CHECKING, Union import sympy diff --git a/cirq-core/cirq/testing/circuit_compare.py b/cirq-core/cirq/testing/circuit_compare.py index ea0870d0bfb..fa3bb7e63e5 100644 --- a/cirq-core/cirq/testing/circuit_compare.py +++ b/cirq-core/cirq/testing/circuit_compare.py @@ -17,7 +17,8 @@ import itertools import random from collections import defaultdict -from typing import Any, Iterable, Sequence +from collections.abc import Iterable, Sequence +from typing import Any import numpy as np import sympy diff --git a/cirq-core/cirq/testing/consistent_act_on_test.py b/cirq-core/cirq/testing/consistent_act_on_test.py index 810a1e96b5d..eb706d25d70 100644 --- a/cirq-core/cirq/testing/consistent_act_on_test.py +++ b/cirq-core/cirq/testing/consistent_act_on_test.py @@ -14,7 +14,7 @@ from __future__ import annotations -from typing import Sequence +from collections.abc import Sequence import numpy as np import pytest diff --git a/cirq-core/cirq/testing/consistent_controlled_gate_op.py b/cirq-core/cirq/testing/consistent_controlled_gate_op.py index 6aed7365156..d3494790e81 100644 --- a/cirq-core/cirq/testing/consistent_controlled_gate_op.py +++ b/cirq-core/cirq/testing/consistent_controlled_gate_op.py @@ -14,7 +14,7 @@ from __future__ import annotations -from typing import Collection, Sequence +from collections.abc import Collection, Sequence import numpy as np diff --git a/cirq-core/cirq/testing/consistent_controlled_gate_op_test.py b/cirq-core/cirq/testing/consistent_controlled_gate_op_test.py index 72eb410907f..bf60d8406a4 100644 --- a/cirq-core/cirq/testing/consistent_controlled_gate_op_test.py +++ b/cirq-core/cirq/testing/consistent_controlled_gate_op_test.py @@ -14,7 +14,8 @@ from __future__ import annotations -from typing import Collection, Sequence, TYPE_CHECKING +from collections.abc import Collection, Sequence +from typing import TYPE_CHECKING import numpy as np import pytest diff --git a/cirq-core/cirq/testing/consistent_protocols.py b/cirq-core/cirq/testing/consistent_protocols.py index 97f9eb35db9..bc9fa37bfeb 100644 --- a/cirq-core/cirq/testing/consistent_protocols.py +++ b/cirq-core/cirq/testing/consistent_protocols.py @@ -15,7 +15,8 @@ from __future__ import annotations import itertools -from typing import Any, Sequence +from collections.abc import Sequence +from typing import Any import numpy as np import sympy diff --git a/cirq-core/cirq/testing/consistent_protocols_test.py b/cirq-core/cirq/testing/consistent_protocols_test.py index 2c73de5f4cb..a0d318f61a4 100644 --- a/cirq-core/cirq/testing/consistent_protocols_test.py +++ b/cirq-core/cirq/testing/consistent_protocols_test.py @@ -14,8 +14,8 @@ from __future__ import annotations +from collections.abc import Sequence, Set from types import NotImplementedType -from typing import AbstractSet, Sequence import numpy as np import pytest @@ -100,7 +100,7 @@ def __repr__(self): def _is_parameterized_(self) -> bool: return cirq.is_parameterized(self.exponent) or cirq.is_parameterized(self.phase_exponent) - def _parameter_names_(self) -> AbstractSet[str]: + def _parameter_names_(self) -> Set[str]: return cirq.parameter_names(self.exponent) | cirq.parameter_names(self.phase_exponent) def _resolve_parameters_(self, resolver, recursive) -> GoodGate: @@ -124,7 +124,7 @@ def _is_parameterized_(self) -> bool: class BadGateParameterNames(GoodGate): - def _parameter_names_(self) -> AbstractSet[str]: + def _parameter_names_(self) -> Set[str]: return super()._parameter_names_() | {'not_a_param'} diff --git a/cirq-core/cirq/testing/consistent_qasm.py b/cirq-core/cirq/testing/consistent_qasm.py index 73f43c56e60..e4e507f47df 100644 --- a/cirq-core/cirq/testing/consistent_qasm.py +++ b/cirq-core/cirq/testing/consistent_qasm.py @@ -15,7 +15,8 @@ from __future__ import annotations import warnings -from typing import Any, Sequence +from collections.abc import Sequence +from typing import Any import numpy as np diff --git a/cirq-core/cirq/testing/deprecation.py b/cirq-core/cirq/testing/deprecation.py index 246db55eca2..8fc2714e09b 100644 --- a/cirq-core/cirq/testing/deprecation.py +++ b/cirq-core/cirq/testing/deprecation.py @@ -17,7 +17,7 @@ import contextlib import logging import os -from typing import Iterator +from collections.abc import Iterator from cirq._compat import ALLOW_DEPRECATION_IN_TEST diff --git a/cirq-core/cirq/testing/devices.py b/cirq-core/cirq/testing/devices.py index aa0ee84fd85..52c44242651 100644 --- a/cirq-core/cirq/testing/devices.py +++ b/cirq-core/cirq/testing/devices.py @@ -15,7 +15,8 @@ """Provides test devices that can validate circuits.""" from __future__ import annotations -from typing import AbstractSet, cast +from collections.abc import Set +from typing import cast from cirq import devices, ops @@ -38,7 +39,7 @@ class ValidatingTestDevice(devices.Device): def __init__( self, - qubits: AbstractSet[ops.Qid], + qubits: Set[ops.Qid], name: str = "ValidatingTestDevice", allowed_gates: tuple[type, ...] = (ops.Gate,), allowed_qubit_types: tuple[type, ...] = (devices.GridQubit,), diff --git a/cirq-core/cirq/testing/equals_tester.py b/cirq-core/cirq/testing/equals_tester.py index 3d64f2f85c8..98092e3b235 100644 --- a/cirq-core/cirq/testing/equals_tester.py +++ b/cirq-core/cirq/testing/equals_tester.py @@ -24,7 +24,8 @@ import collections import itertools -from typing import Any, Callable +from collections.abc import Callable +from typing import Any class EqualsTester: diff --git a/cirq-core/cirq/testing/equivalent_basis_map.py b/cirq-core/cirq/testing/equivalent_basis_map.py index 009d228c912..0d36a683686 100644 --- a/cirq-core/cirq/testing/equivalent_basis_map.py +++ b/cirq-core/cirq/testing/equivalent_basis_map.py @@ -14,7 +14,7 @@ from __future__ import annotations -from typing import Sequence +from collections.abc import Sequence import numpy as np diff --git a/cirq-core/cirq/testing/json.py b/cirq-core/cirq/testing/json.py index b3c7e508436..b59f0282749 100644 --- a/cirq-core/cirq/testing/json.py +++ b/cirq-core/cirq/testing/json.py @@ -18,9 +18,10 @@ import inspect import io import pathlib +from collections.abc import Iterator from dataclasses import dataclass from types import ModuleType -from typing import Iterator, TYPE_CHECKING +from typing import TYPE_CHECKING import numpy as np import pandas as pd diff --git a/cirq-core/cirq/testing/logs.py b/cirq-core/cirq/testing/logs.py index f48d7cd7a42..0f4c432e240 100644 --- a/cirq-core/cirq/testing/logs.py +++ b/cirq-core/cirq/testing/logs.py @@ -18,7 +18,7 @@ import contextlib import logging -from typing import Iterator +from collections.abc import Iterator @contextlib.contextmanager diff --git a/cirq-core/cirq/testing/pytest_utils.py b/cirq-core/cirq/testing/pytest_utils.py index 86494e3a059..1c1b39a167b 100644 --- a/cirq-core/cirq/testing/pytest_utils.py +++ b/cirq-core/cirq/testing/pytest_utils.py @@ -18,7 +18,8 @@ import functools import warnings -from typing import Any, Callable +from collections.abc import Callable +from typing import Any def retry_once_after_timeout(testfunc: Callable) -> Callable: diff --git a/cirq-core/cirq/testing/random_circuit.py b/cirq-core/cirq/testing/random_circuit.py index c17f3043de7..37860288489 100644 --- a/cirq-core/cirq/testing/random_circuit.py +++ b/cirq-core/cirq/testing/random_circuit.py @@ -14,7 +14,8 @@ from __future__ import annotations -from typing import Sequence, TYPE_CHECKING +from collections.abc import Sequence +from typing import TYPE_CHECKING from cirq import circuits, ops, value from cirq._doc import document diff --git a/cirq-core/cirq/testing/random_circuit_test.py b/cirq-core/cirq/testing/random_circuit_test.py index 3e2524c4481..3964fee38ec 100644 --- a/cirq-core/cirq/testing/random_circuit_test.py +++ b/cirq-core/cirq/testing/random_circuit_test.py @@ -15,7 +15,8 @@ from __future__ import annotations import random -from typing import cast, Sequence +from collections.abc import Sequence +from typing import cast import numpy as np import pytest diff --git a/cirq-core/cirq/transformers/_connected_component.py b/cirq-core/cirq/transformers/_connected_component.py index 7fa5f1c88dc..87bf803a527 100644 --- a/cirq-core/cirq/transformers/_connected_component.py +++ b/cirq-core/cirq/transformers/_connected_component.py @@ -16,7 +16,8 @@ from __future__ import annotations -from typing import Callable, cast, Sequence, TYPE_CHECKING +from collections.abc import Callable, Sequence +from typing import cast, TYPE_CHECKING from scipy.cluster.hierarchy import DisjointSet diff --git a/cirq-core/cirq/transformers/analytical_decompositions/clifford_decomposition.py b/cirq-core/cirq/transformers/analytical_decompositions/clifford_decomposition.py index 23199b23271..28ecda60e64 100644 --- a/cirq-core/cirq/transformers/analytical_decompositions/clifford_decomposition.py +++ b/cirq-core/cirq/transformers/analytical_decompositions/clifford_decomposition.py @@ -17,7 +17,8 @@ from __future__ import annotations import functools -from typing import Sequence, TYPE_CHECKING +from collections.abc import Sequence +from typing import TYPE_CHECKING import numpy as np diff --git a/cirq-core/cirq/transformers/analytical_decompositions/controlled_gate_decomposition.py b/cirq-core/cirq/transformers/analytical_decompositions/controlled_gate_decomposition.py index c5f9b1dc090..f47b80ba9c5 100644 --- a/cirq-core/cirq/transformers/analytical_decompositions/controlled_gate_decomposition.py +++ b/cirq-core/cirq/transformers/analytical_decompositions/controlled_gate_decomposition.py @@ -15,7 +15,8 @@ from __future__ import annotations import itertools -from typing import Sequence, TYPE_CHECKING +from collections.abc import Sequence +from typing import TYPE_CHECKING import numpy as np diff --git a/cirq-core/cirq/transformers/analytical_decompositions/cphase_to_fsim.py b/cirq-core/cirq/transformers/analytical_decompositions/cphase_to_fsim.py index ef3fea0303b..98fb574bc39 100644 --- a/cirq-core/cirq/transformers/analytical_decompositions/cphase_to_fsim.py +++ b/cirq-core/cirq/transformers/analytical_decompositions/cphase_to_fsim.py @@ -14,7 +14,8 @@ from __future__ import annotations -from typing import Sequence, TYPE_CHECKING +from collections.abc import Sequence +from typing import TYPE_CHECKING import numpy as np import sympy diff --git a/cirq-core/cirq/transformers/analytical_decompositions/cphase_to_fsim_test.py b/cirq-core/cirq/transformers/analytical_decompositions/cphase_to_fsim_test.py index 41097cd8fb3..ecee0763c94 100644 --- a/cirq-core/cirq/transformers/analytical_decompositions/cphase_to_fsim_test.py +++ b/cirq-core/cirq/transformers/analytical_decompositions/cphase_to_fsim_test.py @@ -15,7 +15,7 @@ from __future__ import annotations import itertools -from typing import Sequence +from collections.abc import Sequence import numpy as np import pytest diff --git a/cirq-core/cirq/transformers/analytical_decompositions/quantum_shannon_decomposition.py b/cirq-core/cirq/transformers/analytical_decompositions/quantum_shannon_decomposition.py index a5cd611b5df..8a52d031947 100644 --- a/cirq-core/cirq/transformers/analytical_decompositions/quantum_shannon_decomposition.py +++ b/cirq-core/cirq/transformers/analytical_decompositions/quantum_shannon_decomposition.py @@ -21,7 +21,8 @@ from __future__ import annotations -from typing import Callable, cast, Iterable, Sequence, TYPE_CHECKING +from collections.abc import Callable, Iterable, Sequence +from typing import cast, TYPE_CHECKING import numpy as np from attr import define diff --git a/cirq-core/cirq/transformers/analytical_decompositions/single_qubit_decompositions_test.py b/cirq-core/cirq/transformers/analytical_decompositions/single_qubit_decompositions_test.py index 3d717bc3b85..552f7d3293e 100644 --- a/cirq-core/cirq/transformers/analytical_decompositions/single_qubit_decompositions_test.py +++ b/cirq-core/cirq/transformers/analytical_decompositions/single_qubit_decompositions_test.py @@ -15,7 +15,7 @@ from __future__ import annotations import random -from typing import Sequence +from collections.abc import Sequence import numpy as np import pytest diff --git a/cirq-core/cirq/transformers/analytical_decompositions/three_qubit_decomposition.py b/cirq-core/cirq/transformers/analytical_decompositions/three_qubit_decomposition.py index 5fdf69678d4..a905ad18750 100644 --- a/cirq-core/cirq/transformers/analytical_decompositions/three_qubit_decomposition.py +++ b/cirq-core/cirq/transformers/analytical_decompositions/three_qubit_decomposition.py @@ -16,7 +16,7 @@ from __future__ import annotations -from typing import Sequence +from collections.abc import Sequence import numpy as np import scipy.linalg diff --git a/cirq-core/cirq/transformers/analytical_decompositions/two_qubit_state_preparation_test.py b/cirq-core/cirq/transformers/analytical_decompositions/two_qubit_state_preparation_test.py index 40d344ef7b5..2be9c577679 100644 --- a/cirq-core/cirq/transformers/analytical_decompositions/two_qubit_state_preparation_test.py +++ b/cirq-core/cirq/transformers/analytical_decompositions/two_qubit_state_preparation_test.py @@ -17,7 +17,7 @@ from __future__ import annotations import copy -from typing import Iterator +from collections.abc import Iterator import numpy as np import pytest diff --git a/cirq-core/cirq/transformers/analytical_decompositions/two_qubit_to_cz.py b/cirq-core/cirq/transformers/analytical_decompositions/two_qubit_to_cz.py index d61b8ed44b1..dd6a96bd6ba 100644 --- a/cirq-core/cirq/transformers/analytical_decompositions/two_qubit_to_cz.py +++ b/cirq-core/cirq/transformers/analytical_decompositions/two_qubit_to_cz.py @@ -16,7 +16,8 @@ from __future__ import annotations -from typing import cast, Iterable, Sequence, TYPE_CHECKING +from collections.abc import Iterable, Sequence +from typing import cast, TYPE_CHECKING import numpy as np diff --git a/cirq-core/cirq/transformers/analytical_decompositions/two_qubit_to_fsim.py b/cirq-core/cirq/transformers/analytical_decompositions/two_qubit_to_fsim.py index e6be09901e3..c1fe64c3422 100644 --- a/cirq-core/cirq/transformers/analytical_decompositions/two_qubit_to_fsim.py +++ b/cirq-core/cirq/transformers/analytical_decompositions/two_qubit_to_fsim.py @@ -16,7 +16,8 @@ from __future__ import annotations -from typing import Iterable, Iterator, Sequence, TYPE_CHECKING +from collections.abc import Iterable, Iterator, Sequence +from typing import TYPE_CHECKING import numpy as np diff --git a/cirq-core/cirq/transformers/analytical_decompositions/two_qubit_to_ms.py b/cirq-core/cirq/transformers/analytical_decompositions/two_qubit_to_ms.py index b3aed662eee..a77da972e1d 100644 --- a/cirq-core/cirq/transformers/analytical_decompositions/two_qubit_to_ms.py +++ b/cirq-core/cirq/transformers/analytical_decompositions/two_qubit_to_ms.py @@ -21,7 +21,8 @@ from __future__ import annotations -from typing import cast, Iterable, TYPE_CHECKING +from collections.abc import Iterable +from typing import cast, TYPE_CHECKING from cirq import linalg, ops, protocols from cirq.transformers.analytical_decompositions import single_qubit_decompositions, two_qubit_to_cz diff --git a/cirq-core/cirq/transformers/analytical_decompositions/two_qubit_to_sqrt_iswap.py b/cirq-core/cirq/transformers/analytical_decompositions/two_qubit_to_sqrt_iswap.py index ce0cb66980d..7e59714d008 100644 --- a/cirq-core/cirq/transformers/analytical_decompositions/two_qubit_to_sqrt_iswap.py +++ b/cirq-core/cirq/transformers/analytical_decompositions/two_qubit_to_sqrt_iswap.py @@ -22,7 +22,8 @@ from __future__ import annotations -from typing import Sequence, TYPE_CHECKING +from collections.abc import Sequence +from typing import TYPE_CHECKING import numpy as np import sympy diff --git a/cirq-core/cirq/transformers/analytical_decompositions/two_qubit_to_sqrt_iswap_test.py b/cirq-core/cirq/transformers/analytical_decompositions/two_qubit_to_sqrt_iswap_test.py index 67b143ed544..04644a93924 100644 --- a/cirq-core/cirq/transformers/analytical_decompositions/two_qubit_to_sqrt_iswap_test.py +++ b/cirq-core/cirq/transformers/analytical_decompositions/two_qubit_to_sqrt_iswap_test.py @@ -15,7 +15,7 @@ from __future__ import annotations import itertools -from typing import Iterator +from collections.abc import Iterator import numpy as np import pytest diff --git a/cirq-core/cirq/transformers/dynamical_decoupling_test.py b/cirq-core/cirq/transformers/dynamical_decoupling_test.py index 899d3375a82..18b8febdcc3 100644 --- a/cirq-core/cirq/transformers/dynamical_decoupling_test.py +++ b/cirq-core/cirq/transformers/dynamical_decoupling_test.py @@ -14,7 +14,7 @@ from __future__ import annotations -from typing import Sequence +from collections.abc import Sequence from unittest import mock import numpy as np diff --git a/cirq-core/cirq/transformers/eject_phased_paulis.py b/cirq-core/cirq/transformers/eject_phased_paulis.py index 36d66045ae4..7c02479a580 100644 --- a/cirq-core/cirq/transformers/eject_phased_paulis.py +++ b/cirq-core/cirq/transformers/eject_phased_paulis.py @@ -16,7 +16,8 @@ from __future__ import annotations -from typing import cast, Iterable, Iterator, TYPE_CHECKING +from collections.abc import Iterable, Iterator +from typing import cast, TYPE_CHECKING import numpy as np import sympy diff --git a/cirq-core/cirq/transformers/eject_phased_paulis_test.py b/cirq-core/cirq/transformers/eject_phased_paulis_test.py index 5398aa2fa91..5bb2d747e8d 100644 --- a/cirq-core/cirq/transformers/eject_phased_paulis_test.py +++ b/cirq-core/cirq/transformers/eject_phased_paulis_test.py @@ -15,7 +15,8 @@ from __future__ import annotations import dataclasses -from typing import cast, Iterable +from collections.abc import Iterable +from typing import cast import numpy as np import pytest diff --git a/cirq-core/cirq/transformers/eject_z.py b/cirq-core/cirq/transformers/eject_z.py index 6d7426bda60..1b5e4af92d1 100644 --- a/cirq-core/cirq/transformers/eject_z.py +++ b/cirq-core/cirq/transformers/eject_z.py @@ -17,7 +17,8 @@ from __future__ import annotations from collections import defaultdict -from typing import Iterable, Iterator, TYPE_CHECKING +from collections.abc import Iterable, Iterator +from typing import TYPE_CHECKING import numpy as np diff --git a/cirq-core/cirq/transformers/expand_composite.py b/cirq-core/cirq/transformers/expand_composite.py index a72991b468a..3e9ebf92996 100644 --- a/cirq-core/cirq/transformers/expand_composite.py +++ b/cirq-core/cirq/transformers/expand_composite.py @@ -16,7 +16,8 @@ from __future__ import annotations -from typing import Callable, TYPE_CHECKING +from collections.abc import Callable +from typing import TYPE_CHECKING from cirq import circuits, ops, protocols from cirq.transformers import transformer_api, transformer_primitives diff --git a/cirq-core/cirq/transformers/gauge_compiling/gauge_compiling.py b/cirq-core/cirq/transformers/gauge_compiling/gauge_compiling.py index 25525e23d2c..d2e5ee37020 100644 --- a/cirq-core/cirq/transformers/gauge_compiling/gauge_compiling.py +++ b/cirq-core/cirq/transformers/gauge_compiling/gauge_compiling.py @@ -19,9 +19,10 @@ import abc import functools import itertools +from collections.abc import Callable, Sequence from dataclasses import dataclass from numbers import Real -from typing import Callable, Sequence, TYPE_CHECKING +from typing import TYPE_CHECKING import numpy as np import sympy diff --git a/cirq-core/cirq/transformers/gauge_compiling/idle_moments_gauge.py b/cirq-core/cirq/transformers/gauge_compiling/idle_moments_gauge.py index f7fea056453..8782513e240 100644 --- a/cirq-core/cirq/transformers/gauge_compiling/idle_moments_gauge.py +++ b/cirq-core/cirq/transformers/gauge_compiling/idle_moments_gauge.py @@ -14,7 +14,8 @@ from __future__ import annotations import functools -from typing import Hashable, Iterator, Sequence, TYPE_CHECKING +from collections.abc import Hashable, Iterator, Sequence +from typing import TYPE_CHECKING import attrs import numpy as np diff --git a/cirq-core/cirq/transformers/gauge_compiling/sqrt_cz_gauge.py b/cirq-core/cirq/transformers/gauge_compiling/sqrt_cz_gauge.py index a2c44db956e..71b73a69657 100644 --- a/cirq-core/cirq/transformers/gauge_compiling/sqrt_cz_gauge.py +++ b/cirq-core/cirq/transformers/gauge_compiling/sqrt_cz_gauge.py @@ -16,8 +16,9 @@ from __future__ import annotations +from collections.abc import Sequence from numbers import Real -from typing import Sequence, TYPE_CHECKING +from typing import TYPE_CHECKING from cirq.ops import CZ, CZPowGate, Gate, Gateset, S, X from cirq.transformers.gauge_compiling.gauge_compiling import ( diff --git a/cirq-core/cirq/transformers/heuristic_decompositions/gate_tabulation_math_utils.py b/cirq-core/cirq/transformers/heuristic_decompositions/gate_tabulation_math_utils.py index 3d85d650ccc..8764b4f48fc 100644 --- a/cirq-core/cirq/transformers/heuristic_decompositions/gate_tabulation_math_utils.py +++ b/cirq-core/cirq/transformers/heuristic_decompositions/gate_tabulation_math_utils.py @@ -3,7 +3,7 @@ from __future__ import annotations import itertools -from typing import Sequence +from collections.abc import Sequence import numpy as np diff --git a/cirq-core/cirq/transformers/heuristic_decompositions/two_qubit_gate_tabulation.py b/cirq-core/cirq/transformers/heuristic_decompositions/two_qubit_gate_tabulation.py index b130cf415ad..bd47e465e03 100644 --- a/cirq-core/cirq/transformers/heuristic_decompositions/two_qubit_gate_tabulation.py +++ b/cirq-core/cirq/transformers/heuristic_decompositions/two_qubit_gate_tabulation.py @@ -17,9 +17,10 @@ from __future__ import annotations +from collections.abc import Sequence from dataclasses import dataclass from functools import reduce -from typing import NamedTuple, Sequence +from typing import NamedTuple import numpy as np diff --git a/cirq-core/cirq/transformers/measurement_transformers.py b/cirq-core/cirq/transformers/measurement_transformers.py index 52cd2e9faab..5d8ec2c80c1 100644 --- a/cirq-core/cirq/transformers/measurement_transformers.py +++ b/cirq-core/cirq/transformers/measurement_transformers.py @@ -16,7 +16,8 @@ import itertools from collections import defaultdict -from typing import Any, cast, Iterable, Sequence, TYPE_CHECKING +from collections.abc import Iterable, Sequence +from typing import Any, cast, TYPE_CHECKING import numpy as np diff --git a/cirq-core/cirq/transformers/merge_k_qubit_gates.py b/cirq-core/cirq/transformers/merge_k_qubit_gates.py index bbcd2bff2ee..c639ed52ee0 100644 --- a/cirq-core/cirq/transformers/merge_k_qubit_gates.py +++ b/cirq-core/cirq/transformers/merge_k_qubit_gates.py @@ -16,7 +16,8 @@ from __future__ import annotations -from typing import Callable, cast, TYPE_CHECKING +from collections.abc import Callable +from typing import cast, TYPE_CHECKING from cirq import circuits, ops, protocols from cirq.transformers import transformer_api, transformer_primitives diff --git a/cirq-core/cirq/transformers/merge_single_qubit_gates.py b/cirq-core/cirq/transformers/merge_single_qubit_gates.py index 133886ed1dc..03d91f8cdfb 100644 --- a/cirq-core/cirq/transformers/merge_single_qubit_gates.py +++ b/cirq-core/cirq/transformers/merge_single_qubit_gates.py @@ -16,7 +16,8 @@ from __future__ import annotations -from typing import Callable, cast, Hashable, TYPE_CHECKING +from collections.abc import Callable, Hashable +from typing import cast, TYPE_CHECKING from cirq import circuits, ops, protocols from cirq.study.resolver import ParamResolver diff --git a/cirq-core/cirq/transformers/optimize_for_target_gateset.py b/cirq-core/cirq/transformers/optimize_for_target_gateset.py index abb94426bae..55f85573f78 100644 --- a/cirq-core/cirq/transformers/optimize_for_target_gateset.py +++ b/cirq-core/cirq/transformers/optimize_for_target_gateset.py @@ -16,7 +16,8 @@ from __future__ import annotations -from typing import Callable, Hashable, Sequence, TYPE_CHECKING +from collections.abc import Callable, Hashable, Sequence +from typing import TYPE_CHECKING from cirq import circuits from cirq.protocols import decompose_protocol as dp diff --git a/cirq-core/cirq/transformers/qubit_management_transformers_test.py b/cirq-core/cirq/transformers/qubit_management_transformers_test.py index 057c71cd136..175267c0a27 100644 --- a/cirq-core/cirq/transformers/qubit_management_transformers_test.py +++ b/cirq-core/cirq/transformers/qubit_management_transformers_test.py @@ -14,7 +14,7 @@ from __future__ import annotations -from typing import Callable +from collections.abc import Callable import cirq diff --git a/cirq-core/cirq/transformers/routing/mapping_manager.py b/cirq-core/cirq/transformers/routing/mapping_manager.py index 2e35a290dd6..c61c369c772 100644 --- a/cirq-core/cirq/transformers/routing/mapping_manager.py +++ b/cirq-core/cirq/transformers/routing/mapping_manager.py @@ -16,7 +16,8 @@ from __future__ import annotations -from typing import Sequence, TYPE_CHECKING +from collections.abc import Sequence +from typing import TYPE_CHECKING import networkx as nx import numpy as np diff --git a/cirq-core/cirq/transformers/routing/route_circuit_cqc.py b/cirq-core/cirq/transformers/routing/route_circuit_cqc.py index 9272caf2e44..3c4032b5ea3 100644 --- a/cirq-core/cirq/transformers/routing/route_circuit_cqc.py +++ b/cirq-core/cirq/transformers/routing/route_circuit_cqc.py @@ -17,7 +17,8 @@ from __future__ import annotations import itertools -from typing import Any, Sequence, TYPE_CHECKING +from collections.abc import Sequence +from typing import Any, TYPE_CHECKING import networkx as nx diff --git a/cirq-core/cirq/transformers/stratify.py b/cirq-core/cirq/transformers/stratify.py index 23d40702d7b..f6d84096d3b 100644 --- a/cirq-core/cirq/transformers/stratify.py +++ b/cirq-core/cirq/transformers/stratify.py @@ -17,7 +17,8 @@ from __future__ import annotations import itertools -from typing import Callable, Iterable, Sequence, TYPE_CHECKING, Union +from collections.abc import Callable, Iterable, Sequence +from typing import TYPE_CHECKING, Union from cirq import _import, circuits, ops, protocols from cirq.transformers import transformer_api diff --git a/cirq-core/cirq/transformers/symbolize.py b/cirq-core/cirq/transformers/symbolize.py index 6aa5c7095e2..524b2f0a3ef 100644 --- a/cirq-core/cirq/transformers/symbolize.py +++ b/cirq-core/cirq/transformers/symbolize.py @@ -17,7 +17,8 @@ from __future__ import annotations import re -from typing import Hashable, TYPE_CHECKING +from collections.abc import Hashable +from typing import TYPE_CHECKING import attrs import sympy diff --git a/cirq-core/cirq/transformers/tag_transformers.py b/cirq-core/cirq/transformers/tag_transformers.py index 20eb7674030..a74c90587cf 100644 --- a/cirq-core/cirq/transformers/tag_transformers.py +++ b/cirq-core/cirq/transformers/tag_transformers.py @@ -15,7 +15,8 @@ from __future__ import annotations import itertools -from typing import Callable, Hashable, TYPE_CHECKING +from collections.abc import Callable, Hashable +from typing import TYPE_CHECKING from cirq.transformers import transformer_api, transformer_primitives diff --git a/cirq-core/cirq/transformers/target_gatesets/compilation_target_gateset.py b/cirq-core/cirq/transformers/target_gatesets/compilation_target_gateset.py index f96d51757f4..c323edd300c 100644 --- a/cirq-core/cirq/transformers/target_gatesets/compilation_target_gateset.py +++ b/cirq-core/cirq/transformers/target_gatesets/compilation_target_gateset.py @@ -17,7 +17,8 @@ from __future__ import annotations import abc -from typing import Hashable, TYPE_CHECKING +from collections.abc import Hashable +from typing import TYPE_CHECKING from cirq import circuits, ops, protocols, transformers from cirq.transformers import merge_k_qubit_gates, merge_single_qubit_gates diff --git a/cirq-core/cirq/transformers/target_gatesets/cz_gateset.py b/cirq-core/cirq/transformers/target_gatesets/cz_gateset.py index 32b5c0ae2cf..d9f897f6b83 100644 --- a/cirq-core/cirq/transformers/target_gatesets/cz_gateset.py +++ b/cirq-core/cirq/transformers/target_gatesets/cz_gateset.py @@ -16,7 +16,8 @@ from __future__ import annotations -from typing import Any, Sequence, TYPE_CHECKING +from collections.abc import Sequence +from typing import Any, TYPE_CHECKING from cirq import ops, protocols from cirq.transformers.analytical_decompositions import two_qubit_to_cz diff --git a/cirq-core/cirq/transformers/target_gatesets/cz_gateset_test.py b/cirq-core/cirq/transformers/target_gatesets/cz_gateset_test.py index ff410ce581e..87fefe7b157 100644 --- a/cirq-core/cirq/transformers/target_gatesets/cz_gateset_test.py +++ b/cirq-core/cirq/transformers/target_gatesets/cz_gateset_test.py @@ -14,7 +14,7 @@ from __future__ import annotations -from typing import Sequence +from collections.abc import Sequence import numpy as np import pytest diff --git a/cirq-core/cirq/transformers/target_gatesets/sqrt_iswap_gateset.py b/cirq-core/cirq/transformers/target_gatesets/sqrt_iswap_gateset.py index d3706b10192..619c7b491db 100644 --- a/cirq-core/cirq/transformers/target_gatesets/sqrt_iswap_gateset.py +++ b/cirq-core/cirq/transformers/target_gatesets/sqrt_iswap_gateset.py @@ -16,7 +16,8 @@ from __future__ import annotations -from typing import Any, Sequence, TYPE_CHECKING +from collections.abc import Sequence +from typing import Any, TYPE_CHECKING from cirq import ops, protocols from cirq.transformers.analytical_decompositions import two_qubit_to_sqrt_iswap diff --git a/cirq-core/cirq/transformers/transformer_api.py b/cirq-core/cirq/transformers/transformer_api.py index 795968ca90b..d2a4392bcea 100644 --- a/cirq-core/cirq/transformers/transformer_api.py +++ b/cirq-core/cirq/transformers/transformer_api.py @@ -21,7 +21,8 @@ import functools import inspect import textwrap -from typing import Any, Callable, cast, Hashable, overload, Protocol, TYPE_CHECKING, TypeVar +from collections.abc import Callable, Hashable +from typing import Any, cast, overload, Protocol, TYPE_CHECKING, TypeVar from cirq import circuits diff --git a/cirq-core/cirq/transformers/transformer_primitives.py b/cirq-core/cirq/transformers/transformer_primitives.py index 235a0a392fd..70805b0abf5 100644 --- a/cirq-core/cirq/transformers/transformer_primitives.py +++ b/cirq-core/cirq/transformers/transformer_primitives.py @@ -21,7 +21,8 @@ import dataclasses import itertools from collections import defaultdict -from typing import Callable, cast, Hashable, Sequence, TYPE_CHECKING +from collections.abc import Callable, Hashable, Sequence +from typing import cast, TYPE_CHECKING from cirq import circuits, ops, protocols from cirq.circuits.circuit import CIRCUIT_TYPE diff --git a/cirq-core/cirq/transformers/transformer_primitives_test.py b/cirq-core/cirq/transformers/transformer_primitives_test.py index eddc866266c..93d173df3ca 100644 --- a/cirq-core/cirq/transformers/transformer_primitives_test.py +++ b/cirq-core/cirq/transformers/transformer_primitives_test.py @@ -14,7 +14,7 @@ from __future__ import annotations -from typing import Iterator +from collections.abc import Iterator import pytest diff --git a/cirq-core/cirq/value/abc_alt.py b/cirq-core/cirq/value/abc_alt.py index 431c847a870..f998e4edd1e 100644 --- a/cirq-core/cirq/value/abc_alt.py +++ b/cirq-core/cirq/value/abc_alt.py @@ -18,7 +18,8 @@ import abc import functools -from typing import Callable, cast, TypeVar +from collections.abc import Callable +from typing import cast, TypeVar T = TypeVar('T') diff --git a/cirq-core/cirq/value/classical_data.py b/cirq-core/cirq/value/classical_data.py index fcc8c8ca3cd..a3021880602 100644 --- a/cirq-core/cirq/value/classical_data.py +++ b/cirq-core/cirq/value/classical_data.py @@ -16,7 +16,8 @@ import abc import enum -from typing import Mapping, Self, Sequence, TYPE_CHECKING +from collections.abc import Mapping, Sequence +from typing import Self, TYPE_CHECKING from cirq.value import digits, value_equality_attr diff --git a/cirq-core/cirq/value/condition.py b/cirq-core/cirq/value/condition.py index 274c68296c8..989304d2855 100644 --- a/cirq-core/cirq/value/condition.py +++ b/cirq-core/cirq/value/condition.py @@ -16,7 +16,8 @@ import abc import dataclasses -from typing import Any, Mapping, TYPE_CHECKING +from collections.abc import Mapping +from typing import Any, TYPE_CHECKING import attrs import sympy diff --git a/cirq-core/cirq/value/digits.py b/cirq-core/cirq/value/digits.py index 04107391047..d06efbf1fa9 100644 --- a/cirq-core/cirq/value/digits.py +++ b/cirq-core/cirq/value/digits.py @@ -14,7 +14,8 @@ from __future__ import annotations -from typing import Any, Iterable, overload +from collections.abc import Iterable +from typing import Any, overload def big_endian_bits_to_int(bits: Iterable[Any]) -> int: diff --git a/cirq-core/cirq/value/duration.py b/cirq-core/cirq/value/duration.py index 1c328d39c1d..a5b6c4cc6ee 100644 --- a/cirq-core/cirq/value/duration.py +++ b/cirq-core/cirq/value/duration.py @@ -17,7 +17,8 @@ from __future__ import annotations import datetime -from typing import AbstractSet, Any, TYPE_CHECKING, TypeAlias, Union +from collections.abc import Set +from typing import Any, TYPE_CHECKING, TypeAlias, Union import numpy as np import sympy @@ -98,7 +99,7 @@ def __init__( def _is_parameterized_(self) -> bool: return any(isinstance(val, sympy.Basic) for val in self._time_vals) - def _parameter_names_(self) -> AbstractSet[str]: + def _parameter_names_(self) -> Set[str]: return protocols.parameter_names(self._time_vals) def _resolve_parameters_(self, resolver: cirq.ParamResolver, recursive: bool) -> Duration: diff --git a/cirq-core/cirq/value/linear_dict.py b/cirq-core/cirq/value/linear_dict.py index dabceae0aa0..ba92cb53611 100644 --- a/cirq-core/cirq/value/linear_dict.py +++ b/cirq-core/cirq/value/linear_dict.py @@ -16,23 +16,18 @@ from __future__ import annotations -from typing import ( - AbstractSet, - Any, +from collections.abc import ( Callable, - Generic, ItemsView, Iterable, Iterator, KeysView, Mapping, MutableMapping, - overload, - Self, - TYPE_CHECKING, - TypeVar, + Set, ValuesView, ) +from typing import Any, Generic, overload, Self, TYPE_CHECKING, TypeVar import numpy as np import sympy @@ -344,7 +339,7 @@ def _from_json_dict_(cls, keys, values, **kwargs): def _is_parameterized_(self) -> bool: return any(protocols.is_parameterized(v) for v in self._terms.values()) - def _parameter_names_(self) -> AbstractSet[str]: + def _parameter_names_(self) -> Set[str]: return set(name for v in self._terms.values() for name in protocols.parameter_names(v)) def _resolve_parameters_(self, resolver: cirq.ParamResolver, recursive: bool) -> LinearDict: diff --git a/cirq-core/cirq/value/measurement_key.py b/cirq-core/cirq/value/measurement_key.py index 5505f526f32..5163a147bff 100644 --- a/cirq-core/cirq/value/measurement_key.py +++ b/cirq-core/cirq/value/measurement_key.py @@ -15,7 +15,8 @@ from __future__ import annotations import dataclasses -from typing import Any, Mapping +from collections.abc import Mapping +from typing import Any MEASUREMENT_KEY_SEPARATOR = ':' diff --git a/cirq-core/cirq/value/periodic_value.py b/cirq-core/cirq/value/periodic_value.py index 84ff56dd333..c778a4e549b 100644 --- a/cirq-core/cirq/value/periodic_value.py +++ b/cirq-core/cirq/value/periodic_value.py @@ -14,7 +14,8 @@ from __future__ import annotations -from typing import AbstractSet, Any, TYPE_CHECKING +from collections.abc import Set +from typing import Any, TYPE_CHECKING import sympy @@ -95,7 +96,7 @@ def _is_parameterized_(self) -> bool: return is_parameterized(self.value) or is_parameterized(self.period) - def _parameter_names_(self) -> AbstractSet[str]: + def _parameter_names_(self) -> Set[str]: # HACK: Avoids circular dependencies. from cirq.protocols import parameter_names diff --git a/cirq-core/cirq/value/product_state.py b/cirq-core/cirq/value/product_state.py index 8582596a6f0..310ea2a19e7 100644 --- a/cirq-core/cirq/value/product_state.py +++ b/cirq-core/cirq/value/product_state.py @@ -15,8 +15,9 @@ from __future__ import annotations import abc +from collections.abc import Iterator, Sequence from dataclasses import dataclass -from typing import Iterator, Sequence, TYPE_CHECKING +from typing import TYPE_CHECKING import numpy as np diff --git a/cirq-core/cirq/value/value_equality_attr.py b/cirq-core/cirq/value/value_equality_attr.py index b5ef0967a5b..87d113a249c 100644 --- a/cirq-core/cirq/value/value_equality_attr.py +++ b/cirq-core/cirq/value/value_equality_attr.py @@ -16,7 +16,8 @@ from __future__ import annotations -from typing import Any, Callable, overload, Protocol +from collections.abc import Callable +from typing import Any, overload, Protocol from cirq import _compat, protocols diff --git a/cirq-core/cirq/vis/heatmap.py b/cirq-core/cirq/vis/heatmap.py index 6d236adfca4..f3070cafe7c 100644 --- a/cirq-core/cirq/vis/heatmap.py +++ b/cirq-core/cirq/vis/heatmap.py @@ -15,8 +15,9 @@ from __future__ import annotations import copy +from collections.abc import Mapping, Sequence from dataclasses import astuple, dataclass -from typing import Any, cast, Mapping, overload, Sequence, SupportsFloat +from typing import Any, cast, overload, SupportsFloat import matplotlib as mpl import matplotlib.collections as mpl_collections diff --git a/cirq-core/cirq/vis/histogram.py b/cirq-core/cirq/vis/histogram.py index 6c53850873f..e686bca7b78 100644 --- a/cirq-core/cirq/vis/histogram.py +++ b/cirq-core/cirq/vis/histogram.py @@ -14,7 +14,8 @@ from __future__ import annotations -from typing import Any, Mapping, Sequence, SupportsFloat +from collections.abc import Mapping, Sequence +from typing import Any, SupportsFloat import numpy as np from matplotlib import pyplot as plt diff --git a/cirq-core/cirq/vis/state_histogram.py b/cirq-core/cirq/vis/state_histogram.py index 91b1de0399a..f1221c1a84f 100644 --- a/cirq-core/cirq/vis/state_histogram.py +++ b/cirq-core/cirq/vis/state_histogram.py @@ -17,7 +17,8 @@ from __future__ import annotations import collections -from typing import Sequence, SupportsFloat +from collections.abc import Sequence +from typing import SupportsFloat import matplotlib.pyplot as plt import numpy as np diff --git a/cirq-core/cirq/work/collector.py b/cirq-core/cirq/work/collector.py index d1e8192a080..d3f9bcfba02 100644 --- a/cirq-core/cirq/work/collector.py +++ b/cirq-core/cirq/work/collector.py @@ -15,7 +15,8 @@ from __future__ import annotations import abc -from typing import Any, Iterator, Protocol, TYPE_CHECKING +from collections.abc import Iterator +from typing import Any, Protocol, TYPE_CHECKING import duet import numpy as np diff --git a/cirq-core/cirq/work/observable_grouping.py b/cirq-core/cirq/work/observable_grouping.py index c0a4006574f..565e1893d07 100644 --- a/cirq-core/cirq/work/observable_grouping.py +++ b/cirq-core/cirq/work/observable_grouping.py @@ -14,7 +14,8 @@ from __future__ import annotations -from typing import Callable, cast, Iterable +from collections.abc import Callable, Iterable +from typing import cast from cirq import ops, value from cirq.work.observable_settings import _max_weight_observable, _max_weight_state, InitObsSetting diff --git a/cirq-core/cirq/work/observable_measurement.py b/cirq-core/cirq/work/observable_measurement.py index 91f18a80b45..7c79e428b2e 100644 --- a/cirq-core/cirq/work/observable_measurement.py +++ b/cirq-core/cirq/work/observable_measurement.py @@ -20,7 +20,8 @@ import os import tempfile import warnings -from typing import Any, Iterable, Mapping, Sequence, TYPE_CHECKING +from collections.abc import Iterable, Mapping, Sequence +from typing import Any, TYPE_CHECKING import numpy as np import pandas as pd diff --git a/cirq-core/cirq/work/observable_measurement_data.py b/cirq-core/cirq/work/observable_measurement_data.py index 9685ccb92e9..bacb8fd3dea 100644 --- a/cirq-core/cirq/work/observable_measurement_data.py +++ b/cirq-core/cirq/work/observable_measurement_data.py @@ -16,7 +16,8 @@ import dataclasses import datetime -from typing import Any, Iterable, Mapping, TYPE_CHECKING +from collections.abc import Iterable, Mapping +from typing import Any, TYPE_CHECKING import numpy as np import sympy diff --git a/cirq-core/cirq/work/observable_measurement_test.py b/cirq-core/cirq/work/observable_measurement_test.py index 097aceff7ea..3ccd821389b 100644 --- a/cirq-core/cirq/work/observable_measurement_test.py +++ b/cirq-core/cirq/work/observable_measurement_test.py @@ -15,7 +15,7 @@ from __future__ import annotations import tempfile -from typing import Iterable +from collections.abc import Iterable import numpy as np import pytest diff --git a/cirq-core/cirq/work/observable_readout_calibration.py b/cirq-core/cirq/work/observable_readout_calibration.py index b813a6183b2..6bfccc33ca6 100644 --- a/cirq-core/cirq/work/observable_readout_calibration.py +++ b/cirq-core/cirq/work/observable_readout_calibration.py @@ -3,7 +3,8 @@ from __future__ import annotations import dataclasses -from typing import Iterable, TYPE_CHECKING +from collections.abc import Iterable +from typing import TYPE_CHECKING from cirq import circuits, ops, study from cirq.work.observable_measurement import measure_grouped_settings, StoppingCriteria diff --git a/cirq-core/cirq/work/observable_readout_calibration_test.py b/cirq-core/cirq/work/observable_readout_calibration_test.py index 0636769619c..7a2d8036a7c 100644 --- a/cirq-core/cirq/work/observable_readout_calibration_test.py +++ b/cirq-core/cirq/work/observable_readout_calibration_test.py @@ -2,7 +2,7 @@ from __future__ import annotations -from typing import Sequence +from collections.abc import Sequence import numpy as np diff --git a/cirq-core/cirq/work/observable_settings.py b/cirq-core/cirq/work/observable_settings.py index 7ff7ddc2e04..c2e9b2418c8 100644 --- a/cirq-core/cirq/work/observable_settings.py +++ b/cirq-core/cirq/work/observable_settings.py @@ -16,7 +16,8 @@ import dataclasses import numbers -from typing import Iterable, Mapping, TYPE_CHECKING +from collections.abc import Iterable, Mapping +from typing import TYPE_CHECKING import sympy diff --git a/cirq-core/cirq/work/sampler.py b/cirq-core/cirq/work/sampler.py index 0a70dd3efc3..0552bb90d12 100644 --- a/cirq-core/cirq/work/sampler.py +++ b/cirq-core/cirq/work/sampler.py @@ -17,7 +17,8 @@ from __future__ import annotations import collections -from typing import Sequence, TYPE_CHECKING, TypeVar +from collections.abc import Sequence +from typing import TYPE_CHECKING, TypeVar import duet import pandas as pd diff --git a/cirq-core/cirq/work/sampler_test.py b/cirq-core/cirq/work/sampler_test.py index 8d3fb77b630..8bc6fbc9dd9 100644 --- a/cirq-core/cirq/work/sampler_test.py +++ b/cirq-core/cirq/work/sampler_test.py @@ -16,7 +16,7 @@ from __future__ import annotations -from typing import Sequence +from collections.abc import Sequence import duet import numpy as np diff --git a/cirq-google/cirq_google/api/v1/programs.py b/cirq-google/cirq_google/api/v1/programs.py index 6048e92950f..e27c2499dd0 100644 --- a/cirq-google/cirq_google/api/v1/programs.py +++ b/cirq-google/cirq_google/api/v1/programs.py @@ -15,7 +15,8 @@ from __future__ import annotations import json -from typing import Any, cast, Iterator, Sequence +from collections.abc import Iterator, Sequence +from typing import Any, cast import numpy as np import sympy diff --git a/cirq-google/cirq_google/api/v2/results.py b/cirq-google/cirq_google/api/v2/results.py index 8cefdda689a..cd897e7fb17 100644 --- a/cirq-google/cirq_google/api/v2/results.py +++ b/cirq-google/cirq_google/api/v2/results.py @@ -16,7 +16,8 @@ import dataclasses from collections import OrderedDict -from typing import cast, Hashable, Iterable, Sequence +from collections.abc import Hashable, Iterable, Sequence +from typing import cast import numpy as np diff --git a/cirq-google/cirq_google/api/v2/run_context.py b/cirq-google/cirq_google/api/v2/run_context.py index 3bba1add5ee..afbeac3fdb7 100644 --- a/cirq-google/cirq_google/api/v2/run_context.py +++ b/cirq-google/cirq_google/api/v2/run_context.py @@ -15,7 +15,7 @@ from __future__ import annotations import functools -from typing import Sequence +from collections.abc import Sequence from cirq_google.api.v2 import program_pb2, run_context_pb2 diff --git a/cirq-google/cirq_google/api/v2/sweeps.py b/cirq-google/cirq_google/api/v2/sweeps.py index 93e40e4bb54..01cbb8107b7 100644 --- a/cirq-google/cirq_google/api/v2/sweeps.py +++ b/cirq-google/cirq_google/api/v2/sweeps.py @@ -16,7 +16,8 @@ import gzip import numbers -from typing import Any, Callable, cast, Iterable, TYPE_CHECKING +from collections.abc import Callable, Iterable +from typing import Any, cast, TYPE_CHECKING import sympy import tunits diff --git a/cirq-google/cirq_google/api/v2/sweeps_test.py b/cirq-google/cirq_google/api/v2/sweeps_test.py index 86258051f3a..13d641b8907 100644 --- a/cirq-google/cirq_google/api/v2/sweeps_test.py +++ b/cirq-google/cirq_google/api/v2/sweeps_test.py @@ -16,8 +16,8 @@ import gzip import math +from collections.abc import Iterator from copy import deepcopy -from typing import Iterator import numpy as np import pytest diff --git a/cirq-google/cirq_google/devices/google_noise_properties.py b/cirq-google/cirq_google/devices/google_noise_properties.py index 1aa6a62be07..7266bf1fe6c 100644 --- a/cirq-google/cirq_google/devices/google_noise_properties.py +++ b/cirq-google/cirq_google/devices/google_noise_properties.py @@ -17,8 +17,9 @@ from __future__ import annotations import dataclasses +from collections.abc import Sequence from functools import cached_property -from typing import Any, Sequence, TypeVar +from typing import Any, TypeVar import numpy as np diff --git a/cirq-google/cirq_google/devices/grid_device.py b/cirq-google/cirq_google/devices/grid_device.py index 933f72a0021..3e76058e8d7 100644 --- a/cirq-google/cirq_google/devices/grid_device.py +++ b/cirq-google/cirq_google/devices/grid_device.py @@ -18,8 +18,9 @@ import re import warnings +from collections.abc import Collection, Iterator, Mapping, Sequence from dataclasses import dataclass -from typing import Any, cast, Collection, Iterator, Mapping, Sequence +from typing import Any, cast import cirq from cirq_google import ops, transformers diff --git a/cirq-google/cirq_google/devices/known_devices.py b/cirq-google/cirq_google/devices/known_devices.py index c0f1cf9219f..700b2d19fb9 100644 --- a/cirq-google/cirq_google/devices/known_devices.py +++ b/cirq-google/cirq_google/devices/known_devices.py @@ -14,7 +14,8 @@ from __future__ import annotations -from typing import cast, Collection +from collections.abc import Collection +from typing import cast import cirq from cirq_google.api import v2 diff --git a/cirq-google/cirq_google/engine/abstract_engine.py b/cirq-google/cirq_google/engine/abstract_engine.py index 08fa878f589..be311cc2624 100644 --- a/cirq-google/cirq_google/engine/abstract_engine.py +++ b/cirq-google/cirq_google/engine/abstract_engine.py @@ -21,7 +21,8 @@ import abc import datetime -from typing import Sequence, TYPE_CHECKING +from collections.abc import Sequence +from typing import TYPE_CHECKING if TYPE_CHECKING: import cirq diff --git a/cirq-google/cirq_google/engine/abstract_job.py b/cirq-google/cirq_google/engine/abstract_job.py index 234237159ff..4646bf2f607 100644 --- a/cirq-google/cirq_google/engine/abstract_job.py +++ b/cirq-google/cirq_google/engine/abstract_job.py @@ -17,7 +17,8 @@ from __future__ import annotations import abc -from typing import Iterator, overload, Sequence, TYPE_CHECKING +from collections.abc import Iterator, Sequence +from typing import overload, TYPE_CHECKING import duet diff --git a/cirq-google/cirq_google/engine/abstract_local_engine.py b/cirq-google/cirq_google/engine/abstract_local_engine.py index d8140390e22..035b6115b66 100644 --- a/cirq-google/cirq_google/engine/abstract_local_engine.py +++ b/cirq-google/cirq_google/engine/abstract_local_engine.py @@ -14,7 +14,8 @@ from __future__ import annotations import datetime -from typing import Sequence, TYPE_CHECKING +from collections.abc import Sequence +from typing import TYPE_CHECKING from cirq_google.engine.abstract_engine import AbstractEngine diff --git a/cirq-google/cirq_google/engine/abstract_local_job_test.py b/cirq-google/cirq_google/engine/abstract_local_job_test.py index 1c50377c280..38726baed1f 100644 --- a/cirq-google/cirq_google/engine/abstract_local_job_test.py +++ b/cirq-google/cirq_google/engine/abstract_local_job_test.py @@ -17,7 +17,8 @@ from __future__ import annotations import datetime -from typing import Sequence, TYPE_CHECKING +from collections.abc import Sequence +from typing import TYPE_CHECKING import cirq from cirq_google.cloud import quantum diff --git a/cirq-google/cirq_google/engine/abstract_local_program.py b/cirq-google/cirq_google/engine/abstract_local_program.py index ae9cd0a9a2d..bf121416ba0 100644 --- a/cirq-google/cirq_google/engine/abstract_local_program.py +++ b/cirq-google/cirq_google/engine/abstract_local_program.py @@ -16,7 +16,8 @@ import copy import datetime -from typing import Sequence, TYPE_CHECKING +from collections.abc import Sequence +from typing import TYPE_CHECKING from cirq_google.engine.abstract_program import AbstractProgram diff --git a/cirq-google/cirq_google/engine/abstract_program.py b/cirq-google/cirq_google/engine/abstract_program.py index b2823c67078..7aaaefe5a69 100644 --- a/cirq-google/cirq_google/engine/abstract_program.py +++ b/cirq-google/cirq_google/engine/abstract_program.py @@ -22,7 +22,8 @@ import abc import datetime -from typing import Sequence, TYPE_CHECKING +from collections.abc import Sequence +from typing import TYPE_CHECKING if TYPE_CHECKING: import cirq diff --git a/cirq-google/cirq_google/engine/asyncio_executor.py b/cirq-google/cirq_google/engine/asyncio_executor.py index e517f7dad23..271e218f65b 100644 --- a/cirq-google/cirq_google/engine/asyncio_executor.py +++ b/cirq-google/cirq_google/engine/asyncio_executor.py @@ -17,7 +17,8 @@ import asyncio import errno import threading -from typing import Awaitable, Callable, ParamSpec, TYPE_CHECKING, TypeVar +from collections.abc import Awaitable, Callable +from typing import ParamSpec, TYPE_CHECKING, TypeVar import duet diff --git a/cirq-google/cirq_google/engine/calibration.py b/cirq-google/cirq_google/engine/calibration.py index 7fcbcfc8fdb..349f2afdc6a 100644 --- a/cirq-google/cirq_google/engine/calibration.py +++ b/cirq-google/cirq_google/engine/calibration.py @@ -18,8 +18,9 @@ import datetime from collections import abc, defaultdict +from collections.abc import Iterator, Sequence from itertools import cycle -from typing import Any, cast, Iterator, Sequence +from typing import Any, cast import google.protobuf.json_format as json_format import matplotlib as mpl diff --git a/cirq-google/cirq_google/engine/engine_client.py b/cirq-google/cirq_google/engine/engine_client.py index baa32be5239..29e120828d2 100644 --- a/cirq-google/cirq_google/engine/engine_client.py +++ b/cirq-google/cirq_google/engine/engine_client.py @@ -17,8 +17,9 @@ import datetime import sys import warnings +from collections.abc import AsyncIterable, Awaitable, Callable from functools import cached_property -from typing import Any, AsyncIterable, Awaitable, Callable, TypeVar +from typing import Any, TypeVar import duet import proto diff --git a/cirq-google/cirq_google/engine/engine_job.py b/cirq-google/cirq_google/engine/engine_job.py index b2b6ee6b579..976da590425 100644 --- a/cirq-google/cirq_google/engine/engine_job.py +++ b/cirq-google/cirq_google/engine/engine_job.py @@ -17,7 +17,8 @@ from __future__ import annotations import datetime -from typing import Sequence, TYPE_CHECKING +from collections.abc import Sequence +from typing import TYPE_CHECKING import duet diff --git a/cirq-google/cirq_google/engine/engine_program.py b/cirq-google/cirq_google/engine/engine_program.py index acc740e68ed..78247467026 100644 --- a/cirq-google/cirq_google/engine/engine_program.py +++ b/cirq-google/cirq_google/engine/engine_program.py @@ -15,7 +15,8 @@ from __future__ import annotations import datetime -from typing import Sequence, TYPE_CHECKING +from collections.abc import Sequence +from typing import TYPE_CHECKING import duet diff --git a/cirq-google/cirq_google/engine/engine_result.py b/cirq-google/cirq_google/engine/engine_result.py index fba207e4d59..921df068f1f 100644 --- a/cirq-google/cirq_google/engine/engine_result.py +++ b/cirq-google/cirq_google/engine/engine_result.py @@ -14,7 +14,8 @@ from __future__ import annotations -from typing import Any, Mapping, TYPE_CHECKING +from collections.abc import Mapping +from typing import Any, TYPE_CHECKING from cirq import study diff --git a/cirq-google/cirq_google/engine/engine_result_test.py b/cirq-google/cirq_google/engine/engine_result_test.py index 0a6d7665035..bb883b25726 100644 --- a/cirq-google/cirq_google/engine/engine_result_test.py +++ b/cirq-google/cirq_google/engine/engine_result_test.py @@ -15,7 +15,8 @@ from __future__ import annotations import datetime -from typing import Mapping, TYPE_CHECKING +from collections.abc import Mapping +from typing import TYPE_CHECKING import numpy as np diff --git a/cirq-google/cirq_google/engine/engine_validator.py b/cirq-google/cirq_google/engine/engine_validator.py index ec0de3cb896..64dcaf290de 100644 --- a/cirq-google/cirq_google/engine/engine_validator.py +++ b/cirq-google/cirq_google/engine/engine_validator.py @@ -14,7 +14,8 @@ from __future__ import annotations -from typing import Callable, Sequence, TYPE_CHECKING +from collections.abc import Callable, Sequence +from typing import TYPE_CHECKING from google.protobuf import any_pb2 diff --git a/cirq-google/cirq_google/engine/processor_sampler.py b/cirq-google/cirq_google/engine/processor_sampler.py index f05ecd2f010..2d586b6f0ff 100644 --- a/cirq-google/cirq_google/engine/processor_sampler.py +++ b/cirq-google/cirq_google/engine/processor_sampler.py @@ -14,7 +14,8 @@ from __future__ import annotations -from typing import cast, Sequence, TYPE_CHECKING +from collections.abc import Sequence +from typing import cast, TYPE_CHECKING import duet diff --git a/cirq-google/cirq_google/engine/qcs_notebook.py b/cirq-google/cirq_google/engine/qcs_notebook.py index cf3f2617774..8efe9479545 100644 --- a/cirq-google/cirq_google/engine/qcs_notebook.py +++ b/cirq-google/cirq_google/engine/qcs_notebook.py @@ -15,7 +15,8 @@ from __future__ import annotations import dataclasses -from typing import cast, Sequence, TYPE_CHECKING +from collections.abc import Sequence +from typing import cast, TYPE_CHECKING from cirq_google import get_engine, ProcessorSampler from cirq_google.engine import ( diff --git a/cirq-google/cirq_google/engine/runtime_estimator.py b/cirq-google/cirq_google/engine/runtime_estimator.py index bc7fd3480c3..ed744a9c34b 100644 --- a/cirq-google/cirq_google/engine/runtime_estimator.py +++ b/cirq-google/cirq_google/engine/runtime_estimator.py @@ -32,7 +32,7 @@ from __future__ import annotations -from typing import Sequence +from collections.abc import Sequence import cirq diff --git a/cirq-google/cirq_google/engine/simulated_local_job.py b/cirq-google/cirq_google/engine/simulated_local_job.py index 7026ca641a1..65ca0f11132 100644 --- a/cirq-google/cirq_google/engine/simulated_local_job.py +++ b/cirq-google/cirq_google/engine/simulated_local_job.py @@ -18,7 +18,8 @@ from __future__ import annotations import concurrent.futures -from typing import cast, Sequence +from collections.abc import Sequence +from typing import cast import duet diff --git a/cirq-google/cirq_google/engine/stream_manager.py b/cirq-google/cirq_google/engine/stream_manager.py index 174af64f8cf..b698a0dec97 100644 --- a/cirq-google/cirq_google/engine/stream_manager.py +++ b/cirq-google/cirq_google/engine/stream_manager.py @@ -15,7 +15,8 @@ from __future__ import annotations import asyncio -from typing import AsyncIterator, TYPE_CHECKING +from collections.abc import AsyncIterator +from typing import TYPE_CHECKING import google.api_core.exceptions as google_exceptions diff --git a/cirq-google/cirq_google/engine/stream_manager_test.py b/cirq-google/cirq_google/engine/stream_manager_test.py index 4fdf19fead1..cca83a7ba79 100644 --- a/cirq-google/cirq_google/engine/stream_manager_test.py +++ b/cirq-google/cirq_google/engine/stream_manager_test.py @@ -16,7 +16,7 @@ import asyncio import concurrent -from typing import AsyncIterable, AsyncIterator, Awaitable, Sequence +from collections.abc import AsyncIterable, AsyncIterator, Awaitable, Sequence from unittest import mock import duet diff --git a/cirq-google/cirq_google/engine/validating_sampler.py b/cirq-google/cirq_google/engine/validating_sampler.py index 4336a4c3df0..e2f11e512c9 100644 --- a/cirq-google/cirq_google/engine/validating_sampler.py +++ b/cirq-google/cirq_google/engine/validating_sampler.py @@ -14,7 +14,7 @@ from __future__ import annotations -from typing import Callable, Sequence +from collections.abc import Callable, Sequence import duet diff --git a/cirq-google/cirq_google/experimental/analog_experiments/analog_trajectory_util.py b/cirq-google/cirq_google/experimental/analog_experiments/analog_trajectory_util.py index 40770cae2b6..9be68c039c5 100644 --- a/cirq-google/cirq_google/experimental/analog_experiments/analog_trajectory_util.py +++ b/cirq-google/cirq_google/experimental/analog_experiments/analog_trajectory_util.py @@ -14,7 +14,8 @@ from __future__ import annotations -from typing import AbstractSet, TYPE_CHECKING +from collections.abc import Set +from typing import TYPE_CHECKING import attrs import matplotlib.pyplot as plt @@ -53,7 +54,7 @@ def _is_parameterized_(self) -> bool: or su.is_parameterized_dict(self.couplings) ) - def _parameter_names_(self) -> AbstractSet[str]: + def _parameter_names_(self) -> Set[str]: return ( cirq.parameter_names(self.duration) | su.dict_param_name(self.qubit_freqs) diff --git a/cirq-google/cirq_google/experimental/noise_models/noise_models.py b/cirq-google/cirq_google/experimental/noise_models/noise_models.py index 1a77d049667..9c6334bc967 100644 --- a/cirq-google/cirq_google/experimental/noise_models/noise_models.py +++ b/cirq-google/cirq_google/experimental/noise_models/noise_models.py @@ -14,8 +14,9 @@ from __future__ import annotations +from collections.abc import Sequence from math import exp -from typing import Any, Sequence, TYPE_CHECKING +from typing import Any, TYPE_CHECKING import cirq from cirq._compat import proper_repr diff --git a/cirq-google/cirq_google/experimental/ops/coupler_pulse.py b/cirq-google/cirq_google/experimental/ops/coupler_pulse.py index a66eac10e26..af656458b22 100644 --- a/cirq-google/cirq_google/experimental/ops/coupler_pulse.py +++ b/cirq-google/cirq_google/experimental/ops/coupler_pulse.py @@ -11,9 +11,11 @@ # 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 -from typing import AbstractSet, Any, TYPE_CHECKING +from collections.abc import Set +from typing import Any, TYPE_CHECKING import cirq from cirq._compat import proper_repr @@ -117,7 +119,7 @@ def _is_parameterized_(self) -> bool: or cirq.is_parameterized(self.q1_detune_mhz) ) - def _parameter_names_(self) -> AbstractSet[str]: + def _parameter_names_(self) -> Set[str]: return ( cirq.parameter_names(self.hold_time) | cirq.parameter_names(self.coupling_mhz) diff --git a/cirq-google/cirq_google/line/placement/anneal.py b/cirq-google/cirq_google/line/placement/anneal.py index c39ada8c6cd..27b26d74aa1 100644 --- a/cirq-google/cirq_google/line/placement/anneal.py +++ b/cirq-google/cirq_google/line/placement/anneal.py @@ -14,7 +14,8 @@ from __future__ import annotations -from typing import Any, Callable, TYPE_CHECKING +from collections.abc import Callable +from typing import Any, TYPE_CHECKING import numpy as np diff --git a/cirq-google/cirq_google/line/placement/anneal_test.py b/cirq-google/cirq_google/line/placement/anneal_test.py index eed6c19986e..611012f900b 100644 --- a/cirq-google/cirq_google/line/placement/anneal_test.py +++ b/cirq-google/cirq_google/line/placement/anneal_test.py @@ -14,7 +14,7 @@ from __future__ import annotations -from typing import Iterable +from collections.abc import Iterable from unittest import mock import numpy as np diff --git a/cirq-google/cirq_google/line/placement/chip_test.py b/cirq-google/cirq_google/line/placement/chip_test.py index 069da912199..807a141fde8 100644 --- a/cirq-google/cirq_google/line/placement/chip_test.py +++ b/cirq-google/cirq_google/line/placement/chip_test.py @@ -14,7 +14,7 @@ from __future__ import annotations -from typing import Iterable +from collections.abc import Iterable import cirq from cirq_google.line.placement.chip import above, below, chip_as_adjacency_list, left_of, right_of diff --git a/cirq-google/cirq_google/line/placement/greedy_test.py b/cirq-google/cirq_google/line/placement/greedy_test.py index 9edf5cd249c..915509d6781 100644 --- a/cirq-google/cirq_google/line/placement/greedy_test.py +++ b/cirq-google/cirq_google/line/placement/greedy_test.py @@ -14,7 +14,7 @@ from __future__ import annotations -from typing import Iterable +from collections.abc import Iterable from unittest import mock import pytest diff --git a/cirq-google/cirq_google/line/placement/optimization.py b/cirq-google/cirq_google/line/placement/optimization.py index d9e26af5470..18a06b61cf3 100644 --- a/cirq-google/cirq_google/line/placement/optimization.py +++ b/cirq-google/cirq_google/line/placement/optimization.py @@ -15,7 +15,8 @@ from __future__ import annotations import math -from typing import Callable, TypeVar +from collections.abc import Callable +from typing import TypeVar T = TypeVar('T') diff --git a/cirq-google/cirq_google/line/placement/sequence.py b/cirq-google/cirq_google/line/placement/sequence.py index fd7723fd4ab..95567eb1513 100644 --- a/cirq-google/cirq_google/line/placement/sequence.py +++ b/cirq-google/cirq_google/line/placement/sequence.py @@ -14,7 +14,7 @@ from __future__ import annotations -from typing import Iterable +from collections.abc import Iterable import cirq diff --git a/cirq-google/cirq_google/ops/analog_detune_gates.py b/cirq-google/cirq_google/ops/analog_detune_gates.py index e2d1c7bd44c..e3ca164b43a 100644 --- a/cirq-google/cirq_google/ops/analog_detune_gates.py +++ b/cirq-google/cirq_google/ops/analog_detune_gates.py @@ -15,7 +15,8 @@ """Define detuning gates for Analog Experiment usage.""" from __future__ import annotations -from typing import AbstractSet, Any, Iterable, TYPE_CHECKING +from collections.abc import Iterable, Set +from typing import Any, TYPE_CHECKING import cirq from cirq_google.ops import coupler @@ -98,7 +99,7 @@ def _is_parameterized_(self) -> bool: or su.is_parameterized_dict(self.prev_neighbor_coupler_g_dict) ) - def _parameter_names_(self) -> AbstractSet[str]: + def _parameter_names_(self) -> Set[str]: return ( cirq.parameter_names(self.length) | cirq.parameter_names(self.w) @@ -285,7 +286,7 @@ def _is_parameterized_(self) -> bool: or cirq.is_parameterized(self.prev_neighbor_qubits_freq) ) - def _parameter_names_(self) -> AbstractSet[str]: + def _parameter_names_(self) -> Set[str]: return ( cirq.parameter_names(self.length) | cirq.parameter_names(self.w) diff --git a/cirq-google/cirq_google/ops/fsim_gate_family.py b/cirq-google/cirq_google/ops/fsim_gate_family.py index 6d829d2f7a9..5837a83264a 100644 --- a/cirq-google/cirq_google/ops/fsim_gate_family.py +++ b/cirq-google/cirq_google/ops/fsim_gate_family.py @@ -16,7 +16,8 @@ from __future__ import annotations -from typing import Any, Callable, cast, Iterable, Sequence, TypeVar +from collections.abc import Callable, Iterable, Sequence +from typing import Any, cast, TypeVar import numpy as np import sympy diff --git a/cirq-google/cirq_google/ops/internal_gate.py b/cirq-google/cirq_google/ops/internal_gate.py index 18ab18ea30e..2ee2a61c390 100644 --- a/cirq-google/cirq_google/ops/internal_gate.py +++ b/cirq-google/cirq_google/ops/internal_gate.py @@ -14,8 +14,8 @@ from __future__ import annotations -from collections.abc import Mapping -from typing import Any, Sequence +from collections.abc import Mapping, Sequence +from typing import Any import numpy as np diff --git a/cirq-google/cirq_google/serialization/arg_func_langs.py b/cirq-google/cirq_google/serialization/arg_func_langs.py index f6d564fd255..1d7e971f0cc 100644 --- a/cirq-google/cirq_google/serialization/arg_func_langs.py +++ b/cirq-google/cirq_google/serialization/arg_func_langs.py @@ -16,7 +16,8 @@ import math import numbers -from typing import cast, Sequence, TypeAlias +from collections.abc import Sequence +from typing import cast, TypeAlias import numpy as np import sympy diff --git a/cirq-google/cirq_google/serialization/circuit_serializer.py b/cirq-google/cirq_google/serialization/circuit_serializer.py index fd8d25c34ad..9ccaa9969c8 100644 --- a/cirq-google/cirq_google/serialization/circuit_serializer.py +++ b/cirq-google/cirq_google/serialization/circuit_serializer.py @@ -19,8 +19,8 @@ import functools import inspect import warnings -from collections.abc import Mapping, Sequence -from typing import Any, Callable, Hashable +from collections.abc import Callable, Hashable, Mapping, Sequence +from typing import Any import sympy diff --git a/cirq-google/cirq_google/study/device_parameter.py b/cirq-google/cirq_google/study/device_parameter.py index 0a8a5b1d809..e7efeedd028 100644 --- a/cirq-google/cirq_google/study/device_parameter.py +++ b/cirq-google/cirq_google/study/device_parameter.py @@ -15,7 +15,8 @@ from __future__ import annotations import dataclasses -from typing import Any, Protocol, Sequence +from collections.abc import Sequence +from typing import Any, Protocol import cirq diff --git a/cirq-google/cirq_google/study/finite_random_variable.py b/cirq-google/cirq_google/study/finite_random_variable.py index 7d4fc410358..e21503ffa7a 100644 --- a/cirq-google/cirq_google/study/finite_random_variable.py +++ b/cirq-google/cirq_google/study/finite_random_variable.py @@ -15,8 +15,8 @@ import numbers import random -from collections.abc import Mapping -from typing import Any, cast, Iterator +from collections.abc import Iterator, Mapping +from typing import Any, cast import cirq from cirq.study.sweeps import SingleSweep diff --git a/cirq-google/cirq_google/study/symbol_util.py b/cirq-google/cirq_google/study/symbol_util.py index 75b67ba2e29..a85684e8082 100644 --- a/cirq-google/cirq_google/study/symbol_util.py +++ b/cirq-google/cirq_google/study/symbol_util.py @@ -14,7 +14,8 @@ from __future__ import annotations -from typing import AbstractSet, Any, TypeAlias +from collections.abc import Set +from typing import Any, TypeAlias import sympy import tunits as tu @@ -41,7 +42,7 @@ def direct_symbol_replacement(x, resolver: cirq.ParamResolver): return x -def dict_param_name(dict_with_value: dict[Any, ValueOrSymbol] | None) -> AbstractSet[str]: +def dict_param_name(dict_with_value: dict[Any, ValueOrSymbol] | None) -> Set[str]: """Find the names of all parameterized value in a dictionary.""" if dict_with_value is None: return set() diff --git a/cirq-google/cirq_google/transformers/analytical_decompositions/two_qubit_to_sycamore.py b/cirq-google/cirq_google/transformers/analytical_decompositions/two_qubit_to_sycamore.py index 90f46c1c644..5cfd203b707 100644 --- a/cirq-google/cirq_google/transformers/analytical_decompositions/two_qubit_to_sycamore.py +++ b/cirq-google/cirq_google/transformers/analytical_decompositions/two_qubit_to_sycamore.py @@ -18,7 +18,7 @@ import itertools import math -from typing import Iterator +from collections.abc import Iterator import numpy as np diff --git a/cirq-google/cirq_google/transformers/target_gatesets/google_cz_gateset.py b/cirq-google/cirq_google/transformers/target_gatesets/google_cz_gateset.py index 662c3cc101f..49c1a1c1ebc 100644 --- a/cirq-google/cirq_google/transformers/target_gatesets/google_cz_gateset.py +++ b/cirq-google/cirq_google/transformers/target_gatesets/google_cz_gateset.py @@ -14,7 +14,8 @@ from __future__ import annotations -from typing import Any, Sequence +from collections.abc import Sequence +from typing import Any import cirq diff --git a/cirq-google/cirq_google/transformers/target_gatesets/sycamore_gateset.py b/cirq-google/cirq_google/transformers/target_gatesets/sycamore_gateset.py index 5af821d22b4..33ce0a1ad6e 100644 --- a/cirq-google/cirq_google/transformers/target_gatesets/sycamore_gateset.py +++ b/cirq-google/cirq_google/transformers/target_gatesets/sycamore_gateset.py @@ -17,7 +17,8 @@ from __future__ import annotations import itertools -from typing import Any, Sequence, TYPE_CHECKING +from collections.abc import Sequence +from typing import Any, TYPE_CHECKING import cirq from cirq_google import ops diff --git a/cirq-google/cirq_google/workflow/_device_shim.py b/cirq-google/cirq_google/workflow/_device_shim.py index 75d4fa1be78..021bd344264 100644 --- a/cirq-google/cirq_google/workflow/_device_shim.py +++ b/cirq-google/cirq_google/workflow/_device_shim.py @@ -15,7 +15,8 @@ from __future__ import annotations import itertools -from typing import Iterable, TYPE_CHECKING +from collections.abc import Iterable +from typing import TYPE_CHECKING import networkx as nx diff --git a/cirq-google/cirq_google/workflow/quantum_executable.py b/cirq-google/cirq_google/workflow/quantum_executable.py index 92c827776bf..2db9bf57407 100644 --- a/cirq-google/cirq_google/workflow/quantum_executable.py +++ b/cirq-google/cirq_google/workflow/quantum_executable.py @@ -18,8 +18,9 @@ import abc import dataclasses +from collections.abc import Iterator, Sequence from dataclasses import dataclass -from typing import Any, cast, Iterator, Sequence +from typing import Any, cast import cirq from cirq import _compat diff --git a/cirq-google/cirq_google/workflow/qubit_placement.py b/cirq-google/cirq_google/workflow/qubit_placement.py index 20591a7400b..9b3a1620452 100644 --- a/cirq-google/cirq_google/workflow/qubit_placement.py +++ b/cirq-google/cirq_google/workflow/qubit_placement.py @@ -18,8 +18,9 @@ import abc import dataclasses +from collections.abc import Callable, Hashable from functools import lru_cache -from typing import Any, Callable, Hashable, TYPE_CHECKING +from typing import Any, TYPE_CHECKING import cirq from cirq import _compat diff --git a/cirq-ionq/cirq_ionq/ionq_client.py b/cirq-ionq/cirq_ionq/ionq_client.py index 859742dcfe2..964a191dc22 100644 --- a/cirq-ionq/cirq_ionq/ionq_client.py +++ b/cirq-ionq/cirq_ionq/ionq_client.py @@ -22,7 +22,8 @@ import time import urllib import warnings -from typing import Any, Callable, cast +from collections.abc import Callable +from typing import Any, cast import requests diff --git a/cirq-ionq/cirq_ionq/ionq_devices.py b/cirq-ionq/cirq_ionq/ionq_devices.py index 4aa3d116380..8282499dafe 100644 --- a/cirq-ionq/cirq_ionq/ionq_devices.py +++ b/cirq-ionq/cirq_ionq/ionq_devices.py @@ -15,7 +15,7 @@ from __future__ import annotations -from typing import Sequence +from collections.abc import Sequence import cirq from cirq_ionq import ionq_gateset diff --git a/cirq-ionq/cirq_ionq/ionq_gateset.py b/cirq-ionq/cirq_ionq/ionq_gateset.py index 80e12bab38b..fd80167f59f 100644 --- a/cirq-ionq/cirq_ionq/ionq_gateset.py +++ b/cirq-ionq/cirq_ionq/ionq_gateset.py @@ -16,7 +16,8 @@ from __future__ import annotations -from typing import Any, Iterator +from collections.abc import Iterator +from typing import Any import cirq diff --git a/cirq-ionq/cirq_ionq/ionq_native_gates.py b/cirq-ionq/cirq_ionq/ionq_native_gates.py index 6a4d5efb233..8b8340a8d77 100644 --- a/cirq-ionq/cirq_ionq/ionq_native_gates.py +++ b/cirq-ionq/cirq_ionq/ionq_native_gates.py @@ -17,7 +17,8 @@ import cmath import math -from typing import Any, Sequence +from collections.abc import Sequence +from typing import Any import numpy as np diff --git a/cirq-ionq/cirq_ionq/ionq_native_target_gateset.py b/cirq-ionq/cirq_ionq/ionq_native_target_gateset.py index 6c579a52b50..54bface196f 100644 --- a/cirq-ionq/cirq_ionq/ionq_native_target_gateset.py +++ b/cirq-ionq/cirq_ionq/ionq_native_target_gateset.py @@ -16,8 +16,9 @@ from __future__ import annotations +from collections.abc import Iterator from types import NotImplementedType -from typing import Any, Iterator +from typing import Any import numpy as np diff --git a/cirq-ionq/cirq_ionq/job.py b/cirq-ionq/cirq_ionq/job.py index cad0cc9987e..c3f1636190f 100644 --- a/cirq-ionq/cirq_ionq/job.py +++ b/cirq-ionq/cirq_ionq/job.py @@ -18,7 +18,8 @@ import json import time import warnings -from typing import Sequence, TYPE_CHECKING +from collections.abc import Sequence +from typing import TYPE_CHECKING import cirq from cirq._doc import document diff --git a/cirq-ionq/cirq_ionq/results.py b/cirq-ionq/cirq_ionq/results.py index 838919de906..03ed35a0a6b 100644 --- a/cirq-ionq/cirq_ionq/results.py +++ b/cirq-ionq/cirq_ionq/results.py @@ -16,7 +16,8 @@ from __future__ import annotations import collections -from typing import Counter, Sequence +from collections import Counter +from collections.abc import Sequence import numpy as np diff --git a/cirq-ionq/cirq_ionq/sampler.py b/cirq-ionq/cirq_ionq/sampler.py index 9799ce3ed30..de0ed841bd9 100644 --- a/cirq-ionq/cirq_ionq/sampler.py +++ b/cirq-ionq/cirq_ionq/sampler.py @@ -16,7 +16,8 @@ from __future__ import annotations import itertools -from typing import Sequence, TYPE_CHECKING +from collections.abc import Sequence +from typing import TYPE_CHECKING import cirq from cirq_ionq import results diff --git a/cirq-ionq/cirq_ionq/serializer.py b/cirq-ionq/cirq_ionq/serializer.py index 16476828c01..c7e37a5ca4f 100644 --- a/cirq-ionq/cirq_ionq/serializer.py +++ b/cirq-ionq/cirq_ionq/serializer.py @@ -19,7 +19,8 @@ import dataclasses import json import math -from typing import Any, Callable, cast, Collection, Iterator, Sequence, TYPE_CHECKING +from collections.abc import Callable, Collection, Iterator, Sequence +from typing import Any, cast, TYPE_CHECKING import numpy as np diff --git a/cirq-ionq/cirq_ionq/service.py b/cirq-ionq/cirq_ionq/service.py index ed88888e904..780338c20d9 100644 --- a/cirq-ionq/cirq_ionq/service.py +++ b/cirq-ionq/cirq_ionq/service.py @@ -17,7 +17,7 @@ import datetime import os -from typing import Sequence +from collections.abc import Sequence import cirq from cirq_ionq import calibration, ionq_client, job, results, sampler, serializer diff --git a/cirq-pasqal/cirq_pasqal/pasqal_device.py b/cirq-pasqal/cirq_pasqal/pasqal_device.py index 9473258705f..241bc75c25e 100644 --- a/cirq-pasqal/cirq_pasqal/pasqal_device.py +++ b/cirq-pasqal/cirq_pasqal/pasqal_device.py @@ -14,7 +14,8 @@ from __future__ import annotations -from typing import Any, Sequence +from collections.abc import Sequence +from typing import Any import networkx as nx import numpy as np diff --git a/cirq-pasqal/cirq_pasqal/pasqal_noise_model.py b/cirq-pasqal/cirq_pasqal/pasqal_noise_model.py index 475f1c84f6b..c00ed1a1d0c 100644 --- a/cirq-pasqal/cirq_pasqal/pasqal_noise_model.py +++ b/cirq-pasqal/cirq_pasqal/pasqal_noise_model.py @@ -14,7 +14,8 @@ from __future__ import annotations -from typing import Any, Sequence +from collections.abc import Sequence +from typing import Any import cirq import cirq_pasqal diff --git a/cirq-web/cirq_web/circuits/circuit.py b/cirq-web/cirq_web/circuits/circuit.py index 3db280e6ef5..1f2a5a0bedb 100644 --- a/cirq-web/cirq_web/circuits/circuit.py +++ b/cirq-web/cirq_web/circuits/circuit.py @@ -14,7 +14,7 @@ from __future__ import annotations -from typing import Iterable +from collections.abc import Iterable import cirq from cirq_web import widget diff --git a/cirq-web/cirq_web/circuits/symbols.py b/cirq-web/cirq_web/circuits/symbols.py index 4e1d391023c..179b2bfa849 100644 --- a/cirq-web/cirq_web/circuits/symbols.py +++ b/cirq-web/cirq_web/circuits/symbols.py @@ -19,7 +19,7 @@ import abc import dataclasses -from typing import Iterable +from collections.abc import Iterable import cirq from cirq.protocols.circuit_diagram_info_protocol import CircuitDiagramInfoArgs diff --git a/dev_tools/bash_scripts_test.py b/dev_tools/bash_scripts_test.py index 3f2c26eacde..ddfff1211d7 100644 --- a/dev_tools/bash_scripts_test.py +++ b/dev_tools/bash_scripts_test.py @@ -16,7 +16,8 @@ import os import subprocess -from typing import Iterable, TYPE_CHECKING +from collections.abc import Iterable +from typing import TYPE_CHECKING from dev_tools import shell_tools from dev_tools.test_utils import only_on_posix diff --git a/dev_tools/docs/run_doctest.py b/dev_tools/docs/run_doctest.py index 70de2c501d4..37ed14fdc80 100755 --- a/dev_tools/docs/run_doctest.py +++ b/dev_tools/docs/run_doctest.py @@ -32,8 +32,9 @@ import importlib.util import sys import warnings +from collections.abc import Iterable, Sequence from types import ModuleType -from typing import Any, Iterable, Sequence +from typing import Any from dev_tools import shell_tools from dev_tools.output_capture import OutputCapture diff --git a/dev_tools/env_tools.py b/dev_tools/env_tools.py index 12a15f34bcf..1b1e80a22cd 100644 --- a/dev_tools/env_tools.py +++ b/dev_tools/env_tools.py @@ -16,7 +16,8 @@ import os import sys -from typing import Callable, cast, Iterable, TYPE_CHECKING +from collections.abc import Callable, Iterable +from typing import cast, TYPE_CHECKING from dev_tools import git_env_tools, shell_tools from dev_tools.prepared_env import PreparedEnv diff --git a/dev_tools/modules_test.py b/dev_tools/modules_test.py index fbca14e8a59..f0b465af58d 100644 --- a/dev_tools/modules_test.py +++ b/dev_tools/modules_test.py @@ -20,9 +20,9 @@ import subprocess import sys import tempfile +from collections.abc import Iterator from io import StringIO from pathlib import Path -from typing import Iterator from unittest import mock import pytest diff --git a/dev_tools/notebooks/notebook_test.py b/dev_tools/notebooks/notebook_test.py index 760958a724e..b8d02622141 100644 --- a/dev_tools/notebooks/notebook_test.py +++ b/dev_tools/notebooks/notebook_test.py @@ -24,7 +24,7 @@ import importlib.metadata import os import tempfile -from typing import Iterator +from collections.abc import Iterator import pytest diff --git a/dev_tools/profiling/live_plot_collector.py b/dev_tools/profiling/live_plot_collector.py index adf92127a6a..a2de75d5176 100644 --- a/dev_tools/profiling/live_plot_collector.py +++ b/dev_tools/profiling/live_plot_collector.py @@ -4,7 +4,7 @@ import collections import time -from typing import Mapping, Sequence +from collections.abc import Mapping, Sequence import matplotlib.pyplot as plt import numpy as np diff --git a/dev_tools/snippets_test.py b/dev_tools/snippets_test.py index f3835a6d8e5..2b97e46c16b 100644 --- a/dev_tools/snippets_test.py +++ b/dev_tools/snippets_test.py @@ -54,7 +54,9 @@ import os import pathlib import re -from typing import Any, Iterator, Pattern +from collections.abc import Iterator +from re import Pattern +from typing import Any import pytest diff --git a/examples/shor.py b/examples/shor.py index 74af7a8be49..c2529077127 100644 --- a/examples/shor.py +++ b/examples/shor.py @@ -53,7 +53,7 @@ import fractions import math import random -from typing import Callable, Sequence +from collections.abc import Callable, Sequence import sympy diff --git a/examples/swap_networks.py b/examples/swap_networks.py index 6da3bba0b81..efbcaf30331 100644 --- a/examples/swap_networks.py +++ b/examples/swap_networks.py @@ -23,7 +23,8 @@ import itertools import random -from typing import Sequence, TypeVar +from collections.abc import Sequence +from typing import TypeVar import cirq import cirq.contrib.acquaintance as cca diff --git a/pyproject.toml b/pyproject.toml index fb05dcd83a2..058bc2808ad 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -144,6 +144,7 @@ select = [ "UP018", # native-literals "UP028", # yield-in-for-loop "UP034", # extraneous-parentheses + "UP035", # deprecated-import "UP037", # quoted-annotation "W605", # invalid-escape-sequence, pylint anomalous-backslash-in-string ]