ruff - enable and fix rules F401, F601 (#7413)

pavoljuhas · web-flow · commit 6bb666165e7b · 2025-06-09T22:16:40.000Z
- enable and fix F601 - multi-value-repeated-key-literal - enable and fix F401 - unused-import No change in the effective code. Partially implements #7371
diff --git a/cirq-core/cirq/__init__.py b/cirq-core/cirq/__init__.py
@@ -14,6 +14,8 @@
 
 """Cirq is a framework for creating, editing, and invoking quantum circuits."""
 
+# ruff: noqa: F401
+
 from cirq import _import
 
 from cirq._compat import __cirq_debug__ as __cirq_debug__, with_debug as with_debug
diff --git a/cirq-core/cirq/_compat_test.py b/cirq-core/cirq/_compat_test.py
@@ -813,7 +813,7 @@ def _test_broken_module_1_inner():
         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
+        import cirq.testing._compat_test_data.broken_ref as br  # type: ignore # noqa: F401
 
 
 def _test_broken_module_2_inner():
diff --git a/cirq-core/cirq/contrib/__init__.py b/cirq-core/cirq/contrib/__init__.py
@@ -18,9 +18,9 @@
 this package.
 """
 
-from cirq.contrib import acquaintance
-from cirq.contrib import graph_device
-from cirq.contrib import quirk
+from cirq.contrib import acquaintance  # noqa: F401
+from cirq.contrib import graph_device  # noqa: F401
+from cirq.contrib import quirk  # noqa: F401
 from cirq.contrib.qcircuit import circuit_to_latex_using_qcircuit as circuit_to_latex_using_qcircuit
-from cirq.contrib import json
+from cirq.contrib import json  # noqa: F401
 from cirq.contrib.circuitdag import CircuitDag as CircuitDag, Unique as Unique
diff --git a/cirq-core/cirq/contrib/acquaintance/__init__.py b/cirq-core/cirq/contrib/acquaintance/__init__.py
@@ -79,4 +79,4 @@
     random_topological_sort as random_topological_sort,
 )
 
-from cirq.contrib.acquaintance import testing
+from cirq.contrib.acquaintance import testing  # noqa: F401
diff --git a/cirq-core/cirq/contrib/quimb/Cirq-to-Tensor-Networks.ipynb b/cirq-core/cirq/contrib/quimb/Cirq-to-Tensor-Networks.ipynb
@@ -8,16 +8,12 @@
    "source": [
     "import importlib.util\n",
     "\n",
-    "try:\n",
-    "    import cirq\n",
-    "except ImportError:\n",
+    "if importlib.util.find_spec('cirq') is None:\n",
     "    print(\"installing cirq...\")\n",
     "    !pip install --quiet cirq\n",
     "    print(\"installed cirq.\")\n",
     "\n",
-    "try:\n",
-    "    import quimb\n",
-    "except ImportError:\n",
+    "if importlib.util.find_spec('quimb') is None:\n",
     "    print(\"installing cirq-core[contrib]...\")\n",
     "    !pip install --quiet 'cirq-core[contrib]'\n",
     "    print(\"installed cirq-core[contrib].\")"
@@ -58,7 +54,6 @@
    "outputs": [],
    "source": [
     "import cirq.contrib.quimb as ccq\n",
-    "import quimb\n",
     "import quimb.tensor as qtn"
    ]
   },
diff --git a/cirq-core/cirq/contrib/quimb/Contract-a-Grid-Circuit.ipynb b/cirq-core/cirq/contrib/quimb/Contract-a-Grid-Circuit.ipynb
@@ -13,8 +13,6 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import importlib.util\n",
-    "\n",
     "try:\n",
     "    import cirq\n",
     "except ImportError:\n",
diff --git a/cirq-core/cirq/experiments/benchmarking/__init__.py b/cirq-core/cirq/experiments/benchmarking/__init__.py
@@ -14,4 +14,4 @@
 
 """Tools for branchmarking NISQ circuits."""
 
-from cirq.experiments.benchmarking.parallel_xeb import parallel_two_qubit_xeb
+from cirq.experiments.benchmarking.parallel_xeb import parallel_two_qubit_xeb  # noqa: F401
diff --git a/cirq-core/cirq/interop/quirk/cells/__init__.py b/cirq-core/cirq/interop/quirk/cells/__init__.py
@@ -37,4 +37,4 @@
 )
 
 import cirq.interop.quirk.cells.swap_cell
-import cirq.interop.quirk.cells.control_cells
+import cirq.interop.quirk.cells.control_cells  # noqa: F401
diff --git a/cirq-core/cirq/testing/_compat_test_data/module_a/__init__.py b/cirq-core/cirq/testing/_compat_test_data/module_a/__init__.py
@@ -1,4 +1,5 @@
 # pylint: disable=wrong-or-nonexistent-copyright-notice
+# ruff: noqa: F401
 """module_a for module deprecation tests"""
 
 import logging
diff --git a/cirq-core/cirq/testing/_compat_test_data/module_a/module_b/__init__.py b/cirq-core/cirq/testing/_compat_test_data/module_a/module_b/__init__.py
@@ -1,4 +1,5 @@
 # pylint: disable=wrong-or-nonexistent-copyright-notice
+# ruff: noqa: F401
 from cirq.testing._compat_test_data.module_a.module_b import module_c
 
 MODULE_B_ATTRIBUTE = "module_b"
diff --git a/cirq-core/cirq/testing/_compat_test_data/module_a/sub/__init__.py b/cirq-core/cirq/testing/_compat_test_data/module_a/sub/__init__.py
@@ -1,2 +1,3 @@
 # pylint: disable=wrong-or-nonexistent-copyright-notice
+# ruff: noqa: F401
 from cirq.testing._compat_test_data.module_a.sub.subsub import dupe
diff --git a/cirq-core/cirq/testing/consistent_qasm_test.py b/cirq-core/cirq/testing/consistent_qasm_test.py
@@ -14,6 +14,7 @@
 
 from __future__ import annotations
 
+import importlib.util
 import warnings
 
 import numpy as np
@@ -53,9 +54,7 @@ def _qasm_(self, args: cirq.QasmArgs, qubits: tuple[cirq.Qid, ...]):
 
 
 def test_assert_qasm_is_consistent_with_unitary() -> None:
-    try:
-        import qiskit as _
-    except ImportError:  # pragma: no cover
+    if importlib.util.find_spec('qiskit') is None:  # pragma: no cover
         warnings.warn(
             "Skipped test_assert_qasm_is_consistent_with_unitary "
             "because qiskit isn't installed to verify against."
diff --git a/cirq-core/cirq/transformers/gauge_compiling/__init__.py b/cirq-core/cirq/transformers/gauge_compiling/__init__.py
@@ -39,4 +39,6 @@
     SqrtISWAPGaugeTransformer as SqrtISWAPGaugeTransformer,
 )
 
-from cirq.transformers.gauge_compiling.cphase_gauge import CPhaseGaugeTransformer
+from cirq.transformers.gauge_compiling.cphase_gauge import (
+    CPhaseGaugeTransformer as CPhaseGaugeTransformer,
+)
diff --git a/cirq-google/cirq_google/__init__.py b/cirq-google/cirq_google/__init__.py
@@ -14,8 +14,7 @@
 
 """Classes for working with Google's Quantum Engine API."""
 
-import sys
-from cirq_google import api
+from cirq_google import api  # noqa: F401
 
 from cirq_google._version import __version__ as __version__
 
@@ -107,9 +106,9 @@
     SimulatedProcessorWithLocalDeviceRecord as SimulatedProcessorWithLocalDeviceRecord,
 )
 
-from cirq_google import study
+from cirq_google import study  # noqa: F401
 
-from cirq_google import experimental
+from cirq_google import experimental  # noqa: F401
 
 
 # Register cirq_google's public classes for JSON serialization.
diff --git a/cirq-google/cirq_google/api/__init__.py b/cirq-google/cirq_google/api/__init__.py
@@ -13,4 +13,4 @@
 # limitations under the License.
 """Helpers for converting to/from api data formats."""
 
-from cirq_google.api import v2
+from cirq_google.api import v2  # noqa: F401
diff --git a/cirq-google/cirq_google/api/v1/__init__.py b/cirq-google/cirq_google/api/v1/__init__.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 """Data format v1 for google api."""
 
-from cirq_google.api.v1 import operations_pb2, params_pb2, program_pb2
+from cirq_google.api.v1 import operations_pb2, params_pb2, program_pb2  # noqa: F401
 
 from cirq_google.api.v1.params import (
     sweep_from_proto as sweep_from_proto,
diff --git a/cirq-google/cirq_google/api/v1/proto_test.py b/cirq-google/cirq_google/api/v1/proto_test.py
@@ -18,6 +18,6 @@
 
 from __future__ import annotations
 
-from cirq_google.api.v1 import operations_pb2, params_pb2, program_pb2
+from cirq_google.api.v1 import operations_pb2, params_pb2, program_pb2  # noqa: F401
 
 # pylint: enable=unused-import
diff --git a/cirq-google/cirq_google/api/v2/__init__.py b/cirq-google/cirq_google/api/v2/__init__.py
@@ -13,7 +13,13 @@
 # limitations under the License.
 """Data format v2 for google api."""
 
-from cirq_google.api.v2 import device_pb2, metrics_pb2, program_pb2, result_pb2, run_context_pb2
+from cirq_google.api.v2 import (
+    device_pb2,  # noqa: F401
+    metrics_pb2,  # noqa: F401
+    program_pb2,  # noqa: F401
+    result_pb2,  # noqa: F401
+    run_context_pb2,  # noqa: F401
+)
 
 from cirq_google.api.v2.program import (
     grid_qubit_from_proto_id as grid_qubit_from_proto_id,
diff --git a/cirq-google/cirq_google/api/v2/proto_test.py b/cirq-google/cirq_google/api/v2/proto_test.py
@@ -18,6 +18,6 @@
 
 from __future__ import annotations
 
-from cirq_google.api.v2 import metrics_pb2, program_pb2, result_pb2, run_context_pb2
+from cirq_google.api.v2 import metrics_pb2, program_pb2, result_pb2, run_context_pb2  # noqa: F401
 
 # pylint: enable=unused-import
diff --git a/cirq-google/cirq_google/engine/abstract_processor.py b/cirq-google/cirq_google/engine/abstract_processor.py
@@ -35,7 +35,6 @@
     import cirq_google.engine.abstract_engine as abstract_engine
     import cirq_google.engine.abstract_job as abstract_job
     import cirq_google.engine.calibration as calibration
-    import cirq_google.serialization.serializer as serializer
 
 
 class AbstractProcessor(abc.ABC):
diff --git a/cirq-google/cirq_google/engine/simulated_local_program.py b/cirq-google/cirq_google/engine/simulated_local_program.py
@@ -20,8 +20,6 @@
 from cirq_google.engine.local_simulation_type import LocalSimulationType
 
 if TYPE_CHECKING:
-    from cirq_google.engine.abstract_engine import AbstractEngine
-    from cirq_google.engine.abstract_job import AbstractJob
     from cirq_google.engine.simulated_local_processor import SimulatedLocalProcessor
 
 
diff --git a/cirq-ionq/cirq_ionq/service_test.py b/cirq-ionq/cirq_ionq/service_test.py
@@ -40,7 +40,6 @@ def test_service_run(target, expected_results):
         'target': target,
         'metadata': {'shots': '4', 'measurement0': f'a{chr(31)}0'},
         'qubits': '1',
-        'status': 'completed',
     }
     mock_client.get_results.return_value = {'0': '0.25', '1': '0.75'}
     service._client = mock_client
@@ -86,7 +85,6 @@ def test_service_run_batch(target, expected_results1, expected_results2):
             'qubit_numbers': '[1, 1]',
         },
         'qubits': '1',
-        'status': 'completed',
     }
     mock_client.get_results.return_value = {
         "xxx": {'0': '0.25', '1': '0.75'},
diff --git a/cirq-rigetti/cirq_rigetti/__init__.py b/cirq-rigetti/cirq_rigetti/__init__.py
@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# ruff: noqa: F401
+
 from cirq_rigetti._version import __version__ as __version__
 
 from cirq_rigetti.sampler import (
diff --git a/cirq-web/circuit_example.ipynb b/cirq-web/circuit_example.ipynb
@@ -74,7 +74,6 @@
     "qubits = [cirq.GridQubit(x, y) for x in range(10) for y in range(10)]\n",
     "\n",
     "import cirq.testing\n",
-    "from cirq.protocols import circuit_diagram_info\n",
     "\n",
     "circuit = cirq.testing.random_circuit(cirq.GridQubit.square(10), n_moments=5, op_density=0.7)"
    ]
diff --git a/examples/advanced/quantum_volume.ipynb b/examples/advanced/quantum_volume.ipynb
@@ -31,7 +31,6 @@
    "outputs": [],
    "source": [
     "import cirq\n",
-    "import cirq_google\n",
     "\n",
     "qubits = cirq.GridQubit.rect(3, 2)\n",
     "qubits"
diff --git a/examples/advanced/quantum_volume_routing.ipynb b/examples/advanced/quantum_volume_routing.ipynb
@@ -31,7 +31,6 @@
    "outputs": [],
    "source": [
     "import cirq\n",
-    "import cirq_google\n",
     "\n",
     "# Configuration parameters. Feel free to mess with these!\n",
     "num_circuits = 10\n",
diff --git a/pyproject.toml b/pyproject.toml
@@ -57,8 +57,8 @@ extend-exclude = ["*_pb2.py*"]
 [tool.ruff.lint]
 select = [
     # "ANN201",  # missing-return-type-undocumented-public-function
-    # "F401",  # unused-import
-    # "F601",  # multi-value-repeated-key-literal
+    "F401",  # unused-import
+    "F601",  # multi-value-repeated-key-literal
     "F821",  # undefined-name
     "RUF100",  # unused-noqa
     "TC001",  # typing-only-first-party-import

Original file line number	Diff line number	Diff line change
`@@ -79,4 +79,4 @@`
`79`	`79`	`random_topological_sort as random_topological_sort,`
`80`	`80`	`)`
`81`	`81`
`82`		`-from cirq.contrib.acquaintance import testing`
	`82`	`+from cirq.contrib.acquaintance import testing # noqa: F401`
Original file line number	Diff line number	Diff line change
`@@ -14,4 +14,4 @@`
`14`	`14`
`15`	`15`	`"""Tools for branchmarking NISQ circuits."""`
`16`	`16`
`17`		`-from cirq.experiments.benchmarking.parallel_xeb import parallel_two_qubit_xeb`
	`17`	`+from cirq.experiments.benchmarking.parallel_xeb import parallel_two_qubit_xeb # noqa: F401`
Original file line number	Diff line number	Diff line change
`@@ -37,4 +37,4 @@`
`37`	`37`	`)`
`38`	`38`
`39`	`39`	`import cirq.interop.quirk.cells.swap_cell`
`40`		`-import cirq.interop.quirk.cells.control_cells`
	`40`	`+import cirq.interop.quirk.cells.control_cells # noqa: F401`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`# pylint: disable=wrong-or-nonexistent-copyright-notice`
	`2`	`+# ruff: noqa: F401`
`2`	`3`	`"""module_a for module deprecation tests"""`
`3`	`4`
`4`	`5`	`import logging`