Deselect ruff-covered pylint rules

CONTRIBUTING.md

@@ -137,8 +137,8 @@ constructs. We use [Pylint](https://www.pylint.org/) to check for code lint.
 To see which lint checks we enforce, see the
 [dev_tools/conf/.pylintrc](dev_tools/conf/.pylintrc) file. When Pylint produces
 a false positive, it can be silenced with annotations. For example, the
-annotation `# pylint: disable=unused-import` would silence a warning about
-an unused import.
+annotation `# pylint: disable=wrong-import-order` would silence a warning about
+wrong import order.
 
 ### Types
 

cirq-core/cirq/__init__.py

@@ -123,7 +123,6 @@
 )
 
 from cirq.linalg import (
-    # pylint: disable=line-too-long
     all_near_zero as all_near_zero,
     all_near_zero_mod as all_near_zero_mod,
     allclose_up_to_global_phase as allclose_up_to_global_phase,
@@ -344,7 +343,6 @@
 
 
 from cirq.transformers import (
-    # pylint: disable=line-too-long
     AbstractInitialMapper as AbstractInitialMapper,
     add_dynamical_decoupling as add_dynamical_decoupling,
     align_left as align_left,
@@ -572,7 +570,6 @@
     ProductState as ProductState,
 )
 
-# pylint: disable=redefined-builtin
 from cirq.protocols import (
     act_on as act_on,
     apply_channel as apply_channel,
@@ -694,12 +691,10 @@
     ZerosSampler as ZerosSampler,
 )
 
-# pylint: enable=redefined-builtin
 
 # Unflattened sub-modules.
 
 # Registers cirq-core's public classes for JSON serialization.
-# pylint: disable=wrong-import-position
 from cirq.protocols.json_serialization import _register_resolver
 from cirq.json_resolver_cache import _class_resolver_dictionary
 
@@ -709,5 +704,3 @@
 # contrib's json resolver cache depends on cirq.DEFAULT_RESOLVER
 
 from cirq import contrib  # noqa: E402
-
-# pylint: enable=wrong-import-position

cirq-core/cirq/_compat_test.py

@@ -394,13 +394,11 @@ class OldClass(NewClass):
         OldClass('1')
 
     with pytest.raises(AssertionError, match='deadline should match vX.Y'):
-        # pylint: disable=unused-variable
+
         @deprecated_class(deadline='invalid', fix='theFix', name='foo')
         class BadlyDeprecatedClass(NewClass):  # pragma: no cover
             ...
 
-        # pylint: enable=unused-variable
-
 
 def _from_parent_import_deprecated():
     from cirq.testing._compat_test_data import fake_a
@@ -566,7 +564,6 @@ def _import_top_level_deprecated():
 def _repeated_import_path():
     """to ensure that the highly unlikely repeated subpath import doesn't interfere"""
 
-    # pylint: disable=line-too-long
     from cirq.testing._compat_test_data.repeated_child.cirq.testing._compat_test_data.repeated_child import (  # type: ignore  # noqa: E501
         child,
     )
@@ -812,7 +809,6 @@ def _test_broken_module_1_inner():
     with pytest.raises(
         DeprecatedModuleImportError, match="missing_module cannot be imported. The typical reasons"
     ):
-        # pylint: disable=unused-import
         import cirq.testing._compat_test_data.broken_ref as br  # type: ignore # noqa: F401
 
 

cirq-core/cirq/contrib/paulistring/clifford_target_gateset.py

@@ -79,7 +79,7 @@ class SingleQubitTarget(Enum):
     def __init__(
         self,
         *,
-        single_qubit_target: SingleQubitTarget = SingleQubitTarget.PAULI_STRING_PHASORS_AND_CLIFFORDS,  # pylint: disable=line-too-long  # noqa: E501
+        single_qubit_target: SingleQubitTarget = SingleQubitTarget.PAULI_STRING_PHASORS_AND_CLIFFORDS,  # noqa: E501
         atol: float = 1e-8,
     ):
         """Initializes CliffordTargetGateset

cirq-core/cirq/experiments/__init__.py

@@ -37,7 +37,6 @@
 )
 
 from cirq.experiments.random_quantum_circuit_generation import (
-    # pylint: disable=line-too-long
     GRID_ALIGNED_PATTERN as GRID_ALIGNED_PATTERN,
     GRID_STAGGERED_PATTERN as GRID_STAGGERED_PATTERN,
     HALF_GRID_STAGGERED_PATTERN as HALF_GRID_STAGGERED_PATTERN,

cirq-core/cirq/json_resolver_cache.py

@@ -237,9 +237,7 @@ def _symmetricalqidpair(qids):
         'VirtualTag': cirq.VirtualTag,
         'WaitGate': cirq.WaitGate,
         # The formatter keeps putting this back
-        # pylint: disable=line-too-long
         'XEBPhasedFSimCharacterizationOptions': cirq.experiments.XEBPhasedFSimCharacterizationOptions,  # noqa: E501
-        # pylint: enable=line-too-long
         '_XEigenState': cirq.value.product_state._XEigenState,
         'XPowGate': cirq.XPowGate,
         'XXPowGate': cirq.XXPowGate,

cirq-core/cirq/linalg/__init__.py

@@ -26,7 +26,6 @@
 )
 
 from cirq.linalg.decompositions import (
-    # pylint: disable=line-too-long
     axis_angle as axis_angle,
     AxisAngleDecomposition as AxisAngleDecomposition,
     deconstruct_single_qubit_matrix_into_angles as deconstruct_single_qubit_matrix_into_angles,
@@ -44,7 +43,6 @@
 )
 
 from cirq.linalg.diagonalize import (
-    # pylint: disable=line-too-long
     bidiagonalize_real_matrix_pair_with_symmetric_products as bidiagonalize_real_matrix_pair_with_symmetric_products,  # noqa: E501
     bidiagonalize_unitary_with_special_orthogonals as bidiagonalize_unitary_with_special_orthogonals,  # noqa: E501
     diagonalize_real_symmetric_and_sorted_diagonal_matrices as diagonalize_real_symmetric_and_sorted_diagonal_matrices,  # noqa: E501

cirq-core/cirq/ops/classically_controlled_operation_test.py

@@ -505,7 +505,6 @@ def test_scope_local() -> None:
     assert internal_control_keys == ['0:0:a', '0:1:a', '1:0:a', '1:1:a']
     assert not cirq.control_keys(outer_subcircuit)
     assert not cirq.control_keys(circuit)
-    # pylint: disable=line-too-long
     cirq.testing.assert_has_diagram(
         cirq.Circuit(outer_subcircuit),
         """
@@ -515,7 +514,6 @@ def test_scope_local() -> None:
 """,  # noqa: E501
         use_unicode_characters=True,
     )
-    # pylint: enable=line-too-long
     cirq.testing.assert_has_diagram(
         circuit,
         """
@@ -659,7 +657,6 @@ def test_scope_extern() -> None:
     assert internal_control_keys == ['0:b', '0:b', '1:b', '1:b']
     assert not cirq.control_keys(outer_subcircuit)
     assert not cirq.control_keys(circuit)
-    # pylint: disable=line-too-long
     cirq.testing.assert_has_diagram(
         cirq.Circuit(outer_subcircuit),
         """
@@ -671,7 +668,6 @@ def test_scope_extern() -> None:
 """,  # noqa: E501
         use_unicode_characters=True,
     )
-    # pylint: enable=line-too-long
     cirq.testing.assert_has_diagram(
         circuit,
         """
@@ -780,7 +776,6 @@ def test_scope_extern_mismatch() -> None:
     assert internal_control_keys == ['b', 'b', 'b', 'b']
     assert cirq.control_keys(outer_subcircuit) == {cirq.MeasurementKey('b')}
     assert cirq.control_keys(circuit) == {cirq.MeasurementKey('b')}
-    # pylint: disable=line-too-long
     cirq.testing.assert_has_diagram(
         cirq.Circuit(outer_subcircuit),
         """
@@ -794,7 +789,6 @@ def test_scope_extern_mismatch() -> None:
 """,  # noqa: E501
         use_unicode_characters=True,
     )
-    # pylint: enable=line-too-long
     cirq.testing.assert_has_diagram(
         circuit,
         """
@@ -984,7 +978,6 @@ def test_sympy_scope() -> None:
         use_unicode_characters=True,
     )
 
-    # pylint: disable=line-too-long
     cirq.testing.assert_has_diagram(
         circuit,
         """
@@ -1000,7 +993,6 @@ def test_sympy_scope() -> None:
 """,  # noqa: E501
         use_unicode_characters=True,
     )
-    # pylint: enable=line-too-long
 
 
 def test_sympy_scope_simulation() -> None:

cirq-core/cirq/ops/clifford_gate_test.py

@@ -125,7 +125,6 @@ def test_init_from_double_invalid(trans1, from1) -> None:
 @pytest.mark.parametrize('trans,frm', itertools.product(_all_rotations(), _paulis))
 def test_init_from_single_map_vs_kwargs(trans, frm) -> None:
     from_str = str(frm).lower() + '_to'
-    # pylint: disable=unexpected-keyword-arg
     gate_kw = cirq.SingleQubitCliffordGate.from_single_map(**{from_str: trans})
     gate_map = cirq.SingleQubitCliffordGate.from_single_map({frm: trans})
     assert gate_kw == gate_map

cirq-core/cirq/ops/fsim_gate_test.py

@@ -490,7 +490,6 @@ def test_phased_fsim_circuit() -> None:
 1: ───PhFSim(0.5π, -π, 0.5π, 0, -0.25π)───PhFSim(-π, 0.5π, 0.1π, 0.2π, 0.3π)───
     """,
     )
-    # pylint: disable=line-too-long
     cirq.testing.assert_has_diagram(
         c,
         """
@@ -510,7 +509,6 @@ def test_phased_fsim_circuit() -> None:
         use_unicode_characters=False,
         precision=None,
     )
-    # pylint: enable=line-too-long
     c = cirq.Circuit(
         cirq.PhasedFSimGate(
             sympy.Symbol('a') + sympy.Symbol('b'),

cirq-core/cirq/ops/pauli_gates_test.py

@@ -116,7 +116,6 @@ def test_relative_index_consistency() -> None:
 
 
 def test_gt() -> None:
-    # pylint: disable=unnecessary-negation
     assert not cirq.X > cirq.X
     assert not cirq.X > cirq.Y
     assert cirq.X > cirq.Z
@@ -134,7 +133,6 @@ def test_gt_other_type() -> None:
 
 
 def test_lt() -> None:
-    # pylint: disable=unnecessary-negation
     assert not cirq.X < cirq.X
     assert cirq.X < cirq.Y
     assert not cirq.X < cirq.Z

cirq-core/cirq/ops/pauli_string_test.py

@@ -1546,7 +1546,6 @@ def text(self, to_print):
     assert p.text_pretty == 'cirq.PauliString(...)'
 
 
-# pylint: disable=line-too-long
 def test_circuit_diagram_info():
     a, b, c = cirq.LineQubit.range(3)
 
@@ -1571,9 +1570,6 @@ def test_circuit_diagram_info():
     )
 
 
-# pylint: enable=line-too-long
-
-
 def test_mutable_pauli_string_init_raises():
     q = cirq.LineQubit.range(3)
     with pytest.raises(ValueError, match='must be between 1 and 3'):

cirq-core/cirq/ops/raw_types_test.py

@@ -79,7 +79,6 @@ def test_wrapped_qid() -> None:
         'dimension': 3,
     }
 
-    # pylint: disable=unnecessary-negation
     assert not ValidQubit('zz') == 4  # noqa: SIM201
     assert ValidQubit('zz') != 4
     assert ValidQubit('zz') > ValidQubit('aa')
@@ -786,9 +785,7 @@ def _parameter_names_(self) -> AbstractSet[str]:
         def _is_parameterized_(self) -> bool:
             return cirq.is_parameterized(self._param)
 
-        def _resolve_parameters_(
-            self, resolver: cirq.ParamResolver, recursive: bool
-        ) -> Gate:  # pylint: disable=undefined-variable
+        def _resolve_parameters_(self, resolver: cirq.ParamResolver, recursive: bool) -> Gate:
             return Gate(cirq.resolve_parameters(self._param, resolver, recursive))
 
         def __repr__(self):

cirq-core/cirq/ops/state_preparation_channel_test.py

@@ -124,7 +124,6 @@ def test_gate_error_handling() -> None:
 
 
 def test_equality_of_gates() -> None:
-    # pylint: disable=unnecessary-negation
     state = np.array([1, 0, 0, 0], dtype=np.complex64)
     gate_1 = cirq.StatePreparationChannel(state)
     gate_2 = cirq.StatePreparationChannel(state)

cirq-core/cirq/protocols/__init__.py

@@ -139,11 +139,8 @@
     SupportsPauliExpansion as SupportsPauliExpansion,
 )
 
-# pylint: disable=redefined-builtin
 from cirq.protocols.pow_protocol import pow as pow
 
-# pylint: enable=redefined-builtin
-
 from cirq.protocols.qasm import (
     qasm as qasm,
     QasmArgs as QasmArgs,

cirq-core/cirq/protocols/measurement_key_protocol_test.py

@@ -101,7 +101,6 @@ def test_is_measurement() -> None:
     assert not cirq.is_measurement(cirq.bit_flip(1))
 
     class NotImplementedOperation(cirq.Operation):
-        # pylint: disable=undefined-variable
         def with_qubits(self, *new_qubits) -> NotImplementedOperation:
             raise NotImplementedError()
 

cirq-core/cirq/protocols/pow_protocol.py

@@ -28,7 +28,6 @@
 TDefault = TypeVar('TDefault')
 
 
-# pylint: disable=redefined-builtin
 @overload
 def pow(val: cirq.Gate, exponent: Any) -> cirq.Gate:
     pass
@@ -59,9 +58,6 @@ def pow(val: Any, exponent: Any, default: TDefault) -> Any:
     pass
 
 
-# pylint: enable=redefined-builtin
-
-
 def pow(val: Any, exponent: Any, default: Any = RaiseTypeErrorIfNotProvided) -> Any:
     """Returns `val**factor` of the given value, if defined.
 

cirq-core/cirq/qis/clifford_tableau_test.py

@@ -440,9 +440,7 @@ def test_tableau_matmul():
     assert expected_t != t1 @ t2
 
     with pytest.raises(TypeError):
-        # pylint: disable=pointless-statement
         t1 @ 21
-        # pylint: enable=pointless-statement
 
 
 def test_tableau_then_with_bad_input():

cirq-core/cirq/testing/__init__.py

@@ -15,7 +15,6 @@
 """Utilities for testing code."""
 
 from cirq.testing.circuit_compare import (
-    # pylint: disable=line-too-long
     assert_circuits_with_terminal_measurements_are_equivalent as assert_circuits_with_terminal_measurements_are_equivalent,  # noqa: E501
     assert_circuits_have_same_unitary_given_final_permutation as assert_circuits_have_same_unitary_given_final_permutation,  # noqa: E501
     assert_has_consistent_apply_channel as assert_has_consistent_apply_channel,
@@ -28,7 +27,6 @@
 )
 
 from cirq.testing.consistent_act_on import (
-    # pylint: disable=line-too-long
     assert_all_implemented_act_on_effects_match_unitary as assert_all_implemented_act_on_effects_match_unitary,  # noqa: E501
 )
 
@@ -48,7 +46,6 @@
 )
 
 from cirq.testing.consistent_pauli_expansion import (
-    # pylint: disable=line-too-long
     assert_pauli_expansion_is_consistent_with_unitary as assert_pauli_expansion_is_consistent_with_unitary,  # noqa: E501
 )
 
@@ -57,7 +54,6 @@
 )
 
 from cirq.testing.consistent_protocols import (
-    # pylint: disable=line-too-long
     assert_eigengate_implements_consistent_protocols as assert_eigengate_implements_consistent_protocols,  # noqa: E501
     assert_has_consistent_trace_distance_bound as assert_has_consistent_trace_distance_bound,
     assert_implements_consistent_protocols as assert_implements_consistent_protocols,