Add isort to lint

docs/conf.py

@@ -18,7 +18,7 @@
 
 # General options:
 import os
-from typing import Optional, Dict, Any
+from typing import Any, Optional
 
 project = "Qiskit-Braket provider"
 copyright = "2022"  # pylint: disable=redefined-builtin
@@ -31,7 +31,7 @@
     "qiskit_braket_provider",
     "version.py",
 )
-version_dict: Optional[Dict[str, Any]] = {}
+version_dict: Optional[dict[str, Any]] = {}
 with open(version_path) as fp:
     exec(fp.read(), version_dict)
 version = version_dict["__version__"]

docs/how_tos/data/3_hybrid_jobs/algorithm_script.py

@@ -1,9 +1,8 @@
 """Example of usage of Qiskit-Braket provider."""
-from qiskit import QuantumCircuit
-from qiskit_braket_provider import AWSBraketProvider
-
 from braket.jobs import save_job_result
+from qiskit import QuantumCircuit
 
+from qiskit_braket_provider import AWSBraketProvider
 
 provider = AWSBraketProvider()
 backend = provider.get_backend("SV1")

docs/tutorials/data/2_hybrid_jobs/job_script.py

@@ -1,10 +1,10 @@
 """Example of Hybrid Job payload with VQE."""
 from braket.jobs import save_job_result
-from qiskit.quantum_info import SparsePauliOp
 from qiskit.algorithms.minimum_eigensolvers import VQE
 from qiskit.algorithms.optimizers import SLSQP
 from qiskit.circuit.library import TwoLocal
 from qiskit.primitives import BackendEstimator
+from qiskit.quantum_info import SparsePauliOp
 
 from qiskit_braket_provider import AWSBraketProvider
 

qiskit_braket_provider/__init__.py

@@ -1,9 +1,9 @@
 """Qiskit-Braket provider."""
 
 from .providers import (
-    AWSBraketProvider,
     AmazonBraketTask,
     AWSBraketBackend,
     AWSBraketJob,
+    AWSBraketProvider,
     BraketLocalBackend,
 )

qiskit_braket_provider/providers/__init__.py

@@ -21,6 +21,5 @@
 """
 
 from .braket_backend import AWSBraketBackend, BraketLocalBackend
+from .braket_job import AmazonBraketTask, AWSBraketJob
 from .braket_provider import AWSBraketProvider
-from .braket_job import AmazonBraketTask
-from .braket_job import AWSBraketJob

qiskit_braket_provider/providers/adapter.py

@@ -1,34 +1,28 @@
 """Util function for provider."""
 
+import warnings
 from collections.abc import Callable, Iterable
 from math import pi
 from typing import Optional, Union
-import warnings
 
-from braket.aws import AwsDevice
-from braket.circuits import (
-    Circuit,
-    FreeParameter,
-    Instruction,
-    observables,
-)
 import braket.circuits.gates as braket_gates
-
+import qiskit.circuit.library as qiskit_gates
+from braket.aws import AwsDevice
+from braket.circuits import Circuit, FreeParameter, Instruction, observables
 from braket.device_schema import DeviceActionType, OpenQASMDeviceActionProperties
 from braket.device_schema.ionq import IonqDeviceCapabilities
 from braket.device_schema.oqc import OqcDeviceCapabilities
 from braket.device_schema.rigetti import RigettiDeviceCapabilities
 from braket.device_schema.simulators import GateModelSimulatorDeviceCapabilities
 from braket.devices import LocalSimulator
 from braket.ir.openqasm.modifiers import Control
-
 from qiskit import QuantumCircuit, transpile
+from qiskit.circuit import ControlledGate
 from qiskit.circuit import Instruction as QiskitInstruction
-from qiskit.circuit import ControlledGate, Measure, Parameter
-import qiskit.circuit.library as qiskit_gates
-
+from qiskit.circuit import Measure, Parameter
 from qiskit.transpiler import Target
 from qiskit_ionq import ionq_gates
+
 from qiskit_braket_provider.exception import QiskitBraketException
 
 _BRAKET_TO_QISKIT_NAMES = {

qiskit_braket_provider/providers/braket_backend.py

@@ -1,30 +1,30 @@
 """AWS Braket backends."""
 
 import datetime
-import logging
 import enum
+import logging
 from abc import ABC
 from collections.abc import Iterable
 from typing import Optional, Union
 
-from braket.aws import AwsDevice, AwsQuantumTaskBatch, AwsQuantumTask
+from braket.aws import AwsDevice, AwsQuantumTask, AwsQuantumTaskBatch
 from braket.aws.queue_information import QueueDepthInfo
 from braket.circuits import Circuit
 from braket.device_schema import DeviceActionType
 from braket.devices import Device, LocalSimulator
 from braket.tasks.local_quantum_task import LocalQuantumTask
 from qiskit import QuantumCircuit
-from qiskit.providers import BackendV2, QubitProperties, Options, Provider
+from qiskit.providers import BackendV2, Options, Provider, QubitProperties
 
+from .. import version
+from ..exception import QiskitBraketException
 from .adapter import (
     aws_device_to_target,
     gateset_from_properties,
     local_simulator_to_target,
     to_braket,
 )
 from .braket_job import AmazonBraketTask
-from .. import version
-from ..exception import QiskitBraketException
 
 logger = logging.getLogger(__name__)
 

qiskit_braket_provider/providers/braket_provider.py

@@ -2,8 +2,8 @@
 
 from braket.aws import AwsDevice
 from braket.device_schema.dwave import DwaveDeviceCapabilities
-from braket.device_schema.xanadu import XanaduDeviceCapabilities
 from braket.device_schema.quera import QueraDeviceCapabilities
+from braket.device_schema.xanadu import XanaduDeviceCapabilities
 from qiskit.providers import ProviderV1
 
 from .braket_backend import AWSBraketBackend, BraketLocalBackend

requirements-dev.txt

@@ -14,3 +14,4 @@ reno>=3.5.0
 # Black's formatting rules can change between major versions, so we use
 # the ~= specifier for it.
 black[jupyter]~=22.1
+isort>=5.12.0

setup.cfg

@@ -1,2 +1,6 @@
 [metadata]
 description_file = README.md
+
+[isort]
+include_trailing_comma = true
+profile = black

tests/providers/mocks.py

@@ -1,17 +1,16 @@
 """Mocks for testing."""
 
-from collections import Counter
 import copy
+import uuid
+from collections import Counter
 from typing import Dict
 
-import uuid
 import numpy as np
+from braket.device_schema.rigetti import RigettiDeviceCapabilities
 from braket.device_schema.simulators import GateModelSimulatorDeviceCapabilities
 from braket.task_result import TaskMetadata
 from braket.tasks import GateModelQuantumTaskResult
 from braket.tasks.local_quantum_task import LocalQuantumTask
-from braket.device_schema.rigetti import RigettiDeviceCapabilities
-
 
 RIGETTI_ARN = "arn:aws:braket:::device/qpu/rigetti/Aspen-10"
 RIGETTI_ASPEN_ARN = "arn:aws:braket:::device/qpu/rigetti/Aspen-M-3"

tests/providers/test_adapter.py

@@ -3,39 +3,29 @@
 from unittest import TestCase
 from unittest.mock import Mock, patch
 
+import numpy as np
+import pytest
 from braket.circuits import Circuit, FreeParameter, Gate, Instruction, observables
 from braket.circuits.angled_gate import AngledGate, TripleAngledGate
 from braket.devices import LocalSimulator
-
-import numpy as np
-import pytest
-
-from qiskit import (
-    QuantumCircuit,
-    QuantumRegister,
-    ClassicalRegister,
-    transpile,
-)
+from qiskit import ClassicalRegister, QuantumCircuit, QuantumRegister, transpile
 from qiskit.circuit import Parameter
 from qiskit.circuit.library import PauliEvolutionGate
+from qiskit.circuit.library import standard_gates as qiskit_gates
 from qiskit.providers.basicaer import BasicAer
 from qiskit.quantum_info import SparsePauliOp
-
-from qiskit.circuit.library import standard_gates as qiskit_gates
-
 from qiskit_ionq import ionq_gates
 
 from qiskit_braket_provider.providers.adapter import (
-    to_qiskit,
-    to_braket,
-    convert_qiskit_to_braket_circuit,
-    convert_qiskit_to_braket_circuits,
     _GATE_NAME_TO_BRAKET_GATE,
     _GATE_NAME_TO_QISKIT_GATE,
     _get_controlled_gateset,
+    convert_qiskit_to_braket_circuit,
+    convert_qiskit_to_braket_circuits,
+    to_braket,
+    to_qiskit,
 )
 from qiskit_braket_provider.providers.braket_backend import BraketLocalBackend
-
 from tests.providers.test_braket_backend import combine_dicts
 
 _EPS = 1e-10  # global variable used to chop very small numbers to zero

tests/providers/test_braket_backend.py

@@ -8,21 +8,17 @@
 from botocore import errorfactory
 from braket.aws.queue_information import QueueDepthInfo, QueueType
 from qiskit import QuantumCircuit, transpile
-
 from qiskit.algorithms.minimum_eigensolvers import VQE, VQEResult
-
-from qiskit.algorithms.optimizers import (
-    SLSQP,
-)
+from qiskit.algorithms.optimizers import SLSQP
 from qiskit.circuit.library import TwoLocal
 from qiskit.circuit.random import random_circuit
+from qiskit.primitives import BackendEstimator
 from qiskit.providers.basicaer import BasicAer
 from qiskit.quantum_info import SparsePauliOp
 from qiskit.result import Result
 from qiskit.transpiler import Target
-from qiskit.primitives import BackendEstimator
 
-from qiskit_braket_provider import AWSBraketProvider, version, exception
+from qiskit_braket_provider import AWSBraketProvider, exception, version
 from qiskit_braket_provider.providers import AWSBraketBackend, BraketLocalBackend
 from qiskit_braket_provider.providers.adapter import aws_device_to_target
 from tests.providers.mocks import (

tests/providers/test_braket_job.py

@@ -9,8 +9,8 @@
 
 from qiskit_braket_provider.providers import (
     AmazonBraketTask,
-    BraketLocalBackend,
     AWSBraketJob,
+    BraketLocalBackend,
 )
 from tests.providers.mocks import MOCK_LOCAL_QUANTUM_TASK
 

tests/providers/test_braket_provider.py

@@ -1,20 +1,20 @@
 """Tests for AWS Braket provider."""
 
+import uuid
 from unittest import TestCase
 from unittest.mock import Mock, patch
-import uuid
 
+from braket.aws import AwsDevice, AwsDeviceType, AwsQuantumTaskBatch, AwsSession
 from braket.aws.queue_information import QuantumTaskQueueInfo, QueueType
 from braket.circuits import Circuit
-from braket.aws import AwsSession, AwsQuantumTaskBatch
-from braket.aws import AwsDevice, AwsDeviceType
-from qiskit import circuit as qiskit_circuit, QuantumCircuit
+from qiskit import QuantumCircuit
+from qiskit import circuit as qiskit_circuit
 from qiskit.compiler import transpile
 
 from qiskit_braket_provider.providers import AWSBraketProvider
 from qiskit_braket_provider.providers.braket_backend import (
-    BraketBackend,
     AWSBraketBackend,
+    BraketBackend,
 )
 from tests.providers.mocks import (
     MOCK_GATE_MODEL_SIMULATOR_SV,

tox.ini

@@ -19,6 +19,7 @@ commands =
 [testenv:lint]
 envdir = .tox/lint
 commands =
+  isort . -c {posargs}
   black --check {posargs} .
   pylint -rn qiskit_braket_provider tests
   nbqa pylint docs/ --disable=pointless-statement,missing-module-docstring,invalid-name,expression-not-assigned,duplicate-code,import-error
@@ -28,6 +29,11 @@ commands =
 envdir = .tox/lint
 commands = black {posargs} .
 
+[testenv:isort]
+envdir = .tox/lint
+commands =
+  isort . {posargs}
+
 [testenv:coverage]
 basepython = python3
 setenv =