Merge branch 'main' of https://github.com/Qiskit/qiskit-terra into is…

…sue1160text

constraints.txt

@@ -3,3 +3,4 @@ numpy>=1.20.0 ; python_version>'3.6'
 decorator==4.4.2
 jax==0.2.13
 jaxlib==0.1.67
+networkx==2.5

qiskit/algorithms/optimizers/__init__.py

@@ -59,6 +59,7 @@
    SPSA
    QNSPSA
    TNC
+   SciPyOptimizer
 
 Qiskit also provides the following optimizers, which are built-out using the optimizers from
 the `scikit-quant` package. The `scikit-quant` package is not installed by default but must be

qiskit/circuit/instruction.py

@@ -84,7 +84,7 @@ def __init__(self, name, num_qubits, num_clbits, params, duration=None, unit="dt
         # NOTE: The conditional statement checking if the `_label` attribute is
         #       already set is a temporary work around that can be removed after
         #       the next stable qiskit-aer release
-        if label is not None or not hasattr(self, "_label"):
+        if not hasattr(self, "_label"):
             self._label = label
         # tuple (ClassicalRegister, int), tuple (Clbit, bool) or tuple (Clbit, int)
         # when the instruction has a conditional ("if")

qiskit/circuit/library/blueprintcircuit.py

@@ -115,10 +115,10 @@ def append(self, instruction, qargs=None, cargs=None):
             self._build()
         return super().append(instruction, qargs, cargs)
 
-    def compose(self, other, qubits=None, clbits=None, front=False, inplace=False):
+    def compose(self, other, qubits=None, clbits=None, front=False, inplace=False, wrap=False):
         if self._data is None:
             self._build()
-        return super().compose(other, qubits, clbits, front, inplace)
+        return super().compose(other, qubits, clbits, front, inplace, wrap)
 
     def inverse(self):
         if self._data is None:

qiskit/circuit/library/grover_operator.py

@@ -15,6 +15,7 @@
 from typing import List, Optional, Union
 import numpy
 from qiskit.circuit import QuantumCircuit, QuantumRegister, AncillaRegister
+from qiskit.exceptions import QiskitError
 from qiskit.quantum_info import Statevector, Operator, DensityMatrix
 from .standard_gates import MCXGate
 
@@ -274,10 +275,10 @@ def _build(self):
         circuit.global_phase = numpy.pi
 
         self.add_register(*circuit.qregs)
-        if self._insert_barriers:
-            circuit_wrapped = circuit.to_instruction()
-        else:
+        try:
             circuit_wrapped = circuit.to_gate()
+        except QiskitError:
+            circuit_wrapped = circuit.to_instruction()
 
         self.compose(circuit_wrapped, qubits=self.qubits, inplace=True)
 

qiskit/circuit/library/n_local/n_local.py

@@ -22,6 +22,7 @@
 from qiskit.circuit import Instruction, Parameter, ParameterVector, ParameterExpression
 from qiskit.circuit.parametertable import ParameterTable
 from qiskit.exceptions import QiskitError
+from qiskit.utils.deprecation import deprecate_arguments
 
 from ..blueprintcircuit import BlueprintCircuit
 
@@ -793,10 +794,12 @@ def add_layer(
 
         return self
 
+    @deprecate_arguments({"param_dict": "parameters"})
     def assign_parameters(
         self,
         parameters: Union[dict, List[float], List[Parameter], ParameterVector],
         inplace: bool = False,
+        param_dict: Optional[dict] = None,
     ) -> Optional[QuantumCircuit]:
         """Assign parameters to the n-local circuit.
 

qiskit/circuit/library/probability_distributions/lognormal.py

@@ -16,6 +16,7 @@
 import warnings
 import numpy as np
 from qiskit.circuit import QuantumCircuit
+from qiskit.exceptions import QiskitError
 from .normal import _check_bounds_valid, _check_dimensions_match
 
 
@@ -178,7 +179,13 @@ def __init__(
             circuit.compose(distribution, inplace=True)
 
         super().__init__(*circuit.qregs, name=name)
-        self.compose(circuit.to_instruction(), qubits=self.qubits, inplace=True)
+
+        try:
+            instr = circuit.to_gate()
+        except QiskitError:
+            instr = circuit.to_instruction()
+
+        self.compose(instr, qubits=self.qubits, inplace=True)
 
     @property
     def values(self) -> np.ndarray:

qiskit/circuit/library/probability_distributions/normal.py

@@ -16,6 +16,7 @@
 import warnings
 import numpy as np
 from qiskit.circuit import QuantumCircuit
+from qiskit.exceptions import QiskitError
 
 
 class NormalDistribution(QuantumCircuit):
@@ -216,7 +217,13 @@ def __init__(
             circuit.compose(distribution, inplace=True)
 
         super().__init__(*circuit.qregs, name=name)
-        self.compose(circuit.to_instruction(), qubits=self.qubits, inplace=True)
+
+        try:
+            instr = circuit.to_gate()
+        except QiskitError:
+            instr = circuit.to_instruction()
+
+        self.compose(instr, qubits=self.qubits, inplace=True)
 
     @property
     def values(self) -> np.ndarray: