Merge branch 'main' into fix-quantum-instance-backend-v2

Qiskit · Jan 27, 2022 · 3895703 · 3895703
2 parents afecf0a + 9c89b07
commit 3895703
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 833 deletions.
diff --git a/qiskit/circuit/library/__init__.py b/qiskit/circuit/library/__init__.py
@@ -235,18 +235,6 @@
    PauliEvolutionGate
 
 
-Probability distributions
-=========================
-
-.. autosummary::
-   :toctree: ../stubs/
-   :template: autosummary/class_no_inherited_members.rst
-
-   UniformDistribution
-   NormalDistribution
-   LogNormalDistribution
-
-
 N-local circuits
 ================
 
@@ -426,11 +414,6 @@
     QAOAAnsatz,
 )
 from .data_preparation import PauliFeatureMap, ZFeatureMap, ZZFeatureMap
-from .probability_distributions import (
-    LogNormalDistribution,
-    NormalDistribution,
-    UniformDistribution,
-)
 from .quantum_volume import QuantumVolume
 from .fourier_checking import FourierChecking
 from .graph_state import GraphState

diff --git a/qiskit/circuit/library/probability_distributions/__init__.py b/qiskit/circuit/library/probability_distributions/__init__.py
diff --git a/qiskit/circuit/library/probability_distributions/lognormal.py b/qiskit/circuit/library/probability_distributions/lognormal.py