Fix conflict

Author: ElePT

.github/CODEOWNERS

@@ -33,7 +33,7 @@ pulse/                @Qiskit/terra-core @eggerdj @wshanks
 synthesis/            @Qiskit/terra-core @alexanderivrii @ShellyGarion
 scheduler/            @Qiskit/terra-core @eggerdj @wshanks
 visualization/        @Qiskit/terra-core @nonhermitian
-primitives/           @Qiskit/terra-core @ikkoham @t-imamichi
+primitives/           @Qiskit/terra-core @Qiskit/qiskit-primitives
 # Override the release notes directories to have _no_ code owners, so any review
 # from somebody with write access is acceptable.
 /releasenotes/notes

Cargo.lock

@@ -2,7 +2,7 @@
 members = ["crates/*"]
 
 [workspace.package]
-version = "0.45.1"
+version = "0.45.2"
 edition = "2021"
 rust-version = "1.64"  # Keep in sync with README.md and rust-toolchain.toml.
 license = "Apache-2.0"

Cargo.toml

@@ -18,7 +18,7 @@
     "dvcs": "git",
     "environment_type": "virtualenv",
     "show_commit_url": "http://github.com/Qiskit/qiskit-terra/commit/",
-    "pythons": ["3.8", "3.9", "3.10", "3.11"],
+    "pythons": ["3.8", "3.9", "3.10", "3.11", "3.12"],
     "benchmark_dir": "test/benchmarks",
     "env_dir": ".asv/env",
     "results_dir": ".asv/results"

asv.conf.json

@@ -1,6 +1,6 @@
-.. _qiskit-transpiler-synthesis-aqc:
+.. _qiskit-synthesis-unitary-aqc:
 
-.. automodule:: qiskit.transpiler.synthesis.aqc
+.. automodule:: qiskit.synthesis.unitary.aqc
    :no-members:
    :no-inherited-members:
    :no-special-members:

docs/apidoc/synthesis_aqc.rst

@@ -26,7 +26,7 @@
 # The short X.Y version
 version = "0.45"
 # The full version, including alpha/beta/rc tags
-release = "0.45.1"
+release = "0.45.2"
 
 language = "en"
 
@@ -40,11 +40,13 @@
     "sphinx.ext.napoleon",
     "sphinx.ext.autodoc",
     "sphinx.ext.autosummary",
-    "sphinx.ext.mathjax",
     "sphinx.ext.intersphinx",
     "sphinx.ext.doctest",
+    # This is used by qiskit/documentation to generate links to github.com.
+    "sphinx.ext.viewcode",
     "matplotlib.sphinxext.plot_directive",
     "reno.sphinxext",
+    "sphinxcontrib.katex",
 ]
 
 templates_path = ["_templates"]
@@ -75,8 +77,8 @@
 # ----------------------------------------------------------------------------------
 
 intersphinx_mapping = {
-    "rustworkx": ("https://qiskit.org/ecosystem/rustworkx/", None),
-    "qiskit-ibm-runtime": ("https://qiskit.org/ecosystem/ibm-runtime/", None),
+    "rustworkx": ("https://www.rustworkx.org/", None),
+    "qiskit-ibm-runtime": ("https://docs.quantum.ibm.com/api/qiskit-ibm-runtime/", None),
     "qiskit-aer": ("https://qiskit.org/ecosystem/aer/", None),
     "numpy": ("https://numpy.org/doc/stable/", None),
     "matplotlib": ("https://matplotlib.org/stable/", None),

docs/conf.py

@@ -4,13 +4,13 @@
 Release Notes
 %%%%%%%%%%%%%
 
-This page contains the release notes for Qiskit, starting from the point at which the legacy
-"elements" structure was completely removed.
+This page contains the release notes for Qiskit, starting from Qiskit 0.45, the first time that Qiskit and Qiskit Terra had the same versions.
+
+..
+    These release notes get converted into Markdown files via the infrastructure at https://github.com/Qiskit/documentation, which then gets deployed to https://docs.quantum.ibm.com/api/qiskit/release-notes. Changes to these release notes will update those release notes the next time the API docs are generated.
+
+    To change release notes prior to Qiskit 0.45, update the Qiskit/documentation repository directly.
 
 .. release-notes::
    :earliest-version: 0.45.0
    :branch: stable/0.45
-
-.. release-notes::
-   :earliest-version: 0.25.0
-   :branch: stable/0.25

docs/release_notes.rst

@@ -1 +1 @@
-0.45.1
+0.45.2

qiskit/VERSION.txt

@@ -16,6 +16,7 @@
 import numpy as np
 from qiskit.circuit.exceptions import CircuitError
 from qiskit.circuit.instruction import Instruction
+from qiskit.circuit.gate import Gate
 from qiskit.circuit.parameterexpression import ParameterExpression
 
 
@@ -29,13 +30,12 @@ def __init__(self, duration, unit="dt"):
 
         super().__init__("delay", 1, 0, params=[duration], unit=unit)
 
+    broadcast_arguments = Gate.broadcast_arguments
+
     def inverse(self):
         """Special case. Return self."""
         return self
 
-    def broadcast_arguments(self, qargs, cargs):
-        yield [qarg for sublist in qargs for qarg in sublist], []
-
     def c_if(self, classical, val):
         raise CircuitError("Conditional Delay is not yet implemented.")
 

qiskit/circuit/delay.py

@@ -175,6 +175,16 @@ def num_connected_components(self, unitary_only=False):
             self._build()
         return super().num_connected_components(unitary_only=unitary_only)
 
+    def copy_empty_like(self, name=None):
+        if not self._is_built:
+            self._build()
+        cpy = super().copy_empty_like(name=name)
+        # The base `copy_empty_like` will typically trigger code that `BlueprintCircuit` treats as
+        # an "invalidation", so we have to manually restore properties deleted by that that
+        # `copy_empty_like` is supposed to propagate.
+        cpy.global_phase = self.global_phase
+        return cpy
+
     def copy(self, name=None):
         if not self._is_built:
             self._build()

qiskit/circuit/library/blueprintcircuit.py

@@ -419,7 +419,7 @@ def prepare_state(self, state, qubits=None, label=None, normalize=False):
     r"""Prepare qubits in a specific state.
 
     This class implements a state preparing unitary. Unlike
-    :class:`qiskit.extensions.Initialize` it does not reset the qubits first.
+    :class:`~qiskit.circuit.library.Initialize` it does not reset the qubits first.
 
     Args:
         state (str or list or int or Statevector):

qiskit/circuit/library/data_preparation/state_preparation.py

@@ -18,7 +18,7 @@
 
 
 class ZZFeatureMap(PauliFeatureMap):
-    """Second-order Pauli-Z evolution circuit.
+    r"""Second-order Pauli-Z evolution circuit.
 
     For 3 qubits and 1 repetition and linear entanglement the circuit is represented by:
 
@@ -32,8 +32,8 @@ class ZZFeatureMap(PauliFeatureMap):
         ┤ H ├┤ U1(2.0*φ(x[2])) ├──────────────────────────────────┤ X ├┤ U1(2.0*φ(x[1],x[2])) ├┤ X ├
         └───┘└─────────────────┘                                  └───┘└──────────────────────┘└───┘
 
-    where ``φ`` is a classical non-linear function, which defaults to ``φ(x) = x`` if and
-    ``φ(x,y) = (pi - x)(pi - y)``.
+    where :math:`\varphi` is a classical non-linear function, which defaults to :math:`\varphi(x) = x`
+    if and :math:`\varphi(x,y) = (\pi - x)(\pi - y)`.
 
     Examples:
 

qiskit/circuit/library/data_preparation/zz_feature_map.py

@@ -19,6 +19,9 @@
 from qiskit.synthesis.linear import check_invertible_binary_matrix
 from qiskit.circuit.library.generalized_gates.permutation import PermutationGate
 
+# pylint: disable=cyclic-import
+from qiskit.quantum_info import Clifford
+
 
 class LinearFunction(Gate):
     r"""A linear reversible circuit on n qubits.
@@ -27,7 +30,7 @@ class LinearFunction(Gate):
     as a n x n matrix of 0s and 1s in numpy array format.
 
     A linear function can be synthesized into CX and SWAP gates using the Patel–Markov–Hayes
-    algorithm, as implemented in :func:`~qiskit.transpiler.synthesis.cnot_synth`
+    algorithm, as implemented in :func:`~qiskit.synthesis.synth_cnot_count_full_pmh`
     based on reference [1].
 
     For efficiency, the internal n x n matrix is stored in the format expected
@@ -62,16 +65,23 @@ class LinearFunction(Gate):
     `Online at umich.edu. <https://web.eecs.umich.edu/~imarkov/pubs/jour/qic08-cnot.pdf>`_
     """
 
-    def __init__(self, linear, validate_input=False):
+    def __init__(
+        self,
+        linear: list[list]
+        | np.ndarray[bool]
+        | QuantumCircuit
+        | LinearFunction
+        | PermutationGate
+        | Clifford,
+        validate_input: bool = False,
+    ) -> None:
         """Create a new linear function.
 
         Args:
-            linear (list[list] or ndarray[bool] or QuantumCircuit or LinearFunction
-                or PermutationGate or Clifford): data from which a linear function
-                can be constructed. It can be either a nxn matrix (describing the
-                linear transformation), a permutation (which is a special case of
-                a linear function), another linear function, a clifford (when it
-                corresponds to a linear function), or a quantum circuit composed of
+            linear: data from which a linear function can be constructed. It can be either a
+                nxn matrix (describing the linear transformation), a permutation (which is a
+                special case of a linear function), another linear function, a clifford (when
+                it corresponds to a linear function), or a quantum circuit composed of
                 linear gates (CX and SWAP) and other objects described above, including
                 nested subcircuits.
 
@@ -86,9 +96,6 @@ def __init__(self, linear, validate_input=False):
                 not correspond to a linear function).
         """
 
-        # pylint: disable=cyclic-import
-        from qiskit.quantum_info import Clifford
-
         original_circuit = None
 
         if isinstance(linear, (list, np.ndarray)):

qiskit/circuit/library/generalized_gates/linear_function.py

@@ -36,14 +36,14 @@ class RVGate(Gate):
 
     .. math::
 
-        \newcommand{\th}{|\vec{v}|}
+        \newcommand{\rotationangle}{|\vec{v}|}
         \newcommand{\sinc}{\text{sinc}}
             R(\vec{v}) = e^{-i \vec{v}\cdot\vec{\sigma}} =
                 \begin{pmatrix}
-                    \cos\left(\th\right) -i v_z \sinc\left(\th\right)
-                    & -(i v_x + v_y) \sinc\left(\th\right) \\
-                    -(i v_x - v_y) \sinc\left(\th\right)
-                    & \cos\left(\th\right) + i v_z \sinc\left(\th\right)
+                    \cos\left(\rotationangle\right) -i v_z \sinc\left(\rotationangle\right)
+                    & -(i v_x + v_y) \sinc\left(\rotationangle\right) \\
+                    -(i v_x - v_y) \sinc\left(\rotationangle\right)
+                    & \cos\left(\rotationangle\right) + i v_z \sinc\left(\rotationangle\right)
                 \end{pmatrix}
     """
 
@@ -55,10 +55,10 @@ def __init__(self, v_x, v_y, v_z, basis="U"):
             v_y (float): y-component
             v_z (float): z-component
             basis (str, optional): basis (see
-                :class:`~qiskit.quantum_info.synthesis.one_qubit_decompose.OneQubitEulerDecomposer`)
+                :class:`~qiskit.synthesis.one_qubit.one_qubit_decompose.OneQubitEulerDecomposer`)
         """
         # pylint: disable=cyclic-import
-        from qiskit.quantum_info.synthesis.one_qubit_decompose import OneQubitEulerDecomposer
+        from qiskit.synthesis.one_qubit.one_qubit_decompose import OneQubitEulerDecomposer
 
         super().__init__("rv", 1, [v_x, v_y, v_z])
         self._decomposer = OneQubitEulerDecomposer(basis=basis)

qiskit/circuit/library/generalized_gates/rv.py

@@ -35,7 +35,7 @@
 from qiskit.exceptions import QiskitError
 
 # pylint: disable=cyclic-import
-from qiskit.quantum_info.synthesis.one_qubit_decompose import OneQubitEulerDecomposer
+from qiskit.synthesis.one_qubit.one_qubit_decompose import OneQubitEulerDecomposer
 
 from .diagonal import Diagonal
 

qiskit/circuit/library/generalized_gates/uc.py

@@ -28,8 +28,8 @@
 from qiskit.quantum_info.operators.predicates import is_unitary_matrix
 
 # pylint: disable=cyclic-import
-from qiskit.quantum_info.synthesis.one_qubit_decompose import OneQubitEulerDecomposer
-from qiskit.quantum_info.synthesis.two_qubit_decompose import two_qubit_cnot_decompose
+from qiskit.synthesis.one_qubit.one_qubit_decompose import OneQubitEulerDecomposer
+from qiskit.synthesis.two_qubit.two_qubit_decompose import two_qubit_cnot_decompose
 
 from .isometry import Isometry
 
@@ -148,7 +148,7 @@ def _define(self):
         elif self.num_qubits == 2:
             self.definition = two_qubit_cnot_decompose(self.to_matrix())
         else:
-            from qiskit.quantum_info.synthesis.qsd import (  # pylint: disable=cyclic-import
+            from qiskit.synthesis.unitary.qsd import (  # pylint: disable=cyclic-import
                 qs_decomposition,
             )
 

qiskit/circuit/library/generalized_gates/unitary.py

@@ -30,12 +30,12 @@ class ExcitationPreserving(TwoLocal):
 
     .. math::
 
-        \newcommand{\th}{\theta/2}
+        \newcommand{\rotationangle}{\theta/2}
 
         \begin{pmatrix}
         1 & 0 & 0 & 0 \\
-        0 & \cos\left(\th\right) & -i\sin\left(\th\right) & 0 \\
-        0 & -i\sin\left(\th\right) & \cos\left(\th\right) & 0 \\
+        0 & \cos\left(\rotationangle\right) & -i\sin\left(\rotationangle\right) & 0 \\
+        0 & -i\sin\left(\rotationangle\right) & \cos\left(\rotationangle\right) & 0 \\
         0 & 0 & 0 & e^{-i\phi}
         \end{pmatrix}
 
@@ -116,9 +116,6 @@ def __init__(
                 See the Examples section of :class:`~qiskit.circuit.library.TwoLocal` for more
                 detail.
             initial_state: A `QuantumCircuit` object to prepend to the circuit.
-            skip_unentangled_qubits: If True, the single qubit gates are only applied to qubits
-                that are entangled with another qubit. If False, the single qubit gates are applied
-                to each qubit in the Ansatz. Defaults to False.
             skip_unentangled_qubits: If True, the single qubit gates are only applied to qubits
                 that are entangled with another qubit. If False, the single qubit gates are applied
                 to each qubit in the Ansatz. Defaults to False.

qiskit/circuit/library/n_local/excitation_preserving.py

@@ -75,6 +75,16 @@ def __init__(
         insert_barriers: bool = False,
         name: str = "PauliTwoDesign",
     ):
+        """
+        Args:
+            num_qubits: The number of qubits of the Pauli Two-Design circuit.
+            reps: Specifies how often a block consisting of a rotation layer and entanglement
+                layer is repeated.
+            seed: The seed for randomly choosing the axes of the Pauli rotations.
+            insert_barriers: If ``True``, barriers are inserted in between each layer. If ``False``,
+                no barriers are inserted. Defaults to ``False``.
+
+        """
         from qiskit.circuit.library import RYGate  # pylint: disable=cyclic-import
 
         # store a random number generator

qiskit/circuit/library/n_local/pauli_two_design.py

@@ -144,9 +144,6 @@ def __init__(
                 See the Examples section of :class:`~qiskit.circuit.library.TwoLocal` for more
                 detail.
             initial_state: A `QuantumCircuit` object to prepend to the circuit.
-            skip_unentangled_qubits: If True, the single qubit gates are only applied to qubits
-                that are entangled with another qubit. If False, the single qubit gates are applied
-                to each qubit in the Ansatz. Defaults to False.
             skip_unentangled_qubits: If True, the single qubit gates are only applied to qubits
                 that are entangled with another qubit. If False, the single qubit gates are applied
                 to each qubit in the Ansatz. Defaults to False.

qiskit/circuit/library/n_local/real_amplitudes.py

@@ -19,7 +19,7 @@
 
 from qiskit.circuit.gate import Gate
 from qiskit.circuit.parameterexpression import ParameterExpression
-from qiskit.synthesis import EvolutionSynthesis, LieTrotter
+from qiskit.synthesis.evolution import EvolutionSynthesis, LieTrotter
 from qiskit.quantum_info import Pauli, SparsePauliOp
 
 

qiskit/circuit/library/pauli_evolution.py

@@ -24,7 +24,7 @@ class PhaseEstimation(QuantumCircuit):
 
     In the Quantum Phase Estimation (QPE) algorithm [1, 2, 3], the Phase Estimation circuit is used
     to estimate the phase :math:`\phi` of an eigenvalue :math:`e^{2\pi i\phi}` of a unitary operator
-    :math:`U`, provided with the corresponding eigenstate :math:`|psi\rangle`.
+    :math:`U`, provided with the corresponding eigenstate :math:`|\psi\rangle`.
     That is
 
     .. math::