ruff - enable and fix a series of UPNNN rules

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
 

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
 

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

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
 

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

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

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
@@ -159,7 +160,7 @@ def f(a, b):
 
 
 def test_deprecated_with_property():
-    class AClass(object):
+    class AClass:
         def __init__(self, a):
             self.a = a
 

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):

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')
 

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

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

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

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]:

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:

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
 

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
 

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
 

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

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
@@ -66,10 +67,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)

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

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 (

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

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

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

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

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
 

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
 

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