use ruff and pyupgrade to support 3.11+ python language features

doc/releases/changelog-dev.md

@@ -90,6 +90,9 @@
 
 <h3>Internal changes ⚙️</h3>
 
+* Upgraded source code to use Python 3.11+ language features.
+  [(#7860)](https://github.com/PennyLaneAI/pennylane/pull/7860)
+
 * Added a `dialects` submodule to `qml.compiler.python_compiler` which now houses all the xDSL dialects we create.
   Additionally, the `MBQCDialect` and `QuantumDialect` dialects have been renamed to `MBQC` and `Quantum`.
   [(#7897)](https://github.com/PennyLaneAI/pennylane/pull/7897)

pennylane/_deprecated_observable.py

@@ -58,10 +58,7 @@ def is_hermitian(self) -> bool:
         """All observables must be hermitian"""
         return True
 
-    def compare(
-        self,
-        other: Union["Observable", "qml.ops.LinearCombination"],
-    ) -> bool:
+    def compare(self, other: Union["Observable", "qml.ops.LinearCombination"]) -> bool:
         r"""Compares with another :class:`~Observable`, to determine if they are equivalent.
 
         .. warning::

pennylane/allocation.py

@@ -15,7 +15,7 @@
 This module contains the commands for allocating and deallocating wires dynamically.
 """
 import uuid
-from typing import Optional, Sequence
+from collections.abc import Sequence
 
 from pennylane.capture import enabled as capture_enabled
 from pennylane.operation import Operator
@@ -73,7 +73,7 @@ class DynamicWire:
         key (Optional[str]): a ``uuid4`` string to uniquely identify the dynamic wire.
     """
 
-    def __init__(self, key: Optional[uuid.UUID] = None):
+    def __init__(self, key: uuid.UUID | None = None):
         self.key = key or uuid.uuid4()
 
     def __eq__(self, other):

pennylane/bose/bosonic.py

@@ -70,7 +70,7 @@ def items(self):
     @property
     def wires(self):
         r"""Return wires in a BoseWord."""
-        return set(i[1] for i in self.sorted_dic.keys())
+        return {i[1] for i in self.sorted_dic.keys()}
 
     def __missing__(self, key):
         r"""Return empty string for a missing key in BoseWord."""

pennylane/bose/bosonic_mapping.py

@@ -15,7 +15,6 @@
 
 from collections import defaultdict
 from functools import singledispatch
-from typing import Union
 
 import numpy as np
 
@@ -39,7 +38,7 @@ def _get_pauli_op(i, j, qub_id):
 
 
 def binary_mapping(
-    bose_operator: Union[BoseWord, BoseSentence],
+    bose_operator: BoseWord | BoseSentence,
     n_states: int = 2,
     ps: bool = False,
     wire_map: dict = None,
@@ -164,7 +163,7 @@ def _(bose_operator: BoseSentence, n_states, tol=None):
 
 
 def unary_mapping(
-    bose_operator: Union[BoseWord, BoseSentence],
+    bose_operator: BoseWord | BoseSentence,
     n_states: int = 2,
     ps: bool = False,
     wire_map: dict = None,
@@ -300,7 +299,7 @@ def _(bose_operator: BoseSentence, n_states, tol=None):
 
 
 def christiansen_mapping(
-    bose_operator: Union[BoseWord, BoseSentence],
+    bose_operator: BoseWord | BoseSentence,
     ps: bool = False,
     wire_map: dict = None,
     tol: float = None,

pennylane/capture/__init__.py

@@ -158,7 +158,8 @@ class MyCustomOp(qml.operation.Operator):
     def _(*args, **kwargs):
         return type.__call__(MyCustomOp, *args, **kwargs)
 """
-from typing import Callable, Type
+from typing import Type
+from collections.abc import Callable
 
 from .switches import disable, enable, enabled, pause
 from .capture_meta import CaptureMeta, ABCCaptureMeta

pennylane/capture/autograph/ag_primitives.py

@@ -18,7 +18,8 @@
 """
 import copy
 import functools
-from typing import Any, Callable, Iterator, SupportsIndex, Tuple, Union
+from collections.abc import Callable, Iterator
+from typing import Any, SupportsIndex
 
 from malt.core import config as ag_config
 from malt.impl import api as ag_api
@@ -69,9 +70,9 @@ def if_stmt(
     pred: bool,
     true_fn: Callable[[], Any],
     false_fn: Callable[[], Any],
-    get_state: Callable[[], Tuple],
-    set_state: Callable[[Tuple], None],
-    symbol_names: Tuple[str],
+    get_state: Callable[[], tuple],
+    set_state: Callable[[tuple], None],
+    symbol_names: tuple[str],
     _num_results: int,
 ):
     """An implementation of the AutoGraph 'if' statement. The interface is defined by AutoGraph,
@@ -205,11 +206,11 @@ def functional_for(i, *iter_args):
 
 def for_stmt(
     iteration_target: Any,
-    _extra_test: Union[Callable[[], bool], None],
+    _extra_test: Callable[[], bool] | None,
     body_fn: Callable[[int], None],
-    get_state: Callable[[], Tuple],
-    set_state: Callable[[Tuple], None],
-    symbol_names: Tuple[str],
+    get_state: Callable[[], tuple],
+    set_state: Callable[[tuple], None],
+    symbol_names: tuple[str],
     _opts: dict,
 ):
     """An implementation of the AutoGraph 'for .. in ..' statement. The interface is defined by
@@ -486,9 +487,7 @@ def __contains__(self, __key: object) -> bool:  # pragma: no cover
     def __iter__(self) -> Iterator[int]:  # pragma: no cover
         return self.py_range.__iter__()
 
-    def __getitem__(
-        self, __key: Union[SupportsIndex, slice]
-    ) -> Union[int, range]:  # pragma: no cover
+    def __getitem__(self, __key: SupportsIndex | slice) -> int | range:  # pragma: no cover
         return self.py_range.__getitem__(__key)
 
     def __reversed__(self) -> Iterator[int]:  # pragma: no cover

pennylane/capture/base_interpreter.py

@@ -14,10 +14,11 @@
 """
 This submodule defines a strategy structure for defining custom plxpr interpreters
 """
+from collections.abc import Callable, Sequence
+
 # pylint: disable=no-self-use
 from copy import copy
 from functools import partial, wraps
-from typing import Callable, Optional, Sequence
 
 import jax
 
@@ -44,7 +45,7 @@
 """
 
 
-def _fill_in_shape_with_dyn_shape(dyn_shape: tuple["jax.core.Tracer"], shape: tuple[Optional[int]]):
+def _fill_in_shape_with_dyn_shape(dyn_shape: tuple["jax.core.Tracer"], shape: tuple[int | None]):
     """
     A helper for broadcast_in_dim and iota to combine static dimensions and dynamic dimensions.
 

pennylane/capture/custom_primitives.py

@@ -19,7 +19,6 @@
 # pylint: disable=abstract-method
 
 from enum import Enum
-from typing import Union
 
 from jax.extend.core import Primitive
 
@@ -48,6 +47,6 @@ def prim_type(self):
         return self._prim_type.value
 
     @prim_type.setter
-    def prim_type(self, value: Union[str, PrimitiveType]):
+    def prim_type(self, value: str | PrimitiveType):
         """Setter for QmlPrimitive.prim_type."""
         self._prim_type = PrimitiveType(value)

pennylane/capture/dynamic_shapes.py

@@ -14,7 +14,7 @@
 """
 Contains a utility for handling inputs with dynamically shaped arrays.
 """
-from typing import Callable, Sequence, Union
+from collections.abc import Callable, Sequence
 
 has_jax = True
 try:
@@ -189,7 +189,7 @@ def _tracer_and_outvar(
 
     def custom_staging_rule(
         jaxpr_trace: pe.DynamicJaxprTrace, source_info, *tracers: pe.DynamicJaxprTracer, **params
-    ) -> Union[Sequence[pe.DynamicJaxprTracer], pe.DynamicJaxprTracer]:
+    ) -> Sequence[pe.DynamicJaxprTracer] | pe.DynamicJaxprTracer:
         """
         Add new jaxpr equation to the jaxpr_trace and return new tracers.
         """

pennylane/capture/expand_transforms.py

@@ -14,8 +14,8 @@
 """
 Helper function for expanding transforms with program capture
 """
+from collections.abc import Callable
 from functools import wraps
-from typing import Callable
 
 from .base_interpreter import PlxprInterpreter
 

pennylane/capture/make_plxpr.py

@@ -14,7 +14,7 @@
 
 """The make_plxpr function and helper methods"""
 
-from typing import Callable, Sequence, Union
+from collections.abc import Callable, Sequence
 
 import pennylane as qml
 
@@ -27,9 +27,7 @@
     has_jax = False
 
 
-def make_plxpr(
-    func: Callable, static_argnums: Union[int, Sequence[int]] = (), autograph=True, **kwargs
-):
+def make_plxpr(func: Callable, static_argnums: int | Sequence[int] = (), autograph=True, **kwargs):
     r"""Takes a function and returns a ``Callable`` that, when called, produces a PLxPR representing
     the function with the given args.
 

pennylane/circuit_graph.py

@@ -16,8 +16,8 @@
 representation of a quantum circuit from an Operator queue.
 """
 from collections import defaultdict, namedtuple
+from collections.abc import Sequence
 from functools import cached_property
-from typing import Optional, Sequence, Union
 
 import numpy as np
 import rustworkx as rx
@@ -97,11 +97,11 @@ class CircuitGraph:
     # pylint: disable=too-many-arguments, too-many-positional-arguments
     def __init__(
         self,
-        ops: list[Union[Operator, MeasurementProcess]],
-        obs: list[Union[MeasurementProcess, Operator]],
+        ops: list[Operator | MeasurementProcess],
+        obs: list[MeasurementProcess | Operator],
         wires: Wires,
-        par_info: Optional[list[dict]] = None,
-        trainable_params: Optional[set[int]] = None,
+        par_info: list[dict] | None = None,
+        trainable_params: set[int] | None = None,
     ):
         self._operations = ops
         self._observables = obs

pennylane/compiler/compiler.py

@@ -19,7 +19,6 @@
 from collections import defaultdict
 from importlib import metadata, reload
 from sys import version_info
-from typing import List, Optional
 
 from packaging.version import Version
 
@@ -114,7 +113,7 @@ def _reload_compilers():
     _refresh_compilers()
 
 
-def available_compilers() -> List[str]:
+def available_compilers() -> list[str]:
     """Load and return a list of available compilers that are
     installed and compatible with the :func:`~.qjit` decorator.
 
@@ -169,7 +168,7 @@ def available(compiler="catalyst") -> bool:
     return compiler in AvailableCompilers.names_entrypoints
 
 
-def active_compiler() -> Optional[str]:
+def active_compiler() -> str | None:
     """Check which compiler is activated inside a :func:`~.qjit` evaluation context.
 
     This helper function may be used during implementation

pennylane/compiler/python_compiler/dialects/mbqc.py

@@ -21,7 +21,7 @@
 catalyst/mlir/include/MBQC/IR/MBQCDialect.td file in the catalyst repository.
 """
 
-from typing import Optional, TypeAlias
+from typing import TypeAlias
 
 from xdsl.dialects.builtin import I32, Float64Type, IntegerAttr, IntegerType
 from xdsl.ir import Dialect, EnumAttribute, Operation, SSAValue
@@ -90,7 +90,7 @@ def __init__(
         in_qubit: QubitSSAValue | Operation,
         plane: MeasurementPlaneAttr,
         angle: SSAValue[Float64Type],
-        postselect: Optional[int | IntegerAttr] = None,
+        postselect: int | IntegerAttr | None = None,
     ):
         properties = {"plane": plane}
 

pennylane/compiler/python_compiler/dialects/quantum.py

@@ -25,7 +25,8 @@
 
 # pragma: no cover
 
-from typing import Sequence, TypeAlias
+from collections.abc import Sequence
+from typing import TypeAlias
 
 from xdsl.dialects.builtin import (
     I32,

pennylane/compiler/python_compiler/jax_utils.py

@@ -14,8 +14,9 @@
 
 """Utilities for translating JAX to xDSL"""
 
+from collections.abc import Callable
 from functools import wraps
-from typing import Callable, TypeAlias
+from typing import TypeAlias
 
 import jaxlib
 from catalyst import QJIT

pennylane/compiler/python_compiler/transforms/api/compiler_transform.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 """Core API for registering xDSL transforms for use with PennyLane and Catalyst."""
 
-from typing import Callable
+from collections.abc import Callable
 
 from catalyst.from_plxpr import register_transform
 from xdsl.passes import ModulePass

pennylane/compiler/python_compiler/transforms/api/transform_interpreter.py

@@ -19,7 +19,7 @@
 """
 
 import io
-from typing import Callable
+from collections.abc import Callable
 
 from catalyst.compiler import _quantum_opt  # pylint: disable=protected-access
 from xdsl.context import Context

pennylane/compiler/python_compiler/transforms/measurements_from_samples.py

@@ -33,7 +33,6 @@
 from abc import abstractmethod
 from dataclasses import dataclass
 from itertools import islice
-from typing import Optional
 
 import jax
 import jax.numpy as jnp
@@ -233,7 +232,7 @@ def get_postprocessing_funcs_from_module_and_insert(
         cls,
         postprocessing_module: builtin.ModuleOp,
         matched_op: ir.Operation,
-        name: Optional[str] = None,
+        name: str | None = None,
     ) -> func.FuncOp:
         """Get the post-processing FuncOp from `postprocessing_module` (and any helper functions
         also contained in `postprocessing_module`) and insert it (them) immediately after the FuncOp

pennylane/concurrency/executors/backends.py

@@ -16,7 +16,6 @@
 """
 
 from enum import Enum
-from typing import Union
 
 from .external import DaskExec, MPICommExec, MPIPoolExec
 from .native import MPPoolExec, ProcPoolExec, SerialExec, ThreadPoolExec
@@ -62,7 +61,7 @@ def get_supported_backends():
     return _ExecBackendsMap
 
 
-def get_executor(backend: Union[ExecBackends, str] = ExecBackends.MP_Pool):
+def get_executor(backend: ExecBackends | str = ExecBackends.MP_Pool):
     """
     Return the associated class type from the provided enumerated backends.
     """
@@ -71,7 +70,7 @@ def get_executor(backend: Union[ExecBackends, str] = ExecBackends.MP_Pool):
     return _ExecBackendsMap[backend]
 
 
-def create_executor(backend: Union[ExecBackends, str] = ExecBackends.MP_Pool, **kwargs):
+def create_executor(backend: ExecBackends | str = ExecBackends.MP_Pool, **kwargs):
     """
     Create an instance of the specified executor backend with forwarded keyword arguments
     """