Moved test imports to last block of imports

Author: tnemoz

qiskit_algorithms/amplitude_estimators/iae.py

@@ -269,9 +269,7 @@ def _good_state_probability(
 
         return int(one_counts), one_counts / sum(counts_dict.values())
 
-    def estimate(
-        self, estimation_problem: EstimationProblem
-    ) -> IterativeAmplitudeEstimationResult:
+    def estimate(self, estimation_problem: EstimationProblem) -> IterativeAmplitudeEstimationResult:
         """Run the amplitude estimation algorithm on provided estimation problem.
 
         Args:

qiskit_algorithms/amplitude_estimators/mlae.py

@@ -13,15 +13,13 @@
 """The Maximum Likelihood Amplitude Estimation algorithm."""
 
 from __future__ import annotations
-from collections.abc import Sequence
+from collections.abc import Callable, Sequence
 from typing import cast, Any
-from collections.abc import Callable
 import warnings
 
 import numpy as np
 from scipy.optimize import brute
 from scipy.stats import norm, chi2
-
 from qiskit import ClassicalRegister, QuantumRegister, QuantumCircuit
 from qiskit.primitives import BaseSamplerV2, StatevectorSampler
 
@@ -30,6 +28,7 @@
 from ..custom_types import Transpiler
 from ..exceptions import AlgorithmError
 
+
 MINIMIZER = Callable[[Callable[[float], float], list[tuple[float, float]]], float]
 
 

qiskit_algorithms/eigensolvers/numpy_eigensolver.py

@@ -14,9 +14,8 @@
 
 from __future__ import annotations
 
-from collections.abc import Iterable
+from collections.abc import Callable, Iterable
 from typing import cast
-from collections.abc import Callable
 import logging
 import numpy as np
 from scipy import sparse as scisparse

qiskit_algorithms/gradients/finite_diff/finite_diff_sampler_gradient.py

@@ -15,8 +15,8 @@
 from __future__ import annotations
 
 from collections import defaultdict
-from typing import Literal, Any
 from collections.abc import Sequence
+from typing import Literal, Any
 
 import numpy as np
 

qiskit_algorithms/minimum_eigensolvers/adapt_vqe.py

@@ -16,9 +16,8 @@
 import logging
 import re
 import warnings
-from collections.abc import Sequence
+from collections.abc import Iterable, Sequence
 from enum import Enum
-from collections.abc import Iterable
 
 import numpy as np
 from qiskit import QuantumCircuit

qiskit_algorithms/minimum_eigensolvers/vqe.py

@@ -17,20 +17,17 @@
 import logging
 import warnings
 from time import time
-from collections.abc import Callable
+from collections.abc import Callable, Iterable
 from typing import Any
-from collections.abc import Iterable
 
 import numpy as np
-
 from qiskit.circuit import QuantumCircuit
 from qiskit.primitives import BaseEstimatorV2
 from qiskit.quantum_info import SparsePauliOp
 from qiskit.quantum_info.operators.base_operator import BaseOperator
 
 from qiskit_algorithms.gradients import BaseEstimatorGradient
 from ..custom_types import Transpiler
-
 from ..exceptions import AlgorithmError
 from ..custom_types import ListOrDict
 from ..optimizers import Optimizer, Minimizer, OptimizerResult
@@ -39,9 +36,10 @@
 from ..observables_evaluator import estimate_observables
 from ..utils import validate_initial_point, validate_bounds
 
-# private function as we expect this to be updated in the next released
+# private function as we expect this to be updated in the next release
 from ..utils.set_batching import _set_default_batchsize
 
+
 logger = logging.getLogger(__name__)
 
 

qiskit_algorithms/optimizers/gradient_descent.py

@@ -13,11 +13,11 @@
 """A standard gradient descent optimizer."""
 from __future__ import annotations
 
-from collections.abc import Generator
+from collections.abc import Callable, Generator
 from dataclasses import dataclass, field
 from typing import Any, SupportsFloat
-from collections.abc import Callable
 import numpy as np
+
 from .optimizer import Optimizer, OptimizerSupportLevel, OptimizerResult, POINT
 from .steppable_optimizer import AskData, TellData, OptimizerState, SteppableOptimizer
 from .optimizer_utils import LearningRate

qiskit_algorithms/optimizers/qnspsa.py

@@ -14,16 +14,14 @@
 
 from __future__ import annotations
 
-from collections.abc import Iterator
+from collections.abc import Callable, Iterator
 from typing import Any
-from collections.abc import Callable
 
 import numpy as np
 from qiskit.circuit import QuantumCircuit
-
 from qiskit.primitives import BaseSamplerV2
-from qiskit_algorithms.state_fidelities import ComputeUncompute
 
+from qiskit_algorithms.state_fidelities import ComputeUncompute
 from .spsa import SPSA, CALLBACK, TERMINATIONCHECKER, _batch_evaluate
 from ..custom_types import Transpiler
 

qiskit_algorithms/optimizers/spsa.py

@@ -17,9 +17,8 @@
 from __future__ import annotations
 
 from collections import deque
-from collections.abc import Iterator
+from collections.abc import Callable, Iterator
 from typing import Any, SupportsFloat
-from collections.abc import Callable
 import logging
 import warnings
 from time import time

qiskit_algorithms/state_fidelities/base_state_fidelity.py

@@ -15,9 +15,8 @@
 
 from __future__ import annotations
 from abc import ABC, abstractmethod
-from collections.abc import MutableMapping
+from collections.abc import MutableMapping, Sequence
 from typing import cast, Any
-from collections.abc import Sequence
 import numpy as np
 
 from qiskit import QuantumCircuit