From cd0a0c03879a36221b5f02313d97043695610cfc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Aug 2024 21:03:02 -0400
Subject: [PATCH 01/26] Bump mypy from 1.10.1 to 1.11.1 (#651)

Bumps [mypy](https://github.com/python/mypy) from 1.10.1 to 1.11.1.
- [Changelog](https://github.com/python/mypy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/python/mypy/compare/v1.10.1...v1.11.1)

---
updated-dependencies:
- dependency-name: mypy
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index fd8842796..bd327ae20 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -60,7 +60,7 @@ style = [
 lint = [
     "circuit-knitting-toolbox[style]",
     "pydocstyle==6.3.0",
-    "mypy==1.10.1",
+    "mypy==1.11.1",
     "reno>=3.4.0",
     "pylint==3.2.5",
     # pydocstyle prefers to parse our pyproject.toml, hence the following line

From f5cc6ae69e72a37e7fed307f307b22e70e368682 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Aug 2024 21:03:09 -0400
Subject: [PATCH 02/26] Bump ruff from 0.5.2 to 0.5.5 (#652)

Bumps [ruff](https://github.com/astral-sh/ruff) from 0.5.2 to 0.5.5.
- [Release notes](https://github.com/astral-sh/ruff/releases)
- [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md)
- [Commits](https://github.com/astral-sh/ruff/compare/0.5.2...0.5.5)

---
updated-dependencies:
- dependency-name: ruff
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index bd327ae20..3c1c3e88b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -54,7 +54,7 @@ nbtest = [
 style = [
     "autoflake==2.3.1",
     "black[jupyter]~=24.1",
-    "ruff==0.5.2",
+    "ruff==0.5.5",
     "nbqa>=1.6.0",
 ]
 lint = [

From 4ba5bef128b0c342dfaab17ab3ce929325e03353 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Aug 2024 21:03:19 -0400
Subject: [PATCH 03/26] Bump pylint from 3.2.5 to 3.2.6 (#650)

Bumps [pylint](https://github.com/pylint-dev/pylint) from 3.2.5 to 3.2.6.
- [Release notes](https://github.com/pylint-dev/pylint/releases)
- [Commits](https://github.com/pylint-dev/pylint/compare/v3.2.5...v3.2.6)

---
updated-dependencies:
- dependency-name: pylint
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 3c1c3e88b..6dd13d3c7 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -62,7 +62,7 @@ lint = [
     "pydocstyle==6.3.0",
     "mypy==1.11.1",
     "reno>=3.4.0",
-    "pylint==3.2.5",
+    "pylint==3.2.6",
     # pydocstyle prefers to parse our pyproject.toml, hence the following line
     "toml",
 ]

From a9bfc91b9855a78fd6b0dd9ffadcd03069808fc7 Mon Sep 17 00:00:00 2001
From: Jim Garrison <garrison@ibm.com>
Date: Fri, 2 Aug 2024 12:35:18 -0400
Subject: [PATCH 04/26] Use `BaseSamplerV1` with explicit version (#653)

This change is motivated by the following warning:

> DeprecationWarning: The class ``qiskit.primitives.base.base_sampler.BaseSampler``
> is deprecated as of qiskit 1.2. It will be removed no earlier
> than 3 months after the release date. The `BaseSampler` class is
> a type alias for the `BaseSamplerV1` interface that has been
> deprecated in favor of explicitly versioned interface classes.
> It is recommended to migrate all implementations to use
> `BaseSamplerV2`. However, for implementations incompatible with
> `BaseSamplerV2`, `BaseSampler` can be replaced with the explicitly
> versioned `BaseSamplerV1` class.

Related to #551 and #506.
---
 circuit_knitting/utils/simulation.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/circuit_knitting/utils/simulation.py b/circuit_knitting/utils/simulation.py
index d1946afba..c66b472a3 100644
--- a/circuit_knitting/utils/simulation.py
+++ b/circuit_knitting/utils/simulation.py
@@ -29,7 +29,7 @@
 import numpy as np
 from qiskit.circuit import QuantumCircuit
 from qiskit.quantum_info import Statevector, Operator
-from qiskit.primitives.base import BaseSampler, SamplerResult
+from qiskit.primitives.base import BaseSamplerV1, SamplerResult
 from qiskit.primitives.primitive_job import PrimitiveJob
 from qiskit.result import QuasiDistribution
 
@@ -128,7 +128,7 @@ def simulate_statevector_outcomes(qc: QuantumCircuit, /) -> dict[int, float]:
     return {outcome: sum(prob for prob, _ in svs) for outcome, svs in current.items()}
 
 
-class ExactSampler(BaseSampler):
+class ExactSampler(BaseSamplerV1):
     """Sampler which returns exact probabilities for each possible outcome.
 
     This sampler supports:

From 812341aeccc1ec704449eb70c6e83f38430a9a99 Mon Sep 17 00:00:00 2001
From: Ibrahim Shehzad <75153717+ibrahim-shehzad@users.noreply.github.com>
Date: Tue, 20 Aug 2024 09:48:00 -0400
Subject: [PATCH 05/26] Edit cutting explanation (#657)

* edit cutting explanation

* edit cutting explanation

* adding missing parenthesis

* add remaining parenthesis
---
 docs/circuit_cutting/explanation/index.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/circuit_cutting/explanation/index.rst b/docs/circuit_cutting/explanation/index.rst
index 2769e3c3e..427ed1797 100644
--- a/docs/circuit_cutting/explanation/index.rst
+++ b/docs/circuit_cutting/explanation/index.rst
@@ -60,10 +60,10 @@ As a basic and explicit example, let us consider the decomposition of a cut :cla
 
 As shown in [`2 <https://arxiv.org/abs/1909.07534>`__], a quantum circuit which implements an :class:`~qiskit.circuit.library.RZZGate` can be simulated by performing six subexperiments where the :class:`~qiskit.circuit.library.RZZGate` in the original circuit has been replaced with only local (single-qubit) operations [the :math:`\mathcal{F}_i`\ 's in Eq. :eq:`eq:qpd`].  The result is then reconstructed by combining the subexperiment results with certain coefficients [the :math:`a_i`\ 's in Eq. :eq:`eq:qpd`], which can be either positive or negative.  Given the :math:`\theta` parameter of the :class:`~qiskit.circuit.library.RZZGate`, the six subexperiments are as follows:
 
-1. With coefficient :math:`a_1 = \cos^2 \theta`, do nothing (:math:`I \otimes I`, where :math:`I` is the identity operation on a single qubit).
-2. With coefficient :math:`a_2 = \sin^2 \theta`, perform a :class:`~qiskit.circuit.library.ZGate` on each qubit (:math:`Z \otimes Z`).
-3. With coefficient :math:`a_3 = \sin(2\theta)/2`, perform a projective measurement in the Z basis on the first qubit and an :class:`~qiskit.circuit.library.SGate` gate on the second qubit (denote this as :math:`M_z \otimes S`).  If the result of the measurement is 1, flip the sign of that outcome's contribution during reconstruction.
-4. With coefficient :math:`a_4 = -\sin(2\theta)/2`, perform a projective measurement in the Z basis on the first qubit and an :class:`~qiskit.circuit.library.SdgGate` gate on the second qubit (denote this as :math:`M_z \otimes S^\dagger`).  If the result of the measurement is 1, flip the sign of that outcome's contribution during reconstruction.
+1. With coefficient :math:`a_1 = \cos^2 (\theta/2)`, do nothing (:math:`I \otimes I`, where :math:`I` is the identity operation on a single qubit).
+2. With coefficient :math:`a_2 = \sin^2 (\theta/2)`, perform a :class:`~qiskit.circuit.library.ZGate` on each qubit (:math:`Z \otimes Z`).
+3. With coefficient :math:`a_3 = -\sin(\theta)/2`, perform a projective measurement in the Z basis on the first qubit and an :class:`~qiskit.circuit.library.SGate` gate on the second qubit (denote this as :math:`M_z \otimes S`).  If the result of the measurement is 1, flip the sign of that outcome's contribution during reconstruction.
+4. With coefficient :math:`a_4 = \sin(\theta)/2`, perform a projective measurement in the Z basis on the first qubit and an :class:`~qiskit.circuit.library.SdgGate` gate on the second qubit (denote this as :math:`M_z \otimes S^\dagger`).  If the result of the measurement is 1, flip the sign of that outcome's contribution during reconstruction.
 5. Same as term 3 (:math:`a_5 = a_3`), but swap the qubits (:math:`S \otimes M_z`).
 6. Same as term 4 (:math:`a_6 = a_4`), but swap the qubits (:math:`S^\dagger \otimes M_z`).
 

From ce3ac0064b8dab2211228ec63caa595f38439144 Mon Sep 17 00:00:00 2001
From: Jim Garrison <garrison@ibm.com>
Date: Tue, 20 Aug 2024 16:12:30 -0400
Subject: [PATCH 06/26] Make copyright headers consistent with respect to
 Qiskit (#646)

---
 circuit_knitting/cutting/instructions/cut_wire.py        | 2 +-
 circuit_knitting/cutting/instructions/move.py            | 2 +-
 circuit_knitting/cutting/qpd/instructions/qpd_gate.py    | 2 +-
 circuit_knitting/cutting/qpd/instructions/qpd_measure.py | 2 +-
 circuit_knitting/cutting/wire_cutting_transforms.py      | 2 +-
 docs/conf.py                                             | 2 +-
 test/cutting/test_wire_cutting_transforms.py             | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/circuit_knitting/cutting/instructions/cut_wire.py b/circuit_knitting/cutting/instructions/cut_wire.py
index 5f509772b..fec48f0c9 100644
--- a/circuit_knitting/cutting/instructions/cut_wire.py
+++ b/circuit_knitting/cutting/instructions/cut_wire.py
@@ -1,4 +1,4 @@
-# This code is part of Qiskit.
+# This code is a Qiskit project.
 #
 # (C) Copyright IBM 2023.
 #
diff --git a/circuit_knitting/cutting/instructions/move.py b/circuit_knitting/cutting/instructions/move.py
index 522c06242..ff1806fdc 100644
--- a/circuit_knitting/cutting/instructions/move.py
+++ b/circuit_knitting/cutting/instructions/move.py
@@ -1,4 +1,4 @@
-# This code is part of Qiskit.
+# This code is a Qiskit project.
 #
 # (C) Copyright IBM 2023.
 #
diff --git a/circuit_knitting/cutting/qpd/instructions/qpd_gate.py b/circuit_knitting/cutting/qpd/instructions/qpd_gate.py
index 913dc6a83..42f6a8330 100644
--- a/circuit_knitting/cutting/qpd/instructions/qpd_gate.py
+++ b/circuit_knitting/cutting/qpd/instructions/qpd_gate.py
@@ -1,4 +1,4 @@
-# This code is part of Qiskit.
+# This code is a Qiskit project.
 #
 # (C) Copyright IBM 2023.
 #
diff --git a/circuit_knitting/cutting/qpd/instructions/qpd_measure.py b/circuit_knitting/cutting/qpd/instructions/qpd_measure.py
index 20a4c8fd6..69dcb6460 100644
--- a/circuit_knitting/cutting/qpd/instructions/qpd_measure.py
+++ b/circuit_knitting/cutting/qpd/instructions/qpd_measure.py
@@ -1,4 +1,4 @@
-# This code is part of Qiskit.
+# This code is a Qiskit project.
 #
 # (C) Copyright IBM 2023.
 #
diff --git a/circuit_knitting/cutting/wire_cutting_transforms.py b/circuit_knitting/cutting/wire_cutting_transforms.py
index 22e094210..35688b362 100644
--- a/circuit_knitting/cutting/wire_cutting_transforms.py
+++ b/circuit_knitting/cutting/wire_cutting_transforms.py
@@ -1,4 +1,4 @@
-# This code is part of Qiskit.
+# This code is a Qiskit project.
 #
 # (C) Copyright IBM 2023.
 #
diff --git a/docs/conf.py b/docs/conf.py
index 4131fcacd..a7c9f7b97 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -1,4 +1,4 @@
-# This code is part of Qiskit.
+# This code is a Qiskit project.
 #
 # (C) Copyright IBM 2022.
 #
diff --git a/test/cutting/test_wire_cutting_transforms.py b/test/cutting/test_wire_cutting_transforms.py
index 2869dad8f..a6c5c0a40 100644
--- a/test/cutting/test_wire_cutting_transforms.py
+++ b/test/cutting/test_wire_cutting_transforms.py
@@ -1,4 +1,4 @@
-# This code is part of Qiskit.
+# This code is a Qiskit project.
 #
 # (C) Copyright IBM 2023.
 #

From ac08033683ffc117f223a49bf4aca0791ac044a8 Mon Sep 17 00:00:00 2001
From: Jim Garrison <garrison@ibm.com>
Date: Fri, 23 Aug 2024 15:47:42 -0400
Subject: [PATCH 07/26] Rename package to qiskit-addon-cutting (code only)
 (#661)

* Rename package to qiskit-addon-cutting (code only)

* Move tests out of `cutting` subdirectory
---
 circuit_knitting/__init__.py                  | 24 ----------------
 docs/apidocs/circuit_cutting.rst              | 10 -------
 docs/apidocs/index.rst                        | 25 +++++++++++++----
 docs/apidocs/utils.rst                        | 10 -------
 docs/circuit_cutting/explanation/index.rst    |  2 +-
 docs/circuit_cutting/how-tos/README.rst       |  2 +-
 ...erate_exact_quasi_dists_from_sampler.ipynb |  6 ++--
 ...generate_exact_sampling_coefficients.ipynb |  4 +--
 .../how-tos/how_to_specify_cut_wires.ipynb    |  6 ++--
 ...gate_cutting_to_reduce_circuit_width.ipynb |  6 ++--
 ...gate_cutting_to_reduce_circuit_depth.ipynb |  6 ++--
 ...03_wire_cutting_via_move_instruction.ipynb |  8 +++---
 .../tutorials/04_automatic_cut_finding.ipynb  |  8 +++---
 docs/conf.py                                  |  6 ++--
 pyproject.toml                                | 18 ++++++------
 .../__init__.py                               | 13 +++++++--
 .../automated_cut_finding.py                  |  0
 .../cut_finding/__init__.py                   |  0
 .../cut_finding/best_first_search.py          |  0
 .../cut_finding/cco_utils.py                  |  0
 .../cut_finding/circuit_interface.py          |  0
 .../cut_finding/cut_optimization.py           |  0
 .../cut_finding/cutting_actions.py            |  0
 .../cut_finding/disjoint_subcircuits_state.py |  0
 .../cut_finding/lo_cuts_optimizer.py          |  0
 .../cut_finding/optimization_settings.py      |  0
 .../cut_finding/search_space_generator.py     |  0
 .../cutting_decomposition.py                  |  4 +--
 .../cutting_experiments.py                    |  4 +--
 .../cutting_reconstruction.py                 |  4 +--
 .../instructions/__init__.py                  |  0
 .../instructions/cut_wire.py                  |  0
 .../instructions/move.py                      |  2 +-
 .../qpd/__init__.py                           |  0
 .../qpd/decompose.py                          |  0
 .../qpd/decompositions.py                     |  2 +-
 .../qpd/instructions/__init__.py              |  0
 .../qpd/instructions/qpd_gate.py              |  0
 .../qpd/instructions/qpd_measure.py           |  0
 .../qpd/qpd_basis.py                          |  0
 .../qpd/weights.py                            |  2 +-
 .../utils/__init__.py                         | 28 +++++++++----------
 .../utils/bitwise.py                          |  2 +-
 .../utils/iteration.py                        |  2 +-
 .../utils/observable_grouping.py              |  2 +-
 .../utils/simulation.py                       |  2 +-
 .../utils/transforms.py                       |  2 +-
 .../utils/transpiler_passes.py                |  2 +-
 .../wire_cutting_transforms.py                |  0
 test/{cutting => }/cut_finding/__init__.py    |  0
 .../cut_finding/test_best_first_search.py     | 14 +++++-----
 .../cut_finding/test_cco_utils.py             |  4 +--
 .../cut_finding/test_circuit_interfaces.py    |  4 +--
 .../cut_finding/test_cut_finder_results.py    | 14 +++++-----
 .../cut_finding/test_cutting_actions.py       |  8 +++---
 .../test_disjoint_subcircuits_state.py        |  6 ++--
 .../cut_finding/test_optimization_settings.py |  2 +-
 test/cutting/__init__.py                      | 10 -------
 test/{cutting => }/qpd/__init__.py            |  0
 .../qpd/instructions/test_qpd_gate.py         |  2 +-
 .../qpd/instructions/test_qpd_measure.py      |  2 +-
 test/{cutting => }/qpd/test_qpd.py            | 10 +++----
 test/{cutting => }/qpd/test_qpd_basis.py      |  2 +-
 .../test_cutting_decomposition.py             |  6 ++--
 .../{cutting => }/test_cutting_experiments.py | 12 ++++----
 .../test_cutting_reconstruction.py            |  6 ++--
 test/{cutting => }/test_cutting_roundtrip.py  |  6 ++--
 test/{cutting => }/test_cutting_workflows.py  |  8 +++---
 test/{cutting => }/test_find_cuts.py          |  3 +-
 .../test_wire_cutting_transforms.py           |  8 +++---
 test/utils/test_iteration.py                  |  2 +-
 test/utils/test_observable_grouping.py        |  2 +-
 test/utils/test_simulation.py                 |  2 +-
 test/utils/test_transforms.py                 |  8 +++---
 test/utils/test_transpiler_passes.py          |  5 +++-
 tox.ini                                       | 20 ++++++-------
 76 files changed, 174 insertions(+), 204 deletions(-)
 delete mode 100644 circuit_knitting/__init__.py
 delete mode 100644 docs/apidocs/circuit_cutting.rst
 delete mode 100644 docs/apidocs/utils.rst
 rename {circuit_knitting/cutting => qiskit_addon_cutting}/__init__.py (88%)
 rename {circuit_knitting/cutting => qiskit_addon_cutting}/automated_cut_finding.py (100%)
 rename {circuit_knitting/cutting => qiskit_addon_cutting}/cut_finding/__init__.py (100%)
 rename {circuit_knitting/cutting => qiskit_addon_cutting}/cut_finding/best_first_search.py (100%)
 rename {circuit_knitting/cutting => qiskit_addon_cutting}/cut_finding/cco_utils.py (100%)
 rename {circuit_knitting/cutting => qiskit_addon_cutting}/cut_finding/circuit_interface.py (100%)
 rename {circuit_knitting/cutting => qiskit_addon_cutting}/cut_finding/cut_optimization.py (100%)
 rename {circuit_knitting/cutting => qiskit_addon_cutting}/cut_finding/cutting_actions.py (100%)
 rename {circuit_knitting/cutting => qiskit_addon_cutting}/cut_finding/disjoint_subcircuits_state.py (100%)
 rename {circuit_knitting/cutting => qiskit_addon_cutting}/cut_finding/lo_cuts_optimizer.py (100%)
 rename {circuit_knitting/cutting => qiskit_addon_cutting}/cut_finding/optimization_settings.py (100%)
 rename {circuit_knitting/cutting => qiskit_addon_cutting}/cut_finding/search_space_generator.py (100%)
 rename {circuit_knitting/cutting => qiskit_addon_cutting}/cutting_decomposition.py (98%)
 rename {circuit_knitting/cutting => qiskit_addon_cutting}/cutting_experiments.py (99%)
 rename {circuit_knitting/cutting => qiskit_addon_cutting}/cutting_reconstruction.py (98%)
 rename {circuit_knitting/cutting => qiskit_addon_cutting}/instructions/__init__.py (100%)
 rename {circuit_knitting/cutting => qiskit_addon_cutting}/instructions/cut_wire.py (100%)
 rename {circuit_knitting/cutting => qiskit_addon_cutting}/instructions/move.py (97%)
 rename {circuit_knitting/cutting => qiskit_addon_cutting}/qpd/__init__.py (100%)
 rename {circuit_knitting/cutting => qiskit_addon_cutting}/qpd/decompose.py (100%)
 rename {circuit_knitting/cutting => qiskit_addon_cutting}/qpd/decompositions.py (99%)
 rename {circuit_knitting/cutting => qiskit_addon_cutting}/qpd/instructions/__init__.py (100%)
 rename {circuit_knitting/cutting => qiskit_addon_cutting}/qpd/instructions/qpd_gate.py (100%)
 rename {circuit_knitting/cutting => qiskit_addon_cutting}/qpd/instructions/qpd_measure.py (100%)
 rename {circuit_knitting/cutting => qiskit_addon_cutting}/qpd/qpd_basis.py (100%)
 rename {circuit_knitting/cutting => qiskit_addon_cutting}/qpd/weights.py (99%)
 rename {circuit_knitting => qiskit_addon_cutting}/utils/__init__.py (64%)
 rename {circuit_knitting => qiskit_addon_cutting}/utils/bitwise.py (94%)
 rename {circuit_knitting => qiskit_addon_cutting}/utils/iteration.py (97%)
 rename {circuit_knitting => qiskit_addon_cutting}/utils/observable_grouping.py (99%)
 rename {circuit_knitting => qiskit_addon_cutting}/utils/simulation.py (99%)
 rename {circuit_knitting => qiskit_addon_cutting}/utils/transforms.py (99%)
 rename {circuit_knitting => qiskit_addon_cutting}/utils/transpiler_passes.py (96%)
 rename {circuit_knitting/cutting => qiskit_addon_cutting}/wire_cutting_transforms.py (100%)
 rename test/{cutting => }/cut_finding/__init__.py (100%)
 rename test/{cutting => }/cut_finding/test_best_first_search.py (94%)
 rename test/{cutting => }/cut_finding/test_cco_utils.py (97%)
 rename test/{cutting => }/cut_finding/test_circuit_interfaces.py (98%)
 rename test/{cutting => }/cut_finding/test_cut_finder_results.py (97%)
 rename test/{cutting => }/cut_finding/test_cutting_actions.py (94%)
 rename test/{cutting => }/cut_finding/test_disjoint_subcircuits_state.py (97%)
 rename test/{cutting => }/cut_finding/test_optimization_settings.py (96%)
 delete mode 100644 test/cutting/__init__.py
 rename test/{cutting => }/qpd/__init__.py (100%)
 rename test/{cutting => }/qpd/instructions/test_qpd_gate.py (98%)
 rename test/{cutting => }/qpd/instructions/test_qpd_measure.py (92%)
 rename test/{cutting => }/qpd/test_qpd.py (98%)
 rename test/{cutting => }/qpd/test_qpd_basis.py (99%)
 rename test/{cutting => }/test_cutting_decomposition.py (98%)
 rename test/{cutting => }/test_cutting_experiments.py (97%)
 rename test/{cutting => }/test_cutting_reconstruction.py (97%)
 rename test/{cutting => }/test_cutting_roundtrip.py (97%)
 rename test/{cutting => }/test_cutting_workflows.py (96%)
 rename test/{cutting => }/test_find_cuts.py (98%)
 rename test/{cutting => }/test_wire_cutting_transforms.py (97%)

diff --git a/circuit_knitting/__init__.py b/circuit_knitting/__init__.py
deleted file mode 100644
index 45faabee1..000000000
--- a/circuit_knitting/__init__.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# This code is a Qiskit project.
-
-# (C) Copyright IBM 2022.
-
-# This code is licensed under the Apache License, Version 2.0. You may
-# obtain a copy of this license in the LICENSE.txt file in the root directory
-# of this source tree or at http://www.apache.org/licenses/LICENSE-2.0.
-# Any modifications or derivative works of this code must retain this
-# copyright notice, and modified files need to carry a notice indicating
-# that they have been altered from the originals.
-
-"""Main Circuit Knitting Toolbox public functionality."""
-
-from __future__ import annotations
-from importlib.metadata import version, PackageNotFoundError
-
-
-try:
-    __version__ = version("circuit-knitting-toolbox")
-except PackageNotFoundError:  # pragma: no cover
-    # Package is not installed
-    pass
-
-__all__: list[str] = []
diff --git a/docs/apidocs/circuit_cutting.rst b/docs/apidocs/circuit_cutting.rst
deleted file mode 100644
index 0df7cd13f..000000000
--- a/docs/apidocs/circuit_cutting.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-.. _circuit_cutting:
-
-###############
-Circuit Cutting
-###############
-
-.. automodule:: circuit_knitting.cutting
-   :no-members:
-   :no-inherited-members:
-   :no-special-members:
diff --git a/docs/apidocs/index.rst b/docs/apidocs/index.rst
index fb6e7ced6..0cc647d1c 100644
--- a/docs/apidocs/index.rst
+++ b/docs/apidocs/index.rst
@@ -1,13 +1,26 @@
-.. circuit_knitting:
+.. qiskit_addon_cutting:
 
-.. module:: circuit_knitting
+.. module:: qiskit_addon_cutting
 
 =======================================
 Circuit Knitting Toolbox API References
 =======================================
 
-.. toctree::
-   :maxdepth: 1
+###############
+Circuit Cutting
+###############
 
-   circuit_cutting
-   utils
+.. automodule:: qiskit_addon_cutting
+   :no-index:
+   :no-members:
+   :no-inherited-members:
+   :no-special-members:
+
+#########
+Utilities
+#########
+
+.. automodule:: qiskit_addon_cutting.utils
+   :no-members:
+   :no-inherited-members:
+   :no-special-members:
diff --git a/docs/apidocs/utils.rst b/docs/apidocs/utils.rst
deleted file mode 100644
index 4f3dc87a1..000000000
--- a/docs/apidocs/utils.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-.. _utils:
-
-#########
-Utilities
-#########
-
-.. automodule:: circuit_knitting.utils
-   :no-members:
-   :no-inherited-members:
-   :no-special-members:
diff --git a/docs/circuit_cutting/explanation/index.rst b/docs/circuit_cutting/explanation/index.rst
index 427ed1797..8f9e2208c 100644
--- a/docs/circuit_cutting/explanation/index.rst
+++ b/docs/circuit_cutting/explanation/index.rst
@@ -74,7 +74,7 @@ Equation :eq:`eq:qpd` for :class:`~qiskit.circuit.library.RZZGate` can thus be w
    import numpy as np
    import matplotlib.pyplot as plt
    from qiskit.circuit.library import RZZGate
-   from circuit_knitting.cutting.qpd import QPDBasis
+   from qiskit_addon_cutting.qpd import QPDBasis
 
    theta_values = np.linspace(0, np.pi, 101)
    bases = [QPDBasis.from_instruction(RZZGate(theta)) for theta in theta_values]
diff --git a/docs/circuit_cutting/how-tos/README.rst b/docs/circuit_cutting/how-tos/README.rst
index 3e56f9ebc..9cb7f9223 100644
--- a/docs/circuit_cutting/how-tos/README.rst
+++ b/docs/circuit_cutting/how-tos/README.rst
@@ -2,7 +2,7 @@ Circuit Cutting How-To Guides
 -----------------------------
 
 - `Generate exact quasi-distributions <how_to_generate_exact_quasi_dists_from_sampler.ipynb>`__:
-  Use the :class:`~circuit_knitting.utils.simulation.ExactSampler` interface to generate
+  Use the :class:`~qiskit_addon_cutting.utils.simulation.ExactSampler` interface to generate
   exact quasi-distributions for circuits containing mid-circuit measurements.
 - `Generate exact sampling coefficients <how_to_generate_exact_sampling_coefficients.ipynb>`__:
   Generate exact sampling coefficients and run all unique samples from the distribution.
diff --git a/docs/circuit_cutting/how-tos/how_to_generate_exact_quasi_dists_from_sampler.ipynb b/docs/circuit_cutting/how-tos/how_to_generate_exact_quasi_dists_from_sampler.ipynb
index 4e4ea5c5d..e83ca399d 100644
--- a/docs/circuit_cutting/how-tos/how_to_generate_exact_quasi_dists_from_sampler.ipynb
+++ b/docs/circuit_cutting/how-tos/how_to_generate_exact_quasi_dists_from_sampler.ipynb
@@ -20,7 +20,7 @@
     "from qiskit import QuantumCircuit\n",
     "from qiskit.quantum_info import SparsePauliOp\n",
     "\n",
-    "from circuit_knitting.cutting import (\n",
+    "from qiskit_addon_cutting import (\n",
     "    partition_problem,\n",
     "    generate_cutting_experiments,\n",
     ")"
@@ -79,7 +79,7 @@
    "id": "bc59b1be",
    "metadata": {},
    "source": [
-    "In order to calculate exact quasiprobability distributions for circuits with mid-circuit measurements, users will need to use the `ExactSampler` class from `circuit_knitting.utils.simulation`. The Qiskit Samplers do not support mid-circuit measurements in statevector mode."
+    "In order to calculate exact quasiprobability distributions for circuits with mid-circuit measurements, users will need to use the `ExactSampler` class from `qiskit_addon_cutting.utils.simulation`. The Qiskit Samplers do not support mid-circuit measurements in statevector mode."
    ]
   },
   {
@@ -89,7 +89,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from circuit_knitting.utils.simulation import ExactSampler\n",
+    "from qiskit_addon_cutting.utils.simulation import ExactSampler\n",
     "\n",
     "exact_sampler = ExactSampler()"
    ]
diff --git a/docs/circuit_cutting/how-tos/how_to_generate_exact_sampling_coefficients.ipynb b/docs/circuit_cutting/how-tos/how_to_generate_exact_sampling_coefficients.ipynb
index b1976bfa2..88c4dbd45 100644
--- a/docs/circuit_cutting/how-tos/how_to_generate_exact_sampling_coefficients.ipynb
+++ b/docs/circuit_cutting/how-tos/how_to_generate_exact_sampling_coefficients.ipynb
@@ -23,7 +23,7 @@
     "from qiskit.circuit.library import EfficientSU2\n",
     "from qiskit.quantum_info import SparsePauliOp\n",
     "\n",
-    "from circuit_knitting.cutting import (\n",
+    "from qiskit_addon_cutting import (\n",
     "    partition_problem,\n",
     "    generate_cutting_experiments,\n",
     ")"
@@ -236,7 +236,7 @@
     }
    ],
    "source": [
-    "from circuit_knitting.cutting.qpd import QPDBasis\n",
+    "from qiskit_addon_cutting.qpd import QPDBasis\n",
     "from qiskit.circuit.library.standard_gates import CXGate\n",
     "\n",
     "qpd_basis_cx = QPDBasis.from_instruction(CXGate())\n",
diff --git a/docs/circuit_cutting/how-tos/how_to_specify_cut_wires.ipynb b/docs/circuit_cutting/how-tos/how_to_specify_cut_wires.ipynb
index 380971d51..1711d23c0 100644
--- a/docs/circuit_cutting/how-tos/how_to_specify_cut_wires.ipynb
+++ b/docs/circuit_cutting/how-tos/how_to_specify_cut_wires.ipynb
@@ -22,14 +22,14 @@
     "from qiskit.quantum_info import SparsePauliOp\n",
     "from qiskit_aer.primitives import EstimatorV2, SamplerV2\n",
     "\n",
-    "from circuit_knitting.cutting import (\n",
+    "from qiskit_addon_cutting import (\n",
     "    partition_problem,\n",
     "    generate_cutting_experiments,\n",
     "    reconstruct_expectation_values,\n",
     ")\n",
     "\n",
-    "from circuit_knitting.cutting.instructions import CutWire\n",
-    "from circuit_knitting.cutting import cut_wires, expand_observables"
+    "from qiskit_addon_cutting.instructions import CutWire\n",
+    "from qiskit_addon_cutting import cut_wires, expand_observables"
    ]
   },
   {
diff --git a/docs/circuit_cutting/tutorials/01_gate_cutting_to_reduce_circuit_width.ipynb b/docs/circuit_cutting/tutorials/01_gate_cutting_to_reduce_circuit_width.ipynb
index 29d48ae8b..ac2480fa0 100644
--- a/docs/circuit_cutting/tutorials/01_gate_cutting_to_reduce_circuit_width.ipynb
+++ b/docs/circuit_cutting/tutorials/01_gate_cutting_to_reduce_circuit_width.ipynb
@@ -90,7 +90,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from circuit_knitting.cutting import partition_problem\n",
+    "from qiskit_addon_cutting import partition_problem\n",
     "\n",
     "partitioned_problem = partition_problem(\n",
     "    circuit=qc, partition_labels=\"AABB\", observables=observable.paulis\n",
@@ -232,7 +232,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from circuit_knitting.cutting import generate_cutting_experiments\n",
+    "from qiskit_addon_cutting import generate_cutting_experiments\n",
     "\n",
     "subexperiments, coefficients = generate_cutting_experiments(\n",
     "    circuits=subcircuits, observables=subobservables, num_samples=np.inf\n",
@@ -352,7 +352,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from circuit_knitting.cutting import reconstruct_expectation_values\n",
+    "from qiskit_addon_cutting import reconstruct_expectation_values\n",
     "\n",
     "# Get expectation values for each observable term\n",
     "reconstructed_expvals = reconstruct_expectation_values(\n",
diff --git a/docs/circuit_cutting/tutorials/02_gate_cutting_to_reduce_circuit_depth.ipynb b/docs/circuit_cutting/tutorials/02_gate_cutting_to_reduce_circuit_depth.ipynb
index 89507026e..ef67b7393 100644
--- a/docs/circuit_cutting/tutorials/02_gate_cutting_to_reduce_circuit_depth.ipynb
+++ b/docs/circuit_cutting/tutorials/02_gate_cutting_to_reduce_circuit_depth.ipynb
@@ -178,7 +178,7 @@
     }
    ],
    "source": [
-    "from circuit_knitting.cutting import cut_gates\n",
+    "from qiskit_addon_cutting import cut_gates\n",
     "\n",
     "# Find the indices of the distant gates\n",
     "cut_indices = [\n",
@@ -215,7 +215,7 @@
    "outputs": [],
    "source": [
     "import numpy as np\n",
-    "from circuit_knitting.cutting import generate_cutting_experiments\n",
+    "from qiskit_addon_cutting import generate_cutting_experiments\n",
     "\n",
     "# Generate the subexperiments and sampling coefficients\n",
     "subexperiments, coefficients = generate_cutting_experiments(\n",
@@ -357,7 +357,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from circuit_knitting.cutting import reconstruct_expectation_values\n",
+    "from qiskit_addon_cutting import reconstruct_expectation_values\n",
     "\n",
     "reconstructed_expvals = reconstruct_expectation_values(\n",
     "    results,\n",
diff --git a/docs/circuit_cutting/tutorials/03_wire_cutting_via_move_instruction.ipynb b/docs/circuit_cutting/tutorials/03_wire_cutting_via_move_instruction.ipynb
index 3d427dd42..72c4f59db 100644
--- a/docs/circuit_cutting/tutorials/03_wire_cutting_via_move_instruction.ipynb
+++ b/docs/circuit_cutting/tutorials/03_wire_cutting_via_move_instruction.ipynb
@@ -136,7 +136,7 @@
     }
    ],
    "source": [
-    "from circuit_knitting.cutting.instructions import Move\n",
+    "from qiskit_addon_cutting.instructions import Move\n",
     "\n",
     "qc_1 = QuantumCircuit(8)\n",
     "for i in [*range(4), *range(5, 8)]:\n",
@@ -193,7 +193,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from circuit_knitting.cutting import partition_problem\n",
+    "from qiskit_addon_cutting import partition_problem\n",
     "\n",
     "partitioned_problem = partition_problem(\n",
     "    circuit=qc_1, partition_labels=\"AAAABBBB\", observables=observable_expanded.paulis\n",
@@ -326,7 +326,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from circuit_knitting.cutting import generate_cutting_experiments\n",
+    "from qiskit_addon_cutting import generate_cutting_experiments\n",
     "\n",
     "subexperiments, coefficients = generate_cutting_experiments(\n",
     "    circuits=subcircuits, observables=subobservables, num_samples=np.inf\n",
@@ -446,7 +446,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from circuit_knitting.cutting import reconstruct_expectation_values\n",
+    "from qiskit_addon_cutting import reconstruct_expectation_values\n",
     "\n",
     "reconstructed_expvals = reconstruct_expectation_values(\n",
     "    results,\n",
diff --git a/docs/circuit_cutting/tutorials/04_automatic_cut_finding.ipynb b/docs/circuit_cutting/tutorials/04_automatic_cut_finding.ipynb
index c77bb832d..366cda7bd 100644
--- a/docs/circuit_cutting/tutorials/04_automatic_cut_finding.ipynb
+++ b/docs/circuit_cutting/tutorials/04_automatic_cut_finding.ipynb
@@ -78,7 +78,7 @@
     }
    ],
    "source": [
-    "from circuit_knitting.cutting.automated_cut_finding import (\n",
+    "from qiskit_addon_cutting.automated_cut_finding import (\n",
     "    find_cuts,\n",
     "    OptimizationParameters,\n",
     "    DeviceConstraints,\n",
@@ -126,7 +126,7 @@
     }
    ],
    "source": [
-    "from circuit_knitting.cutting import cut_wires, expand_observables\n",
+    "from qiskit_addon_cutting import cut_wires, expand_observables\n",
     "\n",
     "qc_w_ancilla = cut_wires(cut_circuit)\n",
     "observables_expanded = expand_observables(observable.paulis, circuit, qc_w_ancilla)\n",
@@ -154,7 +154,7 @@
     }
    ],
    "source": [
-    "from circuit_knitting.cutting import partition_problem\n",
+    "from qiskit_addon_cutting import partition_problem\n",
     "\n",
     "partitioned_problem = partition_problem(\n",
     "    circuit=qc_w_ancilla, observables=observables_expanded\n",
@@ -250,7 +250,7 @@
     }
    ],
    "source": [
-    "from circuit_knitting.cutting import generate_cutting_experiments\n",
+    "from qiskit_addon_cutting import generate_cutting_experiments\n",
     "\n",
     "subexperiments, coefficients = generate_cutting_experiments(\n",
     "    circuits=subcircuits, observables=subobservables, num_samples=1_000\n",
diff --git a/docs/conf.py b/docs/conf.py
index a7c9f7b97..370e5abd5 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -24,14 +24,14 @@
 from importlib.metadata import version as metadata_version
 
 project = "Circuit Knitting Toolbox"
-copyright = "2023"  # pylint: disable=redefined-builtin
+copyright = "2024"  # pylint: disable=redefined-builtin
 author = "IBM Quantum"
 
 _rootdir = Path(__file__).parent.parent
 sys.path.insert(0, str(_rootdir))
 
 # The full version, including alpha/beta/rc tags
-release = metadata_version("circuit-knitting-toolbox")
+release = metadata_version("qiskit-addon-cutting")
 # The short X.Y version
 version = ".".join(release.split(".")[:2])
 
@@ -59,7 +59,7 @@
 language = "en"
 pygments_style = "colorful"
 add_module_names = False
-modindex_common_prefix = ["circuit_knitting."]
+modindex_common_prefix = ["qiskit_addon_cutting."]
 
 html_theme = "qiskit-ecosystem"
 html_title = f"{project} {release}"
diff --git a/pyproject.toml b/pyproject.toml
index 6dd13d3c7..e8a7a68b9 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -3,8 +3,8 @@ requires = ["hatchling"]
 build-backend = "hatchling.build"
 
 [project]
-name = "circuit-knitting-toolbox"
-version = "0.7.1"
+name = "qiskit-addon-cutting"
+version = "0.9.0.dev"
 description = "A software prototype for a circuit knitting toolbox which connects user applications with runtime primitives"
 readme = "README.md"
 license = {file = "LICENSE.txt"}
@@ -37,18 +37,18 @@ dependencies = [
 
 [project.optional-dependencies]
 dev = [
-    "circuit-knitting-toolbox[test,nbtest,lint]",
+    "qiskit-addon-cutting[test,nbtest,lint]",
 ]
 basetest = [
     "pytest>=6.2.5",
     "pytest-randomly>=1.2.0",
 ]
 test = [
-    "circuit-knitting-toolbox[basetest]",
+    "qiskit-addon-cutting[basetest]",
     "ddt>=1.4.4",
 ]
 nbtest = [
-    "circuit-knitting-toolbox[basetest]",
+    "qiskit-addon-cutting[basetest]",
     "nbmake>=1.4.3"
 ]
 style = [
@@ -58,7 +58,7 @@ style = [
     "nbqa>=1.6.0",
 ]
 lint = [
-    "circuit-knitting-toolbox[style]",
+    "qiskit-addon-cutting[style]",
     "pydocstyle==6.3.0",
     "mypy==1.11.1",
     "reno>=3.4.0",
@@ -88,7 +88,7 @@ notebook-dependencies = [
 
 [tool.hatch.build.targets.wheel]
 only-include = [
-    "circuit_knitting",
+    "qiskit_addon_cutting",
 ]
 
 [tool.autoflake]
@@ -135,9 +135,9 @@ ignore_missing_imports = true
 #[tool.coverage.run]
 #omit = [
 #    # deprecated import location(s)
-#    "circuit_knitting/path/to/deprecated/module",
+#    "qiskit_addon_cutting/path/to/deprecated/module",
 #]
 
 [tool.pytest.ini_options]
-testpaths = ["./circuit_knitting/", "./test/"]
+testpaths = ["./qiskit_addon_cutting/", "./test/"]
 addopts = "--doctest-modules -rs --durations=10"
diff --git a/circuit_knitting/cutting/__init__.py b/qiskit_addon_cutting/__init__.py
similarity index 88%
rename from circuit_knitting/cutting/__init__.py
rename to qiskit_addon_cutting/__init__.py
index bb015ef47..2864920b7 100644
--- a/circuit_knitting/cutting/__init__.py
+++ b/qiskit_addon_cutting/__init__.py
@@ -10,9 +10,9 @@
 # that they have been altered from the originals.
 
 """
-Circuit Cutting (:mod:`circuit_knitting.cutting`).
+Circuit Cutting (:mod:`qiskit_addon_cutting`).
 
-.. currentmodule:: circuit_knitting.cutting
+.. currentmodule:: qiskit_addon_cutting
 
 Circuit Cutting
 ===============
@@ -78,6 +78,9 @@
     qpd.qpdbasis_from_instruction
 """
 
+from __future__ import annotations
+from importlib.metadata import version, PackageNotFoundError
+
 from .cutting_decomposition import (
     partition_circuit_qubits,
     partition_problem,
@@ -89,6 +92,12 @@
 from .wire_cutting_transforms import cut_wires, expand_observables
 from .automated_cut_finding import find_cuts, DeviceConstraints, OptimizationParameters
 
+try:
+    __version__ = version("qiskit-addon-cutting")
+except PackageNotFoundError:  # pragma: no cover
+    # Package is not installed
+    pass
+
 __all__ = [
     "partition_circuit_qubits",
     "partition_problem",
diff --git a/circuit_knitting/cutting/automated_cut_finding.py b/qiskit_addon_cutting/automated_cut_finding.py
similarity index 100%
rename from circuit_knitting/cutting/automated_cut_finding.py
rename to qiskit_addon_cutting/automated_cut_finding.py
diff --git a/circuit_knitting/cutting/cut_finding/__init__.py b/qiskit_addon_cutting/cut_finding/__init__.py
similarity index 100%
rename from circuit_knitting/cutting/cut_finding/__init__.py
rename to qiskit_addon_cutting/cut_finding/__init__.py
diff --git a/circuit_knitting/cutting/cut_finding/best_first_search.py b/qiskit_addon_cutting/cut_finding/best_first_search.py
similarity index 100%
rename from circuit_knitting/cutting/cut_finding/best_first_search.py
rename to qiskit_addon_cutting/cut_finding/best_first_search.py
diff --git a/circuit_knitting/cutting/cut_finding/cco_utils.py b/qiskit_addon_cutting/cut_finding/cco_utils.py
similarity index 100%
rename from circuit_knitting/cutting/cut_finding/cco_utils.py
rename to qiskit_addon_cutting/cut_finding/cco_utils.py
diff --git a/circuit_knitting/cutting/cut_finding/circuit_interface.py b/qiskit_addon_cutting/cut_finding/circuit_interface.py
similarity index 100%
rename from circuit_knitting/cutting/cut_finding/circuit_interface.py
rename to qiskit_addon_cutting/cut_finding/circuit_interface.py
diff --git a/circuit_knitting/cutting/cut_finding/cut_optimization.py b/qiskit_addon_cutting/cut_finding/cut_optimization.py
similarity index 100%
rename from circuit_knitting/cutting/cut_finding/cut_optimization.py
rename to qiskit_addon_cutting/cut_finding/cut_optimization.py
diff --git a/circuit_knitting/cutting/cut_finding/cutting_actions.py b/qiskit_addon_cutting/cut_finding/cutting_actions.py
similarity index 100%
rename from circuit_knitting/cutting/cut_finding/cutting_actions.py
rename to qiskit_addon_cutting/cut_finding/cutting_actions.py
diff --git a/circuit_knitting/cutting/cut_finding/disjoint_subcircuits_state.py b/qiskit_addon_cutting/cut_finding/disjoint_subcircuits_state.py
similarity index 100%
rename from circuit_knitting/cutting/cut_finding/disjoint_subcircuits_state.py
rename to qiskit_addon_cutting/cut_finding/disjoint_subcircuits_state.py
diff --git a/circuit_knitting/cutting/cut_finding/lo_cuts_optimizer.py b/qiskit_addon_cutting/cut_finding/lo_cuts_optimizer.py
similarity index 100%
rename from circuit_knitting/cutting/cut_finding/lo_cuts_optimizer.py
rename to qiskit_addon_cutting/cut_finding/lo_cuts_optimizer.py
diff --git a/circuit_knitting/cutting/cut_finding/optimization_settings.py b/qiskit_addon_cutting/cut_finding/optimization_settings.py
similarity index 100%
rename from circuit_knitting/cutting/cut_finding/optimization_settings.py
rename to qiskit_addon_cutting/cut_finding/optimization_settings.py
diff --git a/circuit_knitting/cutting/cut_finding/search_space_generator.py b/qiskit_addon_cutting/cut_finding/search_space_generator.py
similarity index 100%
rename from circuit_knitting/cutting/cut_finding/search_space_generator.py
rename to qiskit_addon_cutting/cut_finding/search_space_generator.py
diff --git a/circuit_knitting/cutting/cutting_decomposition.py b/qiskit_addon_cutting/cutting_decomposition.py
similarity index 98%
rename from circuit_knitting/cutting/cutting_decomposition.py
rename to qiskit_addon_cutting/cutting_decomposition.py
index ef35e3bd0..9263918e3 100644
--- a/circuit_knitting/cutting/cutting_decomposition.py
+++ b/qiskit_addon_cutting/cutting_decomposition.py
@@ -24,8 +24,8 @@
 )
 from qiskit.quantum_info import PauliList
 
-from ..utils.observable_grouping import observables_restricted_to_subsystem
-from ..utils.transforms import separate_circuit, _partition_labels_from_circuit
+from .utils.observable_grouping import observables_restricted_to_subsystem
+from .utils.transforms import separate_circuit, _partition_labels_from_circuit
 from .qpd.qpd_basis import QPDBasis
 from .qpd.instructions import TwoQubitQPDGate
 
diff --git a/circuit_knitting/cutting/cutting_experiments.py b/qiskit_addon_cutting/cutting_experiments.py
similarity index 99%
rename from circuit_knitting/cutting/cutting_experiments.py
rename to qiskit_addon_cutting/cutting_experiments.py
index f4945409e..9870b5f03 100644
--- a/circuit_knitting/cutting/cutting_experiments.py
+++ b/qiskit_addon_cutting/cutting_experiments.py
@@ -20,8 +20,8 @@
 from qiskit.circuit import QuantumCircuit, ClassicalRegister
 from qiskit.quantum_info import PauliList
 
-from ..utils.iteration import strict_zip
-from ..utils.observable_grouping import ObservableCollection, CommutingObservableGroup
+from .utils.iteration import strict_zip
+from .utils.observable_grouping import ObservableCollection, CommutingObservableGroup
 from .qpd import (
     WeightType,
     QPDBasis,
diff --git a/circuit_knitting/cutting/cutting_reconstruction.py b/qiskit_addon_cutting/cutting_reconstruction.py
similarity index 98%
rename from circuit_knitting/cutting/cutting_reconstruction.py
rename to qiskit_addon_cutting/cutting_reconstruction.py
index 042158f65..96ec6067a 100644
--- a/circuit_knitting/cutting/cutting_reconstruction.py
+++ b/qiskit_addon_cutting/cutting_reconstruction.py
@@ -22,8 +22,8 @@
     PrimitiveResult,  # for SamplerV2
 )
 
-from ..utils.observable_grouping import CommutingObservableGroup, ObservableCollection
-from ..utils.bitwise import bit_count
+from .utils.observable_grouping import CommutingObservableGroup, ObservableCollection
+from .utils.bitwise import bit_count
 from .cutting_decomposition import decompose_observables
 from .cutting_experiments import _get_pauli_indices
 from .qpd import WeightType
diff --git a/circuit_knitting/cutting/instructions/__init__.py b/qiskit_addon_cutting/instructions/__init__.py
similarity index 100%
rename from circuit_knitting/cutting/instructions/__init__.py
rename to qiskit_addon_cutting/instructions/__init__.py
diff --git a/circuit_knitting/cutting/instructions/cut_wire.py b/qiskit_addon_cutting/instructions/cut_wire.py
similarity index 100%
rename from circuit_knitting/cutting/instructions/cut_wire.py
rename to qiskit_addon_cutting/instructions/cut_wire.py
diff --git a/circuit_knitting/cutting/instructions/move.py b/qiskit_addon_cutting/instructions/move.py
similarity index 97%
rename from circuit_knitting/cutting/instructions/move.py
rename to qiskit_addon_cutting/instructions/move.py
index ff1806fdc..ebe8ac825 100644
--- a/circuit_knitting/cutting/instructions/move.py
+++ b/qiskit_addon_cutting/instructions/move.py
@@ -52,7 +52,7 @@ class Move(Instruction):
 
        import numpy as np
        from qiskit import QuantumCircuit
-       from circuit_knitting.cutting.instructions import Move
+       from qiskit_addon_cutting.instructions import Move
 
        qc = QuantumCircuit(4)
        qc.ryy(np.pi / 4, 0, 1)
diff --git a/circuit_knitting/cutting/qpd/__init__.py b/qiskit_addon_cutting/qpd/__init__.py
similarity index 100%
rename from circuit_knitting/cutting/qpd/__init__.py
rename to qiskit_addon_cutting/qpd/__init__.py
diff --git a/circuit_knitting/cutting/qpd/decompose.py b/qiskit_addon_cutting/qpd/decompose.py
similarity index 100%
rename from circuit_knitting/cutting/qpd/decompose.py
rename to qiskit_addon_cutting/qpd/decompose.py
diff --git a/circuit_knitting/cutting/qpd/decompositions.py b/qiskit_addon_cutting/qpd/decompositions.py
similarity index 99%
rename from circuit_knitting/cutting/qpd/decompositions.py
rename to qiskit_addon_cutting/qpd/decompositions.py
index 0b6bf9a29..5c0580d9f 100644
--- a/circuit_knitting/cutting/qpd/decompositions.py
+++ b/qiskit_addon_cutting/qpd/decompositions.py
@@ -62,7 +62,7 @@
 from .qpd_basis import QPDBasis
 from .instructions import QPDMeasure
 from ..instructions import Move
-from ...utils.iteration import unique_by_id
+from ..utils.iteration import unique_by_id
 
 
 _qpdbasis_from_instruction_funcs: dict[str, Callable[[Instruction], QPDBasis]] = {}
diff --git a/circuit_knitting/cutting/qpd/instructions/__init__.py b/qiskit_addon_cutting/qpd/instructions/__init__.py
similarity index 100%
rename from circuit_knitting/cutting/qpd/instructions/__init__.py
rename to qiskit_addon_cutting/qpd/instructions/__init__.py
diff --git a/circuit_knitting/cutting/qpd/instructions/qpd_gate.py b/qiskit_addon_cutting/qpd/instructions/qpd_gate.py
similarity index 100%
rename from circuit_knitting/cutting/qpd/instructions/qpd_gate.py
rename to qiskit_addon_cutting/qpd/instructions/qpd_gate.py
diff --git a/circuit_knitting/cutting/qpd/instructions/qpd_measure.py b/qiskit_addon_cutting/qpd/instructions/qpd_measure.py
similarity index 100%
rename from circuit_knitting/cutting/qpd/instructions/qpd_measure.py
rename to qiskit_addon_cutting/qpd/instructions/qpd_measure.py
diff --git a/circuit_knitting/cutting/qpd/qpd_basis.py b/qiskit_addon_cutting/qpd/qpd_basis.py
similarity index 100%
rename from circuit_knitting/cutting/qpd/qpd_basis.py
rename to qiskit_addon_cutting/qpd/qpd_basis.py
diff --git a/circuit_knitting/cutting/qpd/weights.py b/qiskit_addon_cutting/qpd/weights.py
similarity index 99%
rename from circuit_knitting/cutting/qpd/weights.py
rename to qiskit_addon_cutting/qpd/weights.py
index 940e30d7a..a49878686 100644
--- a/circuit_knitting/cutting/qpd/weights.py
+++ b/qiskit_addon_cutting/qpd/weights.py
@@ -24,7 +24,7 @@
 import numpy.typing as npt
 
 from .qpd_basis import QPDBasis
-from ...utils.iteration import strict_zip
+from ..utils.iteration import strict_zip
 
 
 logger = logging.getLogger(__name__)
diff --git a/circuit_knitting/utils/__init__.py b/qiskit_addon_cutting/utils/__init__.py
similarity index 64%
rename from circuit_knitting/utils/__init__.py
rename to qiskit_addon_cutting/utils/__init__.py
index ecf71eb3c..52546a5b2 100644
--- a/circuit_knitting/utils/__init__.py
+++ b/qiskit_addon_cutting/utils/__init__.py
@@ -13,38 +13,38 @@
 Utility functions.
 
 =================================================================
-Bitwise utilities (:mod:`circuit_knitting.utils.bitwise`)
+Bitwise utilities (:mod:`qiskit_addon_cutting.utils.bitwise`)
 =================================================================
 
-.. automodule:: circuit_knitting.utils.bitwise
+.. automodule:: qiskit_addon_cutting.utils.bitwise
 
 =====================================================================
-Iteration utilities (:mod:`circuit_knitting.utils.iteration`)
+Iteration utilities (:mod:`qiskit_addon_cutting.utils.iteration`)
 =====================================================================
 
-.. automodule:: circuit_knitting.utils.iteration
+.. automodule:: qiskit_addon_cutting.utils.iteration
 
 ===============================================================================
-Observable grouping (:mod:`circuit_knitting.utils.observable_grouping`)
+Observable grouping (:mod:`qiskit_addon_cutting.utils.observable_grouping`)
 ===============================================================================
 
-.. automodule:: circuit_knitting.utils.observable_grouping
+.. automodule:: qiskit_addon_cutting.utils.observable_grouping
 
 =============================================================
-Simulation (:mod:`circuit_knitting.utils.simulation`)
+Simulation (:mod:`qiskit_addon_cutting.utils.simulation`)
 =============================================================
 
-.. automodule:: circuit_knitting.utils.simulation
+.. automodule:: qiskit_addon_cutting.utils.simulation
 
 =============================================================
-Transforms (:mod:`circuit_knitting.utils.transforms`)
+Transforms (:mod:`qiskit_addon_cutting.utils.transforms`)
 =============================================================
 
-.. automodule:: circuit_knitting.utils.transforms
+.. automodule:: qiskit_addon_cutting.utils.transforms
 
-===================================================================
-Transpiler passes (:mod:`circuit_knitting.utils.transpiler_passes`)
-===================================================================
+=======================================================================
+Transpiler passes (:mod:`qiskit_addon_cutting.utils.transpiler_passes`)
+=======================================================================
 
-.. automodule:: circuit_knitting.utils.transpiler_passes
+.. automodule:: qiskit_addon_cutting.utils.transpiler_passes
 """
diff --git a/circuit_knitting/utils/bitwise.py b/qiskit_addon_cutting/utils/bitwise.py
similarity index 94%
rename from circuit_knitting/utils/bitwise.py
rename to qiskit_addon_cutting/utils/bitwise.py
index a002ee901..9cc114213 100644
--- a/circuit_knitting/utils/bitwise.py
+++ b/qiskit_addon_cutting/utils/bitwise.py
@@ -12,7 +12,7 @@
 """
 Bitwise utilities.
 
-.. currentmodule:: circuit_knitting.utils.bitwise
+.. currentmodule:: qiskit_addon_cutting.utils.bitwise
 
 .. autosummary::
    :toctree: ../stubs/
diff --git a/circuit_knitting/utils/iteration.py b/qiskit_addon_cutting/utils/iteration.py
similarity index 97%
rename from circuit_knitting/utils/iteration.py
rename to qiskit_addon_cutting/utils/iteration.py
index 4fddb53a2..4104c0d90 100644
--- a/circuit_knitting/utils/iteration.py
+++ b/qiskit_addon_cutting/utils/iteration.py
@@ -12,7 +12,7 @@
 """
 Iteration utilities.
 
-.. currentmodule:: circuit_knitting.utils.iteration
+.. currentmodule:: qiskit_addon_cutting.utils.iteration
 
 .. autosummary::
    :toctree: ../stubs/
diff --git a/circuit_knitting/utils/observable_grouping.py b/qiskit_addon_cutting/utils/observable_grouping.py
similarity index 99%
rename from circuit_knitting/utils/observable_grouping.py
rename to qiskit_addon_cutting/utils/observable_grouping.py
index 210fac1f1..05d26413b 100644
--- a/circuit_knitting/utils/observable_grouping.py
+++ b/qiskit_addon_cutting/utils/observable_grouping.py
@@ -12,7 +12,7 @@
 """
 Module for conducting Pauli observable grouping.
 
-.. currentmodule:: circuit_knitting.utils.observable_grouping
+.. currentmodule:: qiskit_addon_cutting.utils.observable_grouping
 
 .. autosummary::
    :toctree: ../stubs
diff --git a/circuit_knitting/utils/simulation.py b/qiskit_addon_cutting/utils/simulation.py
similarity index 99%
rename from circuit_knitting/utils/simulation.py
rename to qiskit_addon_cutting/utils/simulation.py
index c66b472a3..3417d959c 100644
--- a/circuit_knitting/utils/simulation.py
+++ b/qiskit_addon_cutting/utils/simulation.py
@@ -12,7 +12,7 @@
 """
 Simulation of precise measurement outcome probabilities.
 
-.. currentmodule:: circuit_knitting.utils.simulation
+.. currentmodule:: qiskit_addon_cutting.utils.simulation
 
 .. autosummary::
    :toctree: ../stubs
diff --git a/circuit_knitting/utils/transforms.py b/qiskit_addon_cutting/utils/transforms.py
similarity index 99%
rename from circuit_knitting/utils/transforms.py
rename to qiskit_addon_cutting/utils/transforms.py
index 2849d093e..bb6dfc264 100644
--- a/circuit_knitting/utils/transforms.py
+++ b/qiskit_addon_cutting/utils/transforms.py
@@ -12,7 +12,7 @@
 """
 Functions for manipulating quantum circuits.
 
-.. currentmodule:: circuit_knitting.utils.transforms
+.. currentmodule:: qiskit_addon_cutting.utils.transforms
 
 .. autosummary::
    :toctree: ../stubs
diff --git a/circuit_knitting/utils/transpiler_passes.py b/qiskit_addon_cutting/utils/transpiler_passes.py
similarity index 96%
rename from circuit_knitting/utils/transpiler_passes.py
rename to qiskit_addon_cutting/utils/transpiler_passes.py
index c4885461e..1b913f4ef 100644
--- a/circuit_knitting/utils/transpiler_passes.py
+++ b/qiskit_addon_cutting/utils/transpiler_passes.py
@@ -12,7 +12,7 @@
 """
 Transpiler passes useful for circuit knitting.
 
-.. currentmodule:: circuit_knitting.utils.transpiler_passes
+.. currentmodule:: qiskit_addon_cutting.utils.transpiler_passes
 
 .. autosummary::
    :toctree: ../stubs/
diff --git a/circuit_knitting/cutting/wire_cutting_transforms.py b/qiskit_addon_cutting/wire_cutting_transforms.py
similarity index 100%
rename from circuit_knitting/cutting/wire_cutting_transforms.py
rename to qiskit_addon_cutting/wire_cutting_transforms.py
diff --git a/test/cutting/cut_finding/__init__.py b/test/cut_finding/__init__.py
similarity index 100%
rename from test/cutting/cut_finding/__init__.py
rename to test/cut_finding/__init__.py
diff --git a/test/cutting/cut_finding/test_best_first_search.py b/test/cut_finding/test_best_first_search.py
similarity index 94%
rename from test/cutting/cut_finding/test_best_first_search.py
rename to test/cut_finding/test_best_first_search.py
index 59a07fa40..d8d30b6df 100644
--- a/test/cutting/cut_finding/test_best_first_search.py
+++ b/test/cut_finding/test_best_first_search.py
@@ -15,12 +15,12 @@
 
 from pytest import fixture
 from numpy import inf
-from circuit_knitting.cutting.cut_finding.circuit_interface import (
+from qiskit_addon_cutting.cut_finding.circuit_interface import (
     SimpleGateList,
     CircuitElement,
     GateSpec,
 )
-from circuit_knitting.cutting.cut_finding.cut_optimization import (
+from qiskit_addon_cutting.cut_finding.cut_optimization import (
     cut_optimization_next_state_func,
     cut_optimization_min_cost_bound_func,
     cut_optimization_cost_func,
@@ -29,19 +29,19 @@
     CutOptimizationFuncArgs,
     CutOptimization,
 )
-from circuit_knitting.cutting.cut_finding.optimization_settings import (
+from qiskit_addon_cutting.cut_finding.optimization_settings import (
     OptimizationSettings,
 )
-from circuit_knitting.cutting.automated_cut_finding import DeviceConstraints
-from circuit_knitting.cutting.cut_finding.disjoint_subcircuits_state import (
+from qiskit_addon_cutting.automated_cut_finding import DeviceConstraints
+from qiskit_addon_cutting.cut_finding.disjoint_subcircuits_state import (
     get_actions_list,
 )
-from circuit_knitting.cutting.cut_finding.cutting_actions import (
+from qiskit_addon_cutting.cut_finding.cutting_actions import (
     disjoint_subcircuit_actions,
     DisjointSubcircuitsState,
 )
 
-from circuit_knitting.cutting.cut_finding.best_first_search import (
+from qiskit_addon_cutting.cut_finding.best_first_search import (
     BestFirstSearch,
     SearchFunctions,
 )
diff --git a/test/cutting/cut_finding/test_cco_utils.py b/test/cut_finding/test_cco_utils.py
similarity index 97%
rename from test/cutting/cut_finding/test_cco_utils.py
rename to test/cut_finding/test_cco_utils.py
index f4d39cbff..e3df835d0 100644
--- a/test/cutting/cut_finding/test_cco_utils.py
+++ b/test/cut_finding/test_cco_utils.py
@@ -19,11 +19,11 @@
 from qiskit.circuit.library import EfficientSU2
 from qiskit import QuantumCircuit, QuantumRegister
 from qiskit.circuit import Qubit, Instruction, CircuitInstruction
-from circuit_knitting.cutting.cut_finding.cco_utils import (
+from qiskit_addon_cutting.cut_finding.cco_utils import (
     qc_to_cco_circuit,
     cco_to_qc_circuit,
 )
-from circuit_knitting.cutting.cut_finding.circuit_interface import (
+from qiskit_addon_cutting.cut_finding.circuit_interface import (
     SimpleGateList,
     CircuitElement,
 )
diff --git a/test/cutting/cut_finding/test_circuit_interfaces.py b/test/cut_finding/test_circuit_interfaces.py
similarity index 98%
rename from test/cutting/cut_finding/test_circuit_interfaces.py
rename to test/cut_finding/test_circuit_interfaces.py
index e0782ce99..a51abeedd 100644
--- a/test/cutting/cut_finding/test_circuit_interfaces.py
+++ b/test/cut_finding/test_circuit_interfaces.py
@@ -13,13 +13,13 @@
 
 from __future__ import annotations
 
-from circuit_knitting.cutting.cut_finding.circuit_interface import (
+from qiskit_addon_cutting.cut_finding.circuit_interface import (
     CircuitElement,
     SimpleGateList,
     GateSpec,
 )
 
-from circuit_knitting.cutting.cut_finding.cut_optimization import (
+from qiskit_addon_cutting.cut_finding.cut_optimization import (
     max_wire_cuts_circuit,
     max_wire_cuts_gamma,
 )
diff --git a/test/cutting/cut_finding/test_cut_finder_results.py b/test/cut_finding/test_cut_finder_results.py
similarity index 97%
rename from test/cutting/cut_finding/test_cut_finder_results.py
rename to test/cut_finding/test_cut_finder_results.py
index 0ecf9a351..ba20076c4 100644
--- a/test/cutting/cut_finding/test_cut_finder_results.py
+++ b/test/cut_finding/test_cut_finder_results.py
@@ -18,25 +18,25 @@
 from pytest import raises
 from qiskit import QuantumCircuit
 from qiskit.circuit.library import EfficientSU2
-from circuit_knitting.cutting.cut_finding.cco_utils import qc_to_cco_circuit
-from circuit_knitting.cutting.cut_finding.circuit_interface import (
+from qiskit_addon_cutting.cut_finding.cco_utils import qc_to_cco_circuit
+from qiskit_addon_cutting.cut_finding.circuit_interface import (
     SimpleGateList,
 )
-from circuit_knitting.cutting.cut_finding.optimization_settings import (
+from qiskit_addon_cutting.cut_finding.optimization_settings import (
     OptimizationSettings,
 )
-from circuit_knitting.cutting.automated_cut_finding import DeviceConstraints
-from circuit_knitting.cutting.cut_finding.disjoint_subcircuits_state import (
+from qiskit_addon_cutting.automated_cut_finding import DeviceConstraints
+from qiskit_addon_cutting.cut_finding.disjoint_subcircuits_state import (
     get_actions_list,
     SingleWireCutIdentifier,
     WireCutLocation,
     CutIdentifier,
     CutLocation,
 )
-from circuit_knitting.cutting.cut_finding.lo_cuts_optimizer import (
+from qiskit_addon_cutting.cut_finding.lo_cuts_optimizer import (
     LOCutsOptimizer,
 )
-from circuit_knitting.cutting.cut_finding.cut_optimization import CutOptimization
+from qiskit_addon_cutting.cut_finding.cut_optimization import CutOptimization
 
 
 class TestCuttingFourQubitCircuit(unittest.TestCase):
diff --git a/test/cutting/cut_finding/test_cutting_actions.py b/test/cut_finding/test_cutting_actions.py
similarity index 94%
rename from test/cutting/cut_finding/test_cutting_actions.py
rename to test/cut_finding/test_cutting_actions.py
index 3b7fb48bc..056e7f831 100644
--- a/test/cutting/cut_finding/test_cutting_actions.py
+++ b/test/cut_finding/test_cutting_actions.py
@@ -15,24 +15,24 @@
 
 from pytest import fixture
 from typing import Callable
-from circuit_knitting.cutting.cut_finding.circuit_interface import (
+from qiskit_addon_cutting.cut_finding.circuit_interface import (
     CircuitElement,
     SimpleGateList,
     GateSpec,
 )
-from circuit_knitting.cutting.cut_finding.cutting_actions import (
+from qiskit_addon_cutting.cut_finding.cutting_actions import (
     ActionApplyGate,
     ActionCutTwoQubitGate,
     ActionCutLeftWire,
     ActionCutRightWire,
 )
-from circuit_knitting.cutting.cut_finding.disjoint_subcircuits_state import (
+from qiskit_addon_cutting.cut_finding.disjoint_subcircuits_state import (
     DisjointSubcircuitsState,
     get_actions_list,
     CutIdentifier,
     CutLocation,
 )
-from circuit_knitting.cutting.cut_finding.search_space_generator import ActionNames
+from qiskit_addon_cutting.cut_finding.search_space_generator import ActionNames
 
 
 @fixture
diff --git a/test/cutting/cut_finding/test_disjoint_subcircuits_state.py b/test/cut_finding/test_disjoint_subcircuits_state.py
similarity index 97%
rename from test/cutting/cut_finding/test_disjoint_subcircuits_state.py
rename to test/cut_finding/test_disjoint_subcircuits_state.py
index 6bc14ef39..08eb8d271 100644
--- a/test/cutting/cut_finding/test_disjoint_subcircuits_state.py
+++ b/test/cut_finding/test_disjoint_subcircuits_state.py
@@ -15,13 +15,13 @@
 
 from pytest import mark, raises, fixture
 from typing import Callable
-from circuit_knitting.cutting.cut_finding.disjoint_subcircuits_state import (
+from qiskit_addon_cutting.cut_finding.disjoint_subcircuits_state import (
     DisjointSubcircuitsState,
 )
-from circuit_knitting.cutting.cut_finding.cut_optimization import (
+from qiskit_addon_cutting.cut_finding.cut_optimization import (
     disjoint_subcircuit_actions,
 )
-from circuit_knitting.cutting.cut_finding.circuit_interface import (
+from qiskit_addon_cutting.cut_finding.circuit_interface import (
     SimpleGateList,
     CircuitElement,
     GateSpec,
diff --git a/test/cutting/cut_finding/test_optimization_settings.py b/test/cut_finding/test_optimization_settings.py
similarity index 96%
rename from test/cutting/cut_finding/test_optimization_settings.py
rename to test/cut_finding/test_optimization_settings.py
index 251b2edd5..5a6866650 100644
--- a/test/cutting/cut_finding/test_optimization_settings.py
+++ b/test/cut_finding/test_optimization_settings.py
@@ -14,7 +14,7 @@
 from __future__ import annotations
 
 import pytest
-from circuit_knitting.cutting.cut_finding.optimization_settings import (
+from qiskit_addon_cutting.cut_finding.optimization_settings import (
     OptimizationSettings,
 )
 
diff --git a/test/cutting/__init__.py b/test/cutting/__init__.py
deleted file mode 100644
index 71d83fd8a..000000000
--- a/test/cutting/__init__.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# This code is a Qiskit project.
-
-# (C) Copyright IBM 2022.
-
-# This code is licensed under the Apache License, Version 2.0. You may
-# obtain a copy of this license in the LICENSE.txt file in the root directory
-# of this source tree or at http://www.apache.org/licenses/LICENSE-2.0.
-# Any modifications or derivative works of this code must retain this
-# copyright notice, and modified files need to carry a notice indicating
-# that they have been altered from the originals.
diff --git a/test/cutting/qpd/__init__.py b/test/qpd/__init__.py
similarity index 100%
rename from test/cutting/qpd/__init__.py
rename to test/qpd/__init__.py
diff --git a/test/cutting/qpd/instructions/test_qpd_gate.py b/test/qpd/instructions/test_qpd_gate.py
similarity index 98%
rename from test/cutting/qpd/instructions/test_qpd_gate.py
rename to test/qpd/instructions/test_qpd_gate.py
index 65064ce03..e5f91ccc6 100644
--- a/test/cutting/qpd/instructions/test_qpd_gate.py
+++ b/test/qpd/instructions/test_qpd_gate.py
@@ -19,7 +19,7 @@
 from qiskit import QuantumCircuit, qpy
 from qiskit.circuit.library.standard_gates import CXGate, XGate, YGate, ZGate
 
-from circuit_knitting.cutting.qpd import (
+from qiskit_addon_cutting.qpd import (
     QPDBasis,
     TwoQubitQPDGate,
     SingleQubitQPDGate,
diff --git a/test/cutting/qpd/instructions/test_qpd_measure.py b/test/qpd/instructions/test_qpd_measure.py
similarity index 92%
rename from test/cutting/qpd/instructions/test_qpd_measure.py
rename to test/qpd/instructions/test_qpd_measure.py
index 07271ab28..e72a88b5d 100644
--- a/test/cutting/qpd/instructions/test_qpd_measure.py
+++ b/test/qpd/instructions/test_qpd_measure.py
@@ -13,7 +13,7 @@
 
 import unittest
 
-from circuit_knitting.cutting.qpd import QPDMeasure
+from qiskit_addon_cutting.qpd import QPDMeasure
 
 
 class TestQPDMeasure(unittest.TestCase):
diff --git a/test/cutting/qpd/test_qpd.py b/test/qpd/test_qpd.py
similarity index 98%
rename from test/cutting/qpd/test_qpd.py
rename to test/qpd/test_qpd.py
index a3478d040..c3641c294 100644
--- a/test/cutting/qpd/test_qpd.py
+++ b/test/qpd/test_qpd.py
@@ -46,9 +46,9 @@
     DCXGate,
 )
 
-from circuit_knitting.utils.iteration import unique_by_eq, strict_zip
-from circuit_knitting.cutting.instructions import Move
-from circuit_knitting.cutting.qpd import (
+from qiskit_addon_cutting.utils.iteration import unique_by_eq, strict_zip
+from qiskit_addon_cutting.instructions import Move
+from qiskit_addon_cutting.qpd import (
     QPDBasis,
     SingleQubitQPDGate,
     TwoQubitQPDGate,
@@ -57,11 +57,11 @@
     decompose_qpd_instructions,
     qpdbasis_from_instruction,
 )
-from circuit_knitting.cutting.qpd.weights import (
+from qiskit_addon_cutting.qpd.weights import (
     _generate_qpd_weights,
     _generate_exact_weights_and_conditional_probabilities,
 )
-from circuit_knitting.cutting.qpd.decompositions import (
+from qiskit_addon_cutting.qpd.decompositions import (
     _nonlocal_qpd_basis_from_u,
     _u_from_thetavec,
     _explicitly_supported_instructions,
diff --git a/test/cutting/qpd/test_qpd_basis.py b/test/qpd/test_qpd_basis.py
similarity index 99%
rename from test/cutting/qpd/test_qpd_basis.py
rename to test/qpd/test_qpd_basis.py
index 57e0052d6..ace200598 100644
--- a/test/cutting/qpd/test_qpd_basis.py
+++ b/test/qpd/test_qpd_basis.py
@@ -19,7 +19,7 @@
 from qiskit.circuit import Parameter
 from qiskit.circuit.library.standard_gates import *
 
-from circuit_knitting.cutting.qpd import QPDBasis, QPDMeasure
+from qiskit_addon_cutting.qpd import QPDBasis, QPDMeasure
 
 
 class TestQPDBasis(unittest.TestCase):
diff --git a/test/cutting/test_cutting_decomposition.py b/test/test_cutting_decomposition.py
similarity index 98%
rename from test/cutting/test_cutting_decomposition.py
rename to test/test_cutting_decomposition.py
index 2595f1cca..951a45afe 100644
--- a/test/cutting/test_cutting_decomposition.py
+++ b/test/test_cutting_decomposition.py
@@ -21,13 +21,13 @@
 from qiskit.circuit.library.standard_gates import CXGate
 from qiskit.quantum_info import PauliList
 
-from circuit_knitting.cutting import (
+from qiskit_addon_cutting import (
     partition_circuit_qubits,
     partition_problem,
     cut_gates,
 )
-from circuit_knitting.cutting.instructions import Move
-from circuit_knitting.cutting.qpd import (
+from qiskit_addon_cutting.instructions import Move
+from qiskit_addon_cutting.qpd import (
     QPDBasis,
     TwoQubitQPDGate,
     BaseQPDGate,
diff --git a/test/cutting/test_cutting_experiments.py b/test/test_cutting_experiments.py
similarity index 97%
rename from test/cutting/test_cutting_experiments.py
rename to test/test_cutting_experiments.py
index 47c6e15c0..c0ca059af 100644
--- a/test/cutting/test_cutting_experiments.py
+++ b/test/test_cutting_experiments.py
@@ -18,16 +18,16 @@
 from qiskit.circuit import QuantumCircuit, QuantumRegister
 from qiskit.circuit.library.standard_gates import CXGate
 
-from circuit_knitting.cutting.qpd import (
+from qiskit_addon_cutting.qpd import (
     SingleQubitQPDGate,
     TwoQubitQPDGate,
     QPDBasis,
 )
-from circuit_knitting.utils.observable_grouping import CommutingObservableGroup
-from circuit_knitting.cutting import generate_cutting_experiments
-from circuit_knitting.cutting.qpd import WeightType
-from circuit_knitting.cutting import partition_problem
-from circuit_knitting.cutting.cutting_experiments import (
+from qiskit_addon_cutting.utils.observable_grouping import CommutingObservableGroup
+from qiskit_addon_cutting import generate_cutting_experiments
+from qiskit_addon_cutting.qpd import WeightType
+from qiskit_addon_cutting import partition_problem
+from qiskit_addon_cutting.cutting_experiments import (
     _append_measurement_register,
     _append_measurement_circuit,
     _remove_final_resets,
diff --git a/test/cutting/test_cutting_reconstruction.py b/test/test_cutting_reconstruction.py
similarity index 97%
rename from test/cutting/test_cutting_reconstruction.py
rename to test/test_cutting_reconstruction.py
index 7b2495b5d..d7b0ef11e 100644
--- a/test/cutting/test_cutting_reconstruction.py
+++ b/test/test_cutting_reconstruction.py
@@ -24,9 +24,9 @@
 from qiskit.primitives.containers import make_data_bin
 from qiskit.quantum_info import Pauli, PauliList, SparsePauliOp
 
-from circuit_knitting.utils.observable_grouping import CommutingObservableGroup
-from circuit_knitting.cutting.qpd import WeightType
-from circuit_knitting.cutting.cutting_reconstruction import (
+from qiskit_addon_cutting.utils.observable_grouping import CommutingObservableGroup
+from qiskit_addon_cutting.qpd import WeightType
+from qiskit_addon_cutting.cutting_reconstruction import (
     _process_outcome,
     reconstruct_expectation_values,
 )
diff --git a/test/cutting/test_cutting_roundtrip.py b/test/test_cutting_roundtrip.py
similarity index 97%
rename from test/cutting/test_cutting_roundtrip.py
rename to test/test_cutting_roundtrip.py
index 43999c199..92d0a4252 100644
--- a/test/cutting/test_cutting_roundtrip.py
+++ b/test/test_cutting_roundtrip.py
@@ -46,13 +46,13 @@
 from qiskit_aer import AerSimulator
 from qiskit_aer.primitives import Sampler, EstimatorV2
 
-from circuit_knitting.utils.simulation import ExactSampler
-from circuit_knitting.cutting import (
+from qiskit_addon_cutting.utils.simulation import ExactSampler
+from qiskit_addon_cutting import (
     partition_problem,
     generate_cutting_experiments,
     reconstruct_expectation_values,
 )
-from circuit_knitting.cutting.instructions import Move
+from qiskit_addon_cutting.instructions import Move
 
 logger = logging.getLogger(__name__)
 
diff --git a/test/cutting/test_cutting_workflows.py b/test/test_cutting_workflows.py
similarity index 96%
rename from test/cutting/test_cutting_workflows.py
rename to test/test_cutting_workflows.py
index 406d92816..d79a348e9 100644
--- a/test/cutting/test_cutting_workflows.py
+++ b/test/test_cutting_workflows.py
@@ -23,10 +23,10 @@
 from qiskit_ibm_runtime import SamplerV2
 from qiskit_aer import AerSimulator
 
-from circuit_knitting.cutting.qpd.instructions import SingleQubitQPDGate
-from circuit_knitting.cutting.qpd import QPDBasis
-from circuit_knitting.cutting.instructions import CutWire, Move
-from circuit_knitting.cutting import (
+from qiskit_addon_cutting.qpd.instructions import SingleQubitQPDGate
+from qiskit_addon_cutting.qpd import QPDBasis
+from qiskit_addon_cutting.instructions import CutWire, Move
+from qiskit_addon_cutting import (
     partition_problem,
     generate_cutting_experiments,
     reconstruct_expectation_values,
diff --git a/test/cutting/test_find_cuts.py b/test/test_find_cuts.py
similarity index 98%
rename from test/cutting/test_find_cuts.py
rename to test/test_find_cuts.py
index 559869ba1..5a8f2d67d 100644
--- a/test/cutting/test_find_cuts.py
+++ b/test/test_find_cuts.py
@@ -19,7 +19,7 @@
 from qiskit import QuantumCircuit
 from qiskit.circuit.library import EfficientSU2
 
-from circuit_knitting.cutting.automated_cut_finding import (
+from qiskit_addon_cutting.automated_cut_finding import (
     find_cuts,
     OptimizationParameters,
     DeviceConstraints,
@@ -31,7 +31,6 @@ def test_find_cuts(self):
         with self.subTest("simple circuit"):
             path_to_circuit = os.path.join(
                 os.path.dirname(__file__),
-                "..",
                 "qasm_circuits",
                 "circuit_find_cuts_test.qasm",
             )
diff --git a/test/cutting/test_wire_cutting_transforms.py b/test/test_wire_cutting_transforms.py
similarity index 97%
rename from test/cutting/test_wire_cutting_transforms.py
rename to test/test_wire_cutting_transforms.py
index a6c5c0a40..498993d63 100644
--- a/test/cutting/test_wire_cutting_transforms.py
+++ b/test/test_wire_cutting_transforms.py
@@ -16,10 +16,10 @@
 from pytest import fixture, mark, raises
 from qiskit.circuit import QuantumCircuit, QuantumRegister, Qubit, ClassicalRegister
 from qiskit.quantum_info import PauliList
-from circuit_knitting.cutting.instructions import Move, CutWire
-from circuit_knitting.cutting.qpd.instructions import TwoQubitQPDGate
-from circuit_knitting.cutting import cut_wires, expand_observables
-from circuit_knitting.cutting.wire_cutting_transforms import _transform_cuts_to_moves
+from qiskit_addon_cutting.instructions import Move, CutWire
+from qiskit_addon_cutting.qpd.instructions import TwoQubitQPDGate
+from qiskit_addon_cutting import cut_wires, expand_observables
+from qiskit_addon_cutting.wire_cutting_transforms import _transform_cuts_to_moves
 
 
 @fixture
diff --git a/test/utils/test_iteration.py b/test/utils/test_iteration.py
index dad24f1de..24b755901 100644
--- a/test/utils/test_iteration.py
+++ b/test/utils/test_iteration.py
@@ -9,7 +9,7 @@
 # copyright notice, and modified files need to carry a notice indicating
 # that they have been altered from the originals.
 
-from circuit_knitting.utils.iteration import (
+from qiskit_addon_cutting.utils.iteration import (
     unique_by_id,
     unique_by_eq,
     strict_zip,
diff --git a/test/utils/test_observable_grouping.py b/test/utils/test_observable_grouping.py
index a193262f1..199d66858 100644
--- a/test/utils/test_observable_grouping.py
+++ b/test/utils/test_observable_grouping.py
@@ -17,7 +17,7 @@
 from qiskit.quantum_info import Pauli, PauliList
 from qiskit.circuit import QuantumCircuit, ClassicalRegister
 
-from circuit_knitting.utils.observable_grouping import *
+from qiskit_addon_cutting.utils.observable_grouping import *
 
 
 @ddt
diff --git a/test/utils/test_simulation.py b/test/utils/test_simulation.py
index 94d4b4ebf..23874a212 100644
--- a/test/utils/test_simulation.py
+++ b/test/utils/test_simulation.py
@@ -15,7 +15,7 @@
 import numpy as np
 from qiskit import QuantumCircuit
 
-from circuit_knitting.utils.simulation import (
+from qiskit_addon_cutting.utils.simulation import (
     simulate_statevector_outcomes,
     ExactSampler,
 )
diff --git a/test/utils/test_transforms.py b/test/utils/test_transforms.py
index 181a7b27f..2fdbebdcc 100644
--- a/test/utils/test_transforms.py
+++ b/test/utils/test_transforms.py
@@ -23,13 +23,13 @@
 from qiskit.circuit.library import EfficientSU2, Measure
 from qiskit.circuit.library.standard_gates import RZZGate
 
-from circuit_knitting.cutting import partition_circuit_qubits
-from circuit_knitting.cutting.qpd import (
+from qiskit_addon_cutting import partition_circuit_qubits
+from qiskit_addon_cutting.qpd import (
     decompose_qpd_instructions,
     TwoQubitQPDGate,
 )
-from circuit_knitting.utils.transforms import separate_circuit
-from circuit_knitting.utils.iteration import strict_zip
+from qiskit_addon_cutting.utils.transforms import separate_circuit
+from qiskit_addon_cutting.utils.iteration import strict_zip
 
 
 def prepare_hwea():
diff --git a/test/utils/test_transpiler_passes.py b/test/utils/test_transpiler_passes.py
index bf195a77d..84cbc9cb3 100644
--- a/test/utils/test_transpiler_passes.py
+++ b/test/utils/test_transpiler_passes.py
@@ -19,7 +19,10 @@
 from qiskit.passmanager.flow_controllers import DoWhileController
 from qiskit.converters import circuit_to_dag
 
-from circuit_knitting.utils.transpiler_passes import RemoveFinalReset, ConsolidateResets
+from qiskit_addon_cutting.utils.transpiler_passes import (
+    RemoveFinalReset,
+    ConsolidateResets,
+)
 
 
 class TestRemoveFinalReset(unittest.TestCase):
diff --git a/tox.ini b/tox.ini
index 4ca775f01..df8b06c01 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,23 +13,23 @@ commands =
 extras =
   style
 commands =
-  ruff check --fix circuit_knitting/ docs/ test/ tools/
+  ruff check --fix qiskit_addon_cutting/ docs/ test/ tools/
   nbqa ruff --fix docs/
-  autoflake --in-place --recursive circuit_knitting/ docs/ test/ tools/
-  black circuit_knitting/ docs/ test/ tools/
+  autoflake --in-place --recursive qiskit_addon_cutting/ docs/ test/ tools/
+  black qiskit_addon_cutting/ docs/ test/ tools/
 
 [testenv:lint]
 extras =
   lint
 commands =
-  ruff check circuit_knitting/ docs/ test/ tools/
+  ruff check qiskit_addon_cutting/ docs/ test/ tools/
   nbqa ruff docs/
-  autoflake --check --quiet --recursive circuit_knitting/ docs/ test/ tools/
-  black --check circuit_knitting/ docs/ test/ tools/
-  pydocstyle circuit_knitting/
-  mypy circuit_knitting/
+  autoflake --check --quiet --recursive qiskit_addon_cutting/ docs/ test/ tools/
+  black --check qiskit_addon_cutting/ docs/ test/ tools/
+  pydocstyle qiskit_addon_cutting/
+  mypy qiskit_addon_cutting/
   reno lint
-  pylint -rn circuit_knitting/ test/ tools/
+  pylint -rn qiskit_addon_cutting/ test/ tools/
   nbqa pylint -rn docs/
 
 [testenv:{,py-,py3-,py38-,py39-,py310-,py311-,py312-}notebook]
@@ -45,7 +45,7 @@ deps =
 extras =
   test
 commands =
-  coverage3 run --source circuit_knitting --parallel-mode -m pytest --run-slow test/ --coverage {posargs}
+  coverage3 run --source qiskit_addon_cutting --parallel-mode -m pytest --run-slow test/ --coverage {posargs}
   coverage3 combine
   coverage3 html
   coverage3 report --fail-under=100 --show-missing

From be27c254cf15348a239fc383726d469256ce36de Mon Sep 17 00:00:00 2001
From: Jim Garrison <garrison@ibm.com>
Date: Fri, 23 Aug 2024 15:57:53 -0400
Subject: [PATCH 08/26] Add note to README about the in-progress rename

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index af115783a..d3597f80c 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,7 @@
+:exclamation: _This repository is in the process of being renamed to `qiskit-addon-cutting`.  The first release under the new name is expected by mid-September._
+
+---
+
 <!-- SHIELDS -->
 <div align="left">
 

From 25d8e6c5ae7f6007b0dc16db7be37ec7df60687b Mon Sep 17 00:00:00 2001
From: Jim Garrison <garrison@ibm.com>
Date: Fri, 23 Aug 2024 16:09:34 -0400
Subject: [PATCH 09/26] Split `extremal-python-dependencies` out into its own
 subpackage (#635)

* Split `extremal-python-dependencies` out into its own subpackage

* Update pyproject.toml

* Add README

* Clarify tox minversion
---
 .../workflows/test_development_versions.yml   |  4 +-
 .github/workflows/test_minimum_versions.yml   |  6 +--
 tools/extremal-python-dependencies/README.md  | 40 +++++++++++++++++++
 .../extremal_python_dependencies/__init__.py  | 10 +++++
 .../extremal_python_dependencies/main.py}     |  5 +--
 .../pyproject.toml                            | 38 ++++++++++++++++++
 6 files changed, 95 insertions(+), 8 deletions(-)
 create mode 100644 tools/extremal-python-dependencies/README.md
 create mode 100644 tools/extremal-python-dependencies/extremal_python_dependencies/__init__.py
 rename tools/{extremal-python-dependencies.py => extremal-python-dependencies/extremal_python_dependencies/main.py} (98%)
 mode change 100755 => 100644
 create mode 100644 tools/extremal-python-dependencies/pyproject.toml

diff --git a/.github/workflows/test_development_versions.yml b/.github/workflows/test_development_versions.yml
index cac3d71fb..faf9a07d5 100644
--- a/.github/workflows/test_development_versions.yml
+++ b/.github/workflows/test_development_versions.yml
@@ -30,8 +30,8 @@ jobs:
         shell: bash
         run: |
           python -m pip install --upgrade pip tox
-          python -m pip install toml typer
-          python tools/extremal-python-dependencies.py pin-dependencies \
+          python -m pip install ./tools/extremal-python-dependencies
+          extremal-python-dependencies pin-dependencies \
               "qiskit @ git+https://github.com/Qiskit/qiskit.git" \
               "qiskit-ibm-runtime @ git+https://github.com/Qiskit/qiskit-ibm-runtime.git" \
               --inplace
diff --git a/.github/workflows/test_minimum_versions.yml b/.github/workflows/test_minimum_versions.yml
index bf454c7c1..0095b4963 100644
--- a/.github/workflows/test_minimum_versions.yml
+++ b/.github/workflows/test_minimum_versions.yml
@@ -28,9 +28,9 @@ jobs:
         shell: bash
         run: |
           python -m pip install --upgrade pip
-          python -m pip install toml typer
-          pip install "tox==$(python tools/extremal-python-dependencies.py get-tox-minversion)"
-          python tools/extremal-python-dependencies.py pin-dependencies-to-minimum --inplace
+          python -m pip install ./tools/extremal-python-dependencies
+          pip install "tox==$(extremal-python-dependencies get-tox-minversion)"
+          extremal-python-dependencies pin-dependencies-to-minimum --inplace
       - name: Modify tox.ini for more thorough check
         shell: bash
         run: |
diff --git a/tools/extremal-python-dependencies/README.md b/tools/extremal-python-dependencies/README.md
new file mode 100644
index 000000000..397cb58ac
--- /dev/null
+++ b/tools/extremal-python-dependencies/README.md
@@ -0,0 +1,40 @@
+# extremal-python-dependencies
+
+Install extremal versions of package dependencies for more robust continuous integration testing, given a package that specifies its dependencies in a `pyproject.toml` file.
+
+For instance, one might use this utility to install the minimum supported version of each dependency before a CI run.  Ensuring all tests then pass ensures that the code is indeed compatible with the range of package versions it claims to be compatible with, helping to prevent users from encountering broken installs.
+
+Another way to use this tool is to install development versions of certain packages.
+
+This utility works with dependencies specified in a `pyproject.toml` file.  It modifies `pyproject.toml`, either by sending the transformed version to stdout (the default) or by modifying in place (which may be useful in CI scripts).
+
+## How to use
+
+The following snippet modifies `pyproject.toml` in place to test with the minimum supported version of each direct dependency, under the minimum supported [tox](https://tox.wiki/) version (as specified by `minversion` in `tox.ini`).
+
+```sh
+pip install "tox==$(extremal-python-dependencies get-tox-minversion)"
+extremal-python-dependencies pin-dependencies-to-minimum --inplace
+tox -epy
+```
+
+The following snippet modifies `pyproject.toml` in place to test with the development version of one or more dependencies:
+
+```sh
+extremal-python-dependencies pin-dependencies \
+    "qiskit @ git+https://github.com/Qiskit/qiskit.git" \
+    "qiskit-ibm-runtime @ git+https://github.com/Qiskit/qiskit-ibm-runtime.git" \
+    --inplace
+tox -epy
+```
+
+Each of the above patterns can be used in a CI script.
+
+## Caveats
+
+- The minimum versions of all optional dependencies installed simultaneously must be compatible with each other.
+- This tool does not set the minimum supported version of transitive dependencies.
+
+## Similar tools
+
+- [requirements-builder](https://requirements-builder.readthedocs.io/) (builds requirements from a `setup.py` file instead of a `pyproject.toml` file)
diff --git a/tools/extremal-python-dependencies/extremal_python_dependencies/__init__.py b/tools/extremal-python-dependencies/extremal_python_dependencies/__init__.py
new file mode 100644
index 000000000..75efffef4
--- /dev/null
+++ b/tools/extremal-python-dependencies/extremal_python_dependencies/__init__.py
@@ -0,0 +1,10 @@
+# This code is a Qiskit project.
+
+# (C) Copyright IBM 2024.
+
+# This code is licensed under the Apache License, Version 2.0. You may
+# obtain a copy of this license in the LICENSE.txt file in the root directory
+# of this source tree or at http://www.apache.org/licenses/LICENSE-2.0.
+# Any modifications or derivative works of this code must retain this
+# copyright notice, and modified files need to carry a notice indicating
+# that they have been altered from the originals.
diff --git a/tools/extremal-python-dependencies.py b/tools/extremal-python-dependencies/extremal_python_dependencies/main.py
old mode 100755
new mode 100644
similarity index 98%
rename from tools/extremal-python-dependencies.py
rename to tools/extremal-python-dependencies/extremal_python_dependencies/main.py
index e64e48b55..9f962331c
--- a/tools/extremal-python-dependencies.py
+++ b/tools/extremal-python-dependencies/extremal_python_dependencies/main.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 # This code is a Qiskit project.
 
 # (C) Copyright IBM 2022.
@@ -151,5 +150,5 @@ def _save_pyproject_toml(d: dict, inplace: bool) -> None:
         print(toml.dumps(d))
 
 
-if __name__ == "__main__":
-    app()
+def main():
+    return app()
diff --git a/tools/extremal-python-dependencies/pyproject.toml b/tools/extremal-python-dependencies/pyproject.toml
new file mode 100644
index 000000000..0023036dc
--- /dev/null
+++ b/tools/extremal-python-dependencies/pyproject.toml
@@ -0,0 +1,38 @@
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[project]
+name = "extremal-python-dependencies"
+version = "0.0.0"
+description = "A utility for installing extremal versions of dependencies for more robust testing"
+readme = "README.md"
+license = {file = "../../LICENSE.txt"}
+classifiers = [
+    "Development Status :: 3 - Alpha",
+    "Intended Audience :: Developers",
+    "License :: OSI Approved :: Apache Software License",
+    "Natural Language :: English",
+    "Operating System :: MacOS",
+    "Operating System :: POSIX :: Linux",
+    "Programming Language :: Python :: 3.8",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+]
+
+requires-python = ">=3.8"
+
+dependencies = [
+    "toml==0.10.2",
+    "typer==0.12.3",
+]
+
+[tool.hatch.build.targets.wheel]
+only-include = [
+    "extremal_python_dependencies",
+]
+
+[project.scripts]
+extremal-python-dependencies = "extremal_python_dependencies.main:main"

From f71279c471465ab0c6b5da2474ce891a5d3fb76f Mon Sep 17 00:00:00 2001
From: Jim Garrison <garrison@ibm.com>
Date: Fri, 23 Aug 2024 16:29:54 -0400
Subject: [PATCH 10/26] Use `qiskit_addon_cutting.__version__` in
 `docs/conf.py` (#665)

We might as well do this, to make sure it is set properly.

And it fixes an instance of don't-repeat-yourself.
---
 docs/conf.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 370e5abd5..1448e0ba7 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -21,7 +21,7 @@
 import os
 import sys
 
-from importlib.metadata import version as metadata_version
+import qiskit_addon_cutting
 
 project = "Circuit Knitting Toolbox"
 copyright = "2024"  # pylint: disable=redefined-builtin
@@ -31,7 +31,7 @@
 sys.path.insert(0, str(_rootdir))
 
 # The full version, including alpha/beta/rc tags
-release = metadata_version("qiskit-addon-cutting")
+release = qiskit_addon_cutting.__version__
 # The short X.Y version
 version = ".".join(release.split(".")[:2])
 

From 95a3ad2f57b58013683567a3f5ea80cf6df68e72 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 3 Sep 2024 09:26:38 -0400
Subject: [PATCH 11/26] Bump mypy from 1.11.1 to 1.11.2 (#672)

Bumps [mypy](https://github.com/python/mypy) from 1.11.1 to 1.11.2.
- [Changelog](https://github.com/python/mypy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/python/mypy/compare/v1.11.1...v1.11.2)

---
updated-dependencies:
- dependency-name: mypy
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index e8a7a68b9..272218a36 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -60,7 +60,7 @@ style = [
 lint = [
     "qiskit-addon-cutting[style]",
     "pydocstyle==6.3.0",
-    "mypy==1.11.1",
+    "mypy==1.11.2",
     "reno>=3.4.0",
     "pylint==3.2.6",
     # pydocstyle prefers to parse our pyproject.toml, hence the following line

From 5d842f5e5456c26f6bb17ce3b5b73a6b08e96c49 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 3 Sep 2024 09:27:21 -0400
Subject: [PATCH 12/26] Bump pylint from 3.2.6 to 3.2.7 (#669)

Bumps [pylint](https://github.com/pylint-dev/pylint) from 3.2.6 to 3.2.7.
- [Release notes](https://github.com/pylint-dev/pylint/releases)
- [Commits](https://github.com/pylint-dev/pylint/compare/v3.2.6...v3.2.7)

---
updated-dependencies:
- dependency-name: pylint
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 272218a36..f01216adc 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -62,7 +62,7 @@ lint = [
     "pydocstyle==6.3.0",
     "mypy==1.11.2",
     "reno>=3.4.0",
-    "pylint==3.2.6",
+    "pylint==3.2.7",
     # pydocstyle prefers to parse our pyproject.toml, hence the following line
     "toml",
 ]

From 28ebf42bec2d6a9fd42955f2a31ea3c7dc06ed30 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 3 Sep 2024 09:27:56 -0400
Subject: [PATCH 13/26] Bump ruff from 0.5.5 to 0.6.3 (#671)

Bumps [ruff](https://github.com/astral-sh/ruff) from 0.5.5 to 0.6.3.
- [Release notes](https://github.com/astral-sh/ruff/releases)
- [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md)
- [Commits](https://github.com/astral-sh/ruff/compare/0.5.5...0.6.3)

---
updated-dependencies:
- dependency-name: ruff
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index f01216adc..a3293c311 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -54,7 +54,7 @@ nbtest = [
 style = [
     "autoflake==2.3.1",
     "black[jupyter]~=24.1",
-    "ruff==0.5.5",
+    "ruff==0.6.3",
     "nbqa>=1.6.0",
 ]
 lint = [

From d27efbb755c6cdccd17b227eb86fc8ac6a816fbd Mon Sep 17 00:00:00 2001
From: Jim Garrison <garrison@ibm.com>
Date: Tue, 3 Sep 2024 17:01:41 -0400
Subject: [PATCH 14/26] Install extremal-python-dependencies from pypi (#673)

* Install extremal-python-dependencies from pypi

This removes extremal-python-dependencies from this repository,
as it now lives at https://github.com/IBM/extremal-python-dependencies
and has releases [available on PyPI](https://pypi.org/project/extremal-python-dependencies/).

* Remove mentions of `tools/` directory from `tox.ini`
---
 .../workflows/test_development_versions.yml   |   2 +-
 .github/workflows/test_minimum_versions.yml   |   2 +-
 tools/extremal-python-dependencies/README.md  |  40 -----
 .../extremal_python_dependencies/__init__.py  |  10 --
 .../extremal_python_dependencies/main.py      | 154 ------------------
 .../pyproject.toml                            |  38 -----
 tox.ini                                       |  14 +-
 7 files changed, 9 insertions(+), 251 deletions(-)
 delete mode 100644 tools/extremal-python-dependencies/README.md
 delete mode 100644 tools/extremal-python-dependencies/extremal_python_dependencies/__init__.py
 delete mode 100644 tools/extremal-python-dependencies/extremal_python_dependencies/main.py
 delete mode 100644 tools/extremal-python-dependencies/pyproject.toml

diff --git a/.github/workflows/test_development_versions.yml b/.github/workflows/test_development_versions.yml
index faf9a07d5..41aa68e2b 100644
--- a/.github/workflows/test_development_versions.yml
+++ b/.github/workflows/test_development_versions.yml
@@ -30,7 +30,7 @@ jobs:
         shell: bash
         run: |
           python -m pip install --upgrade pip tox
-          python -m pip install ./tools/extremal-python-dependencies
+          python -m pip install extremal-python-dependencies==0.0.3
           extremal-python-dependencies pin-dependencies \
               "qiskit @ git+https://github.com/Qiskit/qiskit.git" \
               "qiskit-ibm-runtime @ git+https://github.com/Qiskit/qiskit-ibm-runtime.git" \
diff --git a/.github/workflows/test_minimum_versions.yml b/.github/workflows/test_minimum_versions.yml
index 0095b4963..646766ee4 100644
--- a/.github/workflows/test_minimum_versions.yml
+++ b/.github/workflows/test_minimum_versions.yml
@@ -28,7 +28,7 @@ jobs:
         shell: bash
         run: |
           python -m pip install --upgrade pip
-          python -m pip install ./tools/extremal-python-dependencies
+          python -m pip install extremal-python-dependencies==0.0.3
           pip install "tox==$(extremal-python-dependencies get-tox-minversion)"
           extremal-python-dependencies pin-dependencies-to-minimum --inplace
       - name: Modify tox.ini for more thorough check
diff --git a/tools/extremal-python-dependencies/README.md b/tools/extremal-python-dependencies/README.md
deleted file mode 100644
index 397cb58ac..000000000
--- a/tools/extremal-python-dependencies/README.md
+++ /dev/null
@@ -1,40 +0,0 @@
-# extremal-python-dependencies
-
-Install extremal versions of package dependencies for more robust continuous integration testing, given a package that specifies its dependencies in a `pyproject.toml` file.
-
-For instance, one might use this utility to install the minimum supported version of each dependency before a CI run.  Ensuring all tests then pass ensures that the code is indeed compatible with the range of package versions it claims to be compatible with, helping to prevent users from encountering broken installs.
-
-Another way to use this tool is to install development versions of certain packages.
-
-This utility works with dependencies specified in a `pyproject.toml` file.  It modifies `pyproject.toml`, either by sending the transformed version to stdout (the default) or by modifying in place (which may be useful in CI scripts).
-
-## How to use
-
-The following snippet modifies `pyproject.toml` in place to test with the minimum supported version of each direct dependency, under the minimum supported [tox](https://tox.wiki/) version (as specified by `minversion` in `tox.ini`).
-
-```sh
-pip install "tox==$(extremal-python-dependencies get-tox-minversion)"
-extremal-python-dependencies pin-dependencies-to-minimum --inplace
-tox -epy
-```
-
-The following snippet modifies `pyproject.toml` in place to test with the development version of one or more dependencies:
-
-```sh
-extremal-python-dependencies pin-dependencies \
-    "qiskit @ git+https://github.com/Qiskit/qiskit.git" \
-    "qiskit-ibm-runtime @ git+https://github.com/Qiskit/qiskit-ibm-runtime.git" \
-    --inplace
-tox -epy
-```
-
-Each of the above patterns can be used in a CI script.
-
-## Caveats
-
-- The minimum versions of all optional dependencies installed simultaneously must be compatible with each other.
-- This tool does not set the minimum supported version of transitive dependencies.
-
-## Similar tools
-
-- [requirements-builder](https://requirements-builder.readthedocs.io/) (builds requirements from a `setup.py` file instead of a `pyproject.toml` file)
diff --git a/tools/extremal-python-dependencies/extremal_python_dependencies/__init__.py b/tools/extremal-python-dependencies/extremal_python_dependencies/__init__.py
deleted file mode 100644
index 75efffef4..000000000
--- a/tools/extremal-python-dependencies/extremal_python_dependencies/__init__.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# This code is a Qiskit project.
-
-# (C) Copyright IBM 2024.
-
-# This code is licensed under the Apache License, Version 2.0. You may
-# obtain a copy of this license in the LICENSE.txt file in the root directory
-# of this source tree or at http://www.apache.org/licenses/LICENSE-2.0.
-# Any modifications or derivative works of this code must retain this
-# copyright notice, and modified files need to carry a notice indicating
-# that they have been altered from the originals.
diff --git a/tools/extremal-python-dependencies/extremal_python_dependencies/main.py b/tools/extremal-python-dependencies/extremal_python_dependencies/main.py
deleted file mode 100644
index 9f962331c..000000000
--- a/tools/extremal-python-dependencies/extremal_python_dependencies/main.py
+++ /dev/null
@@ -1,154 +0,0 @@
-# This code is a Qiskit project.
-
-# (C) Copyright IBM 2022.
-
-# This code is licensed under the Apache License, Version 2.0. You may
-# obtain a copy of this license in the LICENSE.txt file in the root directory
-# of this source tree or at http://www.apache.org/licenses/LICENSE-2.0.
-# Any modifications or derivative works of this code must retain this
-# copyright notice, and modified files need to carry a notice indicating
-# that they have been altered from the originals.
-
-import re
-import configparser
-from typing import List
-
-import toml
-import typer
-
-
-# https://peps.python.org/pep-0508/#names
-_name_re = re.compile(r"^([A-Z0-9][A-Z0-9._-]*[A-Z0-9])", re.IGNORECASE)
-
-
-def mapfunc_replace(replacements: List[str]):
-    """Use the provided version(s) of certain packages"""
-    d: dict[str, str] = {}
-    for r in replacements:
-        match = _name_re.match(r)
-        if match is None:
-            raise RuntimeError(f"Replacement dependency does not match PEP 508: {r}")
-        name = match.group()
-        if name in d:
-            raise RuntimeError("Duplicate name")
-        d[name] = r
-
-    def _mapfunc_replace(dep):
-        # Replace https://peps.python.org/pep-0508/#names with provided
-        # version, often a https://peps.python.org/pep-0440/#direct-references
-        match = _name_re.match(dep)
-        if match is None:
-            raise RuntimeError(f"Dependency does not match PEP 508: `{dep}`")
-        dep_name = match.group()
-        return d.get(dep_name, dep)
-
-    return _mapfunc_replace
-
-
-def mapfunc_minimum(dep):
-    """Set each dependency to its minimum version"""
-    for clause in dep.split(","):
-        if "*" in clause and "==" in clause:
-            raise ValueError(
-                "Asterisks in version specifiers are not currently supported "
-                "by the minimum version tests.  We recommend using the "
-                "'compatible release' operator instead: "
-                "https://peps.python.org/pep-0440/#compatible-release"
-            )
-    return re.sub(r"[>~]=", r"==", dep)
-
-
-def inplace_map(fun, lst: list):
-    """In-place version of Python's `map` function"""
-    for i, x in enumerate(lst):
-        lst[i] = fun(x)
-
-
-def process_dependencies_in_place(d: dict, mapfunc):
-    """Given a parsed `pyproject.toml`, process dependencies according to `mapfunc`"""
-    proj = d["project"]
-
-    try:
-        deps = proj["dependencies"]
-    except KeyError:
-        pass  # no dependencies; that's unusual, but fine.
-    else:
-        inplace_map(mapfunc, deps)
-
-    try:
-        opt_deps = proj["optional-dependencies"]
-    except KeyError:
-        pass  # no optional dependencies; that's fine.
-    else:
-        for dependencies_list in opt_deps.values():
-            inplace_map(mapfunc, dependencies_list)
-
-    try:
-        build_system = d["build-system"]
-    except KeyError:
-        pass
-    else:
-        try:
-            build_system_requires = build_system["requires"]
-        except KeyError:
-            pass
-        else:
-            inplace_map(mapfunc, build_system_requires)
-
-
-app = typer.Typer()
-
-
-@app.command()
-def get_tox_minversion():
-    """Extract tox minversion from `tox.ini`"""
-    config = configparser.ConfigParser()
-    config.read("tox.ini")
-    print(config["tox"]["minversion"])
-
-
-def _pin_dependencies(mapfunc, inplace: bool):
-    with open("pyproject.toml") as f:
-        d = toml.load(f)
-    process_dependencies_in_place(d, mapfunc)
-
-    # Modify pyproject.toml so hatchling will allow direct references
-    # as dependencies.
-    d.setdefault("tool", {}).setdefault("hatch", {}).setdefault("metadata", {})[
-        "allow-direct-references"
-    ] = True
-
-    _save_pyproject_toml(d, inplace)
-
-
-@app.command()
-def pin_dependencies_to_minimum(inplace: bool = False):
-    """Pin all dependencies in `pyproject.toml` to their minimum versions."""
-    _pin_dependencies(mapfunc_minimum, inplace)
-
-
-@app.command()
-def pin_dependencies(replacements: List[str], inplace: bool = False):
-    """Pin dependencies in `pyproject.toml` to the provided versions."""
-    _pin_dependencies(mapfunc_replace(replacements), inplace)
-
-
-@app.command()
-def add_dependency(dependency: str, inplace: bool = False):
-    """Add a dependency to `pyproject.toml`."""
-    with open("pyproject.toml") as f:
-        d = toml.load(f)
-    d["project"]["dependencies"].append(dependency)
-    _save_pyproject_toml(d, inplace)
-
-
-def _save_pyproject_toml(d: dict, inplace: bool) -> None:
-    if inplace:
-        with open("pyproject.toml", "w") as f:
-            toml.dump(d, f)
-    else:
-        print(toml.dumps(d))
-
-
-def main():
-    return app()
diff --git a/tools/extremal-python-dependencies/pyproject.toml b/tools/extremal-python-dependencies/pyproject.toml
deleted file mode 100644
index 0023036dc..000000000
--- a/tools/extremal-python-dependencies/pyproject.toml
+++ /dev/null
@@ -1,38 +0,0 @@
-[build-system]
-requires = ["hatchling"]
-build-backend = "hatchling.build"
-
-[project]
-name = "extremal-python-dependencies"
-version = "0.0.0"
-description = "A utility for installing extremal versions of dependencies for more robust testing"
-readme = "README.md"
-license = {file = "../../LICENSE.txt"}
-classifiers = [
-    "Development Status :: 3 - Alpha",
-    "Intended Audience :: Developers",
-    "License :: OSI Approved :: Apache Software License",
-    "Natural Language :: English",
-    "Operating System :: MacOS",
-    "Operating System :: POSIX :: Linux",
-    "Programming Language :: Python :: 3.8",
-    "Programming Language :: Python :: 3.9",
-    "Programming Language :: Python :: 3.10",
-    "Programming Language :: Python :: 3.11",
-    "Programming Language :: Python :: 3.12",
-]
-
-requires-python = ">=3.8"
-
-dependencies = [
-    "toml==0.10.2",
-    "typer==0.12.3",
-]
-
-[tool.hatch.build.targets.wheel]
-only-include = [
-    "extremal_python_dependencies",
-]
-
-[project.scripts]
-extremal-python-dependencies = "extremal_python_dependencies.main:main"
diff --git a/tox.ini b/tox.ini
index df8b06c01..d748393ef 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,23 +13,23 @@ commands =
 extras =
   style
 commands =
-  ruff check --fix qiskit_addon_cutting/ docs/ test/ tools/
+  ruff check --fix qiskit_addon_cutting/ docs/ test/
   nbqa ruff --fix docs/
-  autoflake --in-place --recursive qiskit_addon_cutting/ docs/ test/ tools/
-  black qiskit_addon_cutting/ docs/ test/ tools/
+  autoflake --in-place --recursive qiskit_addon_cutting/ docs/ test/
+  black qiskit_addon_cutting/ docs/ test/
 
 [testenv:lint]
 extras =
   lint
 commands =
-  ruff check qiskit_addon_cutting/ docs/ test/ tools/
+  ruff check qiskit_addon_cutting/ docs/ test/
   nbqa ruff docs/
-  autoflake --check --quiet --recursive qiskit_addon_cutting/ docs/ test/ tools/
-  black --check qiskit_addon_cutting/ docs/ test/ tools/
+  autoflake --check --quiet --recursive qiskit_addon_cutting/ docs/ test/
+  black --check qiskit_addon_cutting/ docs/ test/
   pydocstyle qiskit_addon_cutting/
   mypy qiskit_addon_cutting/
   reno lint
-  pylint -rn qiskit_addon_cutting/ test/ tools/
+  pylint -rn qiskit_addon_cutting/ test/
   nbqa pylint -rn docs/
 
 [testenv:{,py-,py3-,py38-,py39-,py310-,py311-,py312-}notebook]

From 28e949692340e61fed5b9b44baaefb1d95061b1a Mon Sep 17 00:00:00 2001
From: Jim Garrison <garrison@ibm.com>
Date: Wed, 4 Sep 2024 10:49:32 -0400
Subject: [PATCH 15/26] Update deprecation policy (#667)

* Updated deprecation policy

* drop "do our best to"

* Update `index.rst`
---
 README.md      | 2 +-
 docs/index.rst | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index d3597f80c..86de7246a 100644
--- a/README.md
+++ b/README.md
@@ -62,7 +62,7 @@ For information on installing from source, running CKT in a container, and platf
 
 ### Deprecation Policy
 
-This project is meant to evolve rapidly and, as such, does not follow [Qiskit's deprecation policy](https://github.com/Qiskit/qiskit/blob/main/DEPRECATION.md).  We may occasionally make breaking changes in order to improve the user experience.  When possible, we will keep old interfaces and mark them as deprecated, as long as they can co-exist with the new ones.  Each substantial improvement, breaking change, or deprecation will be documented in the [release notes](https://qiskit-extensions.github.io/circuit-knitting-toolbox/release-notes.html).
+We follow [semantic versioning](https://semver.org/) and are guided by the principles in [Qiskit's deprecation policy](https://github.com/Qiskit/qiskit/blob/main/DEPRECATION.md).  We may occasionally make breaking changes in order to improve the user experience.  When possible, we will keep old interfaces and mark them as deprecated, as long as they can co-exist with the new ones.  Each substantial improvement, breaking change, or deprecation will be documented in the [release notes](https://qiskit-extensions.github.io/circuit-knitting-toolbox/release-notes.html).
 
 ----------------------------------------------------------------------------------------------------
 
diff --git a/docs/index.rst b/docs/index.rst
index 246ddc35b..d8022f570 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -14,7 +14,7 @@ The toolbox currently contains the following tools:
 
 For a more detailed discussion on circuit cutting, check out our `technical guide <./circuit_cutting/explanation/index.rst#overview-of-circuit-cutting>`__.
 
-This project is meant to evolve rapidly and, as such, does not follow `Qiskit's deprecation policy <https://github.com/Qiskit/qiskit/blob/main/DEPRECATION.md>`__.  We may occasionally make breaking changes in order to improve the user experience.  When possible, we will keep old interfaces and mark them as deprecated, as long as they can co-exist with the new ones.  Each substantial improvement, breaking change, or deprecation will be documented in the :ref:`release notes`.
+We follow `semantic versioning <https://semver.org/>`__ and are guided by the principles in  `Qiskit's deprecation policy <https://github.com/Qiskit/qiskit/blob/main/DEPRECATION.md>`__.  We may occasionally make breaking changes in order to improve the user experience.  When possible, we will keep old interfaces and mark them as deprecated, as long as they can co-exist with the new ones.  Each substantial improvement, breaking change, or deprecation will be documented in the :ref:`release notes`.
 
 Citing this project
 -------------------

From 6670aded89e0cd687f8abfa0399e2f9c7d774ac4 Mon Sep 17 00:00:00 2001
From: Jim Garrison <garrison@ibm.com>
Date: Thu, 5 Sep 2024 20:52:28 -0400
Subject: [PATCH 16/26] Remove "prototype" handling from `citation.yml`
 workflow (#677)

* Remove "prototype" handling from `citation.yml` workflow

* `preview.pdf` -> `citation-preview.pdf`
---
 .github/workflows/citation.yml | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/citation.yml b/.github/workflows/citation.yml
index f8cab13b2..6a018f0ff 100644
--- a/.github/workflows/citation.yml
+++ b/.github/workflows/citation.yml
@@ -34,36 +34,35 @@ jobs:
         run: |
           if [ -f "CITATION.bib" ]; then
           arr=(${GITHUB_REPOSITORY//\// })
-          REPO=${arr[1]}
-          export PROTOTYPE=${REPO#"prototype-"}
-          cat <<- EOF > preview.tex
+          export REPO=${arr[1]}
+          cat <<- EOF > citation-preview.tex
           \documentclass[preprint,aps,physrev,notitlepage]{revtex4-2}
           \usepackage{hyperref}
           \begin{document}
-          \title{\texttt{$PROTOTYPE} BibTeX test}
+          \title{\texttt{$REPO} BibTeX test}
           \maketitle
           \noindent
-          \texttt{$PROTOTYPE}
-          \cite{$PROTOTYPE}
+          \texttt{$REPO}
+          \cite{$REPO}
           \bibliography{CITATION}
           \end{document}
           EOF
-          pdflatex preview
+          pdflatex citation-preview
           fi
       - name: Run BibTeX
         run: |
           if [ -f "CITATION.bib" ]; then
-          bibtex preview
+          bibtex citation-preview
           fi
       - name: Re-run LaTeX
         run: |
           if [ -f "CITATION.bib" ]; then
-          pdflatex preview
-          pdflatex preview
+          pdflatex citation-preview
+          pdflatex citation-preview
           fi
       - name: Upload PDF
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: preview.pdf
-          path: preview.pdf
+          name: citation-preview.pdf
+          path: citation-preview.pdf

From d828281177041b1f0898878b6e692f9ef5dc4c95 Mon Sep 17 00:00:00 2001
From: Jim Garrison <garrison@ibm.com>
Date: Fri, 6 Sep 2024 13:26:15 -0400
Subject: [PATCH 17/26] Update release workflow (#674)

---
 .github/workflows/release.yml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e9fb165da..80fde5991 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -26,22 +26,22 @@ jobs:
     name: pypi
     runs-on: ubuntu-latest
     needs: github
+    environment:
+      name: pypi
+      url: https://pypi.org/p/qiskit-addon-cutting
+    permissions:
+      id-token: write
     steps:
       - name: Checkout tag
         uses: actions/checkout@v4
         with:
           ref: ${{ github.ref_name }}
-      - name: Install hatch
+      - name: Install `build` tool
         run: |
           python -m pip install --upgrade pip
-          pip install hatch
-      - name: Build using hatch
+          pip install build
+      - name: Build distribution
         run: |
-          hatch build
-      - name: Publish release
-        env:
-          HATCH_INDEX_REPO: https://upload.pypi.org/legacy/
-          HATCH_INDEX_USER: __token__
-          HATCH_INDEX_AUTH: ${{ secrets.PYPI_TOKEN }}
-        run: |
-          hatch publish
+          python -m build
+      - name: Publish release to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1

From 1ad9cda52a46a26e6fc8fd15fc781bed07df49cf Mon Sep 17 00:00:00 2001
From: Jim Garrison <garrison@ibm.com>
Date: Fri, 6 Sep 2024 13:27:30 -0400
Subject: [PATCH 18/26] Upgrade to qiskit-sphinx-theme 2.0.0 (#676)

This upgrades to qiskit-sphinx-theme 2.0.0. It includes the Qiskit
logo because the logo is no longer included in the theme.

qiskit-sphinx-theme 2.0 supports dark mode as a new feature, so
both light and dark versions of the logo are included.

This implements the same change as the PR at
https://github.com/Qiskit/qiskit-serverless/pull/1481.
---
 docs/_static/images/qiskit-dark-logo.svg  | 178 ++++++++++++++++++++++
 docs/_static/images/qiskit-light-logo.svg | 178 ++++++++++++++++++++++
 docs/conf.py                              |   3 +
 pyproject.toml                            |   2 +-
 4 files changed, 360 insertions(+), 1 deletion(-)
 create mode 100644 docs/_static/images/qiskit-dark-logo.svg
 create mode 100644 docs/_static/images/qiskit-light-logo.svg

diff --git a/docs/_static/images/qiskit-dark-logo.svg b/docs/_static/images/qiskit-dark-logo.svg
new file mode 100644
index 000000000..b52089083
--- /dev/null
+++ b/docs/_static/images/qiskit-dark-logo.svg
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   width="79.653473"
+   height="25.659819"
+   viewBox="0 0 79.653473 25.659819"
+   fill="none"
+   version="1.1"
+   id="svg68">
+  <g
+     clip-path="url(#clip0_205_200)"
+     id="g32"
+     transform="translate(-0.09862329,-3.0623815)">
+    <path
+       d="m 39.1853,26.1607 h -2.049 c -1.6134,0 -2.359,-0.916 -2.359,-2.3818 v -1.136 c -3.2286,-0.4269 -5.2776,-3.0835 -5.2776,-7.6659 0,-5.03117 2.4635,-7.72999 6.2304,-7.72999 3.7669,0 6.2286,2.69882 6.2286,7.72999 0,4.4541 -1.9233,7.0888 -4.9871,7.6238 v 1.5409 h 2.1677 z m 0.2692,-10.0001 v -2.3507 c 0,-2.7189 -1.4894,-4.39724 -3.7191,-4.39724 -2.2297,0 -3.7191,1.67094 -3.7191,4.39724 v 2.3507 c 0,2.719 1.4894,4.3973 3.7191,4.3973 2.2297,0 3.7191,-1.6783 3.7191,-4.3973 z"
+       fill="#d0d0d0"
+       id="path2" />
+    <path
+       d="M 43.6217,8.5442 V 8.17776 c 0,-0.70723 0.4144,-1.22024 1.346,-1.22024 0.9315,0 1.3247,0.51301 1.3247,1.22024 V 8.5442 c 0,0.70539 -0.3932,1.22024 -1.3247,1.22024 -0.9316,0 -1.346,-0.51485 -1.346,-1.22024 z"
+       fill="#d0d0d0"
+       id="path4" />
+    <path
+       d="m 46.0852,11.3218 h -2.2563 v 11.1343 h 2.2563 z"
+       fill="#d0d0d0"
+       id="path6" />
+    <path
+       d="m 47.9678,20.6147 1.4433,-1.3705 c 0.7864,0.9857 1.7587,1.5849 3.0426,1.5849 1.284,0 1.9659,-0.5497 1.9659,-1.4988 0,-0.7072 -0.4145,-1.2422 -1.532,-1.3924 l -0.9935,-0.1283 c -2.1943,-0.2785 -3.542,-1.2642 -3.542,-3.3199 0,-2.162 1.6346,-3.4262 3.9936,-3.4262 1.9481,0 3.0426,0.6651 4.0167,1.7772 l -1.3867,1.3705 c -0.3227,-0.3964 -0.7253,-0.7148 -1.1797,-0.9329 -0.4544,-0.2181 -0.9494,-0.3306 -1.4503,-0.3295 -1.2397,0 -1.8206,0.5497 -1.8206,1.3906 0,0.841 0.5171,1.2423 1.6559,1.4365 l 0.9935,0.1282 c 2.359,0.3665 3.4145,1.4346 3.4145,3.232 0,2.1419 -1.6753,3.5765 -4.2628,3.5765 -2.0207,0 -3.3454,-0.7915 -4.3584,-2.0979 z"
+       fill="#d0d0d0"
+       id="path8" />
+    <path
+       d="m 58.128,6.60944 h 2.2634 v 9.72166 h 0.1027 l 1.4912,-1.9916 2.5874,-3.0177 h 2.6282 l -3.774,4.3039 4.2256,6.8304 h -2.6937 l -3.0851,-5.3134 -1.4823,1.6728 v 3.6406 H 58.128 Z"
+       fill="#d0d0d0"
+       id="path10" />
+    <path
+       d="M 69.2181,8.5442 V 8.17776 c 0,-0.70723 0.4144,-1.22024 1.346,-1.22024 0.9315,0 1.3229,0.51301 1.3229,1.22024 V 8.5442 c 0,0.70539 -0.3932,1.22024 -1.3229,1.22024 -0.9298,0 -1.346,-0.51485 -1.346,-1.22024 z"
+       fill="#d0d0d0"
+       id="path12" />
+    <path
+       d="m 71.6816,11.3218 h -2.2563 v 11.1343 h 2.2563 z"
+       fill="#d0d0d0"
+       id="path14" />
+    <path
+       d="m 77.6198,22.4561 c -1.5532,0 -2.3803,-0.8996 -2.3803,-2.4203 v -6.8085 h -1.6771 v -1.9055 h 0.9121 c 0.7438,0 0.9917,-0.3224 0.9917,-1.0993 V 8.2804 h 2.0296 v 3.0414 h 2.2563 v 1.9055 h -2.2563 v 7.3288 h 2.0898 v 1.9055 z"
+       fill="#d0d0d0"
+       id="path16" />
+    <path
+       d="m 23.225,21.8972 c -0.0248,-2.3726 -5.4069,-3.712 -10.4737,-3.7706 -5.37505,0 -10.93602,1.4071 -10.95373,3.7633 v 0.0147 c 0.02126,2.3672 5.40689,3.7047 10.47373,3.7633 5.375,0 10.936,-1.4071 10.9537,-3.7633 z m -10.9555,2.9059 c -5.66718,-0.066 -9.62184,-1.5812 -9.63601,-2.904 0.02302,-1.3742 4.3372,-2.9059 10.11781,-2.9059 5.6672,0.066 9.6219,1.5812 9.636,2.904 -0.0159,1.3724 -4.339,2.9059 -10.1178,2.9059 z"
+       fill="url(#paint0_radial_205_200)"
+       id="path18"
+       style="fill:url(#paint0_radial_205_200)" />
+    <path
+       d="M 12.5334,28.713 C 10.3385,28.7199 8.18119,28.1239 6.2819,26.9857 4.38261,25.8475 2.80946,24.2081 1.72321,22.2349 0.636959,20.2617 0.0765634,18.0256 0.0992879,15.755 0.122012,13.4843 0.727043,11.2607 1.85255,9.31117 2.97806,7.36168 4.58368,5.75629 6.50535,4.65905 8.42701,3.56181 10.5958,3.01207 12.7901,3.066 c 2.1943,0.05392 4.3354,0.70959 6.2046,1.9 1.8691,1.1904 3.3992,2.87286 4.434,4.87544 v 0 c 1.0109,1.95086 1.5162,4.13926 1.4666,6.35216 -0.0495,2.2129 -0.6522,4.3748 -1.7493,6.2751 -1.0971,1.9004 -2.6513,3.4743 -4.5111,4.5686 -1.8598,1.0943 -3.9619,1.6716 -6.1015,1.6757 z M 12.4945,3.94544 C 9.96864,3.95097 7.51422,4.81303 5.50722,6.39954 3.50021,7.98606 2.0513,10.2095 1.38245,12.7293 c -0.66885,2.5199 -0.520747,5.197 0.42162,7.6214 0.94236,2.4245 2.62702,4.4624 4.79588,5.8017 2.16887,1.3392 4.70235,1.906 7.21225,1.6133 2.51,-0.2926 4.858,-1.4284 6.6843,-3.2335 1.8264,-1.8051 3.0303,-4.1798 3.4275,-6.7604 0.3972,-2.5805 -0.0344,-5.2247 -1.2285,-7.5273 v 0 C 21.7049,8.33818 20.233,6.74555 18.4366,5.63628 16.6402,4.527 14.5865,3.94264 12.4945,3.94544 Z"
+       fill="#d0d0d0"
+       id="path20" />
+    <path
+       d="m 15.7071,26.9889 c -0.0124,-0.9802 -1.3814,-1.7204 -3.1878,-1.7204 -1.8065,0 -3.18786,0.7329 -3.18786,1.7204 v 0.0128 c 0.0124,0.9803 1.38136,1.7205 3.18786,1.7205 1.8064,0 3.1878,-0.7329 3.1878,-1.7205 z m -3.1878,0.9161 c -1.4328,0 -2.3466,-0.535 -2.3573,-0.9161 -0.0106,-0.3811 0.9245,-0.9161 2.3573,-0.9161 1.4327,0 2.3448,0.5369 2.3554,0.9161 0.0106,0.3793 -0.9298,0.9088 -2.3608,0.9088 z"
+       fill="url(#paint1_radial_205_200)"
+       id="path22"
+       style="fill:url(#paint1_radial_205_200)" />
+    <path
+       d="m 24.9039,15.9005 c -0.0354,-2.5376 -6.2552,-3.9851 -12.1066,-4.0474 -6.19852,0 -12.63968,1.5208 -12.6751,4.0474 0,0 0,0 0,0.011 0.03542,2.5375 6.25343,3.985 12.1066,4.0473 6.1985,0 12.6397,-1.5207 12.6751,-4.0473 0,0 0,-0.0074 0,-0.011 z M 12.2324,19.0921 C 5.60524,19.0207 0.98291,17.3552 0.959887,15.9023 0.98291,14.3944 6.03737,12.7106 12.7938,12.7106 c 6.6271,0.0715 11.2494,1.7369 11.2724,3.1899 -0.023,1.5079 -5.0774,3.1916 -11.8338,3.1916 z"
+       fill="url(#paint2_radial_205_200)"
+       id="path24"
+       style="fill:url(#paint2_radial_205_200)" />
+    <path
+       d="m 12.7513,6.09277 c -5.37682,0 -10.93779,1.41263 -10.93779,3.77249 0,2.35984 5.3821,3.71574 10.44899,3.77434 5.3767,0 10.9377,-1.4126 10.9377,-3.77434 0,-2.3617 -5.375,-3.71386 -10.4489,-3.77249 z M 12.2749,12.773 C 6.60763,12.7107 2.65651,11.1881 2.65651,9.86526 c 0,-1.36865 4.32127,-2.90586 10.09479,-2.90586 5.6672,0.06596 9.6148,1.58485 9.6148,2.90586 0.0035,1.37964 -4.316,2.90774 -10.0912,2.90774 z"
+       fill="url(#paint3_radial_205_200)"
+       id="path26"
+       style="fill:url(#paint3_radial_205_200)" />
+    <path
+       d="m 12.4714,3.06781 c -0.9014,0 -2.9965,0.14108 -2.9965,1.4456 0,1.30452 2.0951,1.4456 2.9965,1.4456 0.9015,0 2.9966,-0.14108 2.9966,-1.4456 0,-1.30452 -2.0951,-1.4456 -2.9966,-1.4456 z m 0,0.87762 c 1.2663,0 2.1483,0.30048 2.1483,0.56798 0,0.2675 -0.8855,0.56798 -2.1483,0.56798 -1.2627,0 -2.1482,-0.29865 -2.1482,-0.56798 0,-0.26933 0.882,-0.56798 2.1482,-0.56798 z"
+       fill="#d0d0d0"
+       id="path28" />
+    <path
+       d="m 17.7101,23.669 c -0.051,6e-4 -0.1019,0.0048 -0.1523,0.0128 v 0 L 12.8983,15.3582 8.65669,7.77472 C 8.80781,7.5793 8.88995,7.33639 8.88955,7.08614 8.88915,6.83588 8.80622,6.59326 8.65448,6.39837 8.50274,6.20347 8.29126,6.06797 8.055,6.01426 7.81874,5.96056 7.57183,5.99185 7.35509,6.10298 7.13835,6.2141 6.96475,6.39841 6.86297,6.62544 6.76119,6.85247 6.73734,7.10862 6.79534,7.35158 6.85335,7.59453 6.98975,7.80974 7.18199,7.96163 7.37424,8.11353 7.61082,8.19301 7.85265,8.18696 7.89953,8.18498 7.94625,8.18009 7.99256,8.1723 l 4.24154,7.5835 1.9163,3.428 2.7344,4.8864 c -0.1533,0.193 -0.2385,0.4342 -0.2416,0.684 -0.0031,0.2497 0.0761,0.4931 0.2245,0.6901 0.1485,0.197 0.3574,0.3358 0.5923,0.3935 0.2349,0.0578 0.4818,0.0311 0.7,-0.0757 0.2183,-0.1068 0.3949,-0.2873 0.5007,-0.5118 0.1059,-0.2245 0.1347,-0.4796 0.0817,-0.7233 -0.053,-0.2437 -0.1847,-0.4615 -0.3733,-0.6174 -0.1886,-0.156 -0.4229,-0.2408 -0.6643,-0.2406 z"
+       fill="url(#paint4_radial_205_200)"
+       id="path30"
+       style="fill:url(#paint4_radial_205_200)" />
+  </g>
+  <defs
+     id="defs66">
+    <radialGradient
+       id="paint0_radial_205_200"
+       cx="0"
+       cy="0"
+       r="1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(11.04597,2.4997924,-1.6929647,7.4807961,16.6478,16.1861)">
+      <stop
+         offset="0.16"
+         stop-color="#d0d0d0"
+         stop-opacity="0"
+         id="stop38" />
+      <stop
+         offset="1"
+         stop-color="#d0d0d0"
+         id="stop40" />
+    </radialGradient>
+    <radialGradient
+       id="paint1_radial_205_200"
+       cx="0"
+       cy="0"
+       r="1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(6.07803,0,0,3.84981,12.567,23.8474)">
+      <stop
+         stop-color="#d0d0d0"
+         stop-opacity="0"
+         id="stop43" />
+      <stop
+         offset="1"
+         stop-color="#d0d0d0"
+         id="stop45" />
+    </radialGradient>
+    <radialGradient
+       id="paint2_radial_205_200"
+       cx="0"
+       cy="0"
+       r="1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(10.4621,0,0,8.28335,12.6256,8.84102)">
+      <stop
+         offset="0.2"
+         stop-color="#d0d0d0"
+         stop-opacity="0"
+         id="stop48" />
+      <stop
+         offset="1"
+         stop-color="#d0d0d0"
+         id="stop50" />
+    </radialGradient>
+    <radialGradient
+       id="paint3_radial_205_200"
+       cx="0"
+       cy="0"
+       r="1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.881779,6.6334945,-9.1890392,3.9919805,6.15139,3.39141)">
+      <stop
+         offset="0.36"
+         stop-color="#d0d0d0"
+         stop-opacity="0"
+         id="stop53" />
+      <stop
+         offset="1"
+         stop-color="#d0d0d0"
+         id="stop55" />
+    </radialGradient>
+    <radialGradient
+       id="paint4_radial_205_200"
+       cx="0"
+       cy="0"
+       r="1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(185.524,0,0,191.934,-65.9476,-212.607)">
+      <stop
+         stop-color="#d0d0d0"
+         stop-opacity="0"
+         id="stop58" />
+      <stop
+         offset="0.37"
+         stop-color="#d0d0d0"
+         id="stop60" />
+    </radialGradient>
+    <clipPath
+       id="clip0_205_200">
+      <rect
+         width="80"
+         height="25.806499"
+         fill="#ffffff"
+         transform="translate(0,3)"
+         id="rect63"
+         x="0"
+         y="0" />
+    </clipPath>
+  </defs>
+</svg>
diff --git a/docs/_static/images/qiskit-light-logo.svg b/docs/_static/images/qiskit-light-logo.svg
new file mode 100644
index 000000000..25b27dd31
--- /dev/null
+++ b/docs/_static/images/qiskit-light-logo.svg
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   width="79.653473"
+   height="25.659819"
+   viewBox="0 0 79.653473 25.659819"
+   fill="none"
+   version="1.1"
+   id="svg68">
+  <g
+     clip-path="url(#clip0_205_200)"
+     id="g32"
+     transform="translate(-0.09862329,-3.0623815)">
+    <path
+       d="m 39.1853,26.1607 h -2.049 c -1.6134,0 -2.359,-0.916 -2.359,-2.3818 v -1.136 c -3.2286,-0.4269 -5.2776,-3.0835 -5.2776,-7.6659 0,-5.03117 2.4635,-7.72999 6.2304,-7.72999 3.7669,0 6.2286,2.69882 6.2286,7.72999 0,4.4541 -1.9233,7.0888 -4.9871,7.6238 v 1.5409 h 2.1677 z m 0.2692,-10.0001 v -2.3507 c 0,-2.7189 -1.4894,-4.39724 -3.7191,-4.39724 -2.2297,0 -3.7191,1.67094 -3.7191,4.39724 v 2.3507 c 0,2.719 1.4894,4.3973 3.7191,4.3973 2.2297,0 3.7191,-1.6783 3.7191,-4.3973 z"
+       fill="#010101"
+       id="path2" />
+    <path
+       d="M 43.6217,8.5442 V 8.17776 c 0,-0.70723 0.4144,-1.22024 1.346,-1.22024 0.9315,0 1.3247,0.51301 1.3247,1.22024 V 8.5442 c 0,0.70539 -0.3932,1.22024 -1.3247,1.22024 -0.9316,0 -1.346,-0.51485 -1.346,-1.22024 z"
+       fill="#010101"
+       id="path4" />
+    <path
+       d="m 46.0852,11.3218 h -2.2563 v 11.1343 h 2.2563 z"
+       fill="#010101"
+       id="path6" />
+    <path
+       d="m 47.9678,20.6147 1.4433,-1.3705 c 0.7864,0.9857 1.7587,1.5849 3.0426,1.5849 1.284,0 1.9659,-0.5497 1.9659,-1.4988 0,-0.7072 -0.4145,-1.2422 -1.532,-1.3924 l -0.9935,-0.1283 c -2.1943,-0.2785 -3.542,-1.2642 -3.542,-3.3199 0,-2.162 1.6346,-3.4262 3.9936,-3.4262 1.9481,0 3.0426,0.6651 4.0167,1.7772 l -1.3867,1.3705 c -0.3227,-0.3964 -0.7253,-0.7148 -1.1797,-0.9329 -0.4544,-0.2181 -0.9494,-0.3306 -1.4503,-0.3295 -1.2397,0 -1.8206,0.5497 -1.8206,1.3906 0,0.841 0.5171,1.2423 1.6559,1.4365 l 0.9935,0.1282 c 2.359,0.3665 3.4145,1.4346 3.4145,3.232 0,2.1419 -1.6753,3.5765 -4.2628,3.5765 -2.0207,0 -3.3454,-0.7915 -4.3584,-2.0979 z"
+       fill="#010101"
+       id="path8" />
+    <path
+       d="m 58.128,6.60944 h 2.2634 v 9.72166 h 0.1027 l 1.4912,-1.9916 2.5874,-3.0177 h 2.6282 l -3.774,4.3039 4.2256,6.8304 h -2.6937 l -3.0851,-5.3134 -1.4823,1.6728 v 3.6406 H 58.128 Z"
+       fill="#010101"
+       id="path10" />
+    <path
+       d="M 69.2181,8.5442 V 8.17776 c 0,-0.70723 0.4144,-1.22024 1.346,-1.22024 0.9315,0 1.3229,0.51301 1.3229,1.22024 V 8.5442 c 0,0.70539 -0.3932,1.22024 -1.3229,1.22024 -0.9298,0 -1.346,-0.51485 -1.346,-1.22024 z"
+       fill="#010101"
+       id="path12" />
+    <path
+       d="m 71.6816,11.3218 h -2.2563 v 11.1343 h 2.2563 z"
+       fill="#010101"
+       id="path14" />
+    <path
+       d="m 77.6198,22.4561 c -1.5532,0 -2.3803,-0.8996 -2.3803,-2.4203 v -6.8085 h -1.6771 v -1.9055 h 0.9121 c 0.7438,0 0.9917,-0.3224 0.9917,-1.0993 V 8.2804 h 2.0296 v 3.0414 h 2.2563 v 1.9055 h -2.2563 v 7.3288 h 2.0898 v 1.9055 z"
+       fill="#010101"
+       id="path16" />
+    <path
+       d="m 23.225,21.8972 c -0.0248,-2.3726 -5.4069,-3.712 -10.4737,-3.7706 -5.37505,0 -10.93602,1.4071 -10.95373,3.7633 v 0.0147 c 0.02126,2.3672 5.40689,3.7047 10.47373,3.7633 5.375,0 10.936,-1.4071 10.9537,-3.7633 z m -10.9555,2.9059 c -5.66718,-0.066 -9.62184,-1.5812 -9.63601,-2.904 0.02302,-1.3742 4.3372,-2.9059 10.11781,-2.9059 5.6672,0.066 9.6219,1.5812 9.636,2.904 -0.0159,1.3724 -4.339,2.9059 -10.1178,2.9059 z"
+       fill="url(#paint0_radial_205_200)"
+       id="path18"
+       style="fill:url(#paint0_radial_205_200)" />
+    <path
+       d="M 12.5334,28.713 C 10.3385,28.7199 8.18119,28.1239 6.2819,26.9857 4.38261,25.8475 2.80946,24.2081 1.72321,22.2349 0.636959,20.2617 0.0765634,18.0256 0.0992879,15.755 0.122012,13.4843 0.727043,11.2607 1.85255,9.31117 2.97806,7.36168 4.58368,5.75629 6.50535,4.65905 8.42701,3.56181 10.5958,3.01207 12.7901,3.066 c 2.1943,0.05392 4.3354,0.70959 6.2046,1.9 1.8691,1.1904 3.3992,2.87286 4.434,4.87544 v 0 c 1.0109,1.95086 1.5162,4.13926 1.4666,6.35216 -0.0495,2.2129 -0.6522,4.3748 -1.7493,6.2751 -1.0971,1.9004 -2.6513,3.4743 -4.5111,4.5686 -1.8598,1.0943 -3.9619,1.6716 -6.1015,1.6757 z M 12.4945,3.94544 C 9.96864,3.95097 7.51422,4.81303 5.50722,6.39954 3.50021,7.98606 2.0513,10.2095 1.38245,12.7293 c -0.66885,2.5199 -0.520747,5.197 0.42162,7.6214 0.94236,2.4245 2.62702,4.4624 4.79588,5.8017 2.16887,1.3392 4.70235,1.906 7.21225,1.6133 2.51,-0.2926 4.858,-1.4284 6.6843,-3.2335 1.8264,-1.8051 3.0303,-4.1798 3.4275,-6.7604 0.3972,-2.5805 -0.0344,-5.2247 -1.2285,-7.5273 v 0 C 21.7049,8.33818 20.233,6.74555 18.4366,5.63628 16.6402,4.527 14.5865,3.94264 12.4945,3.94544 Z"
+       fill="#010101"
+       id="path20" />
+    <path
+       d="m 15.7071,26.9889 c -0.0124,-0.9802 -1.3814,-1.7204 -3.1878,-1.7204 -1.8065,0 -3.18786,0.7329 -3.18786,1.7204 v 0.0128 c 0.0124,0.9803 1.38136,1.7205 3.18786,1.7205 1.8064,0 3.1878,-0.7329 3.1878,-1.7205 z m -3.1878,0.9161 c -1.4328,0 -2.3466,-0.535 -2.3573,-0.9161 -0.0106,-0.3811 0.9245,-0.9161 2.3573,-0.9161 1.4327,0 2.3448,0.5369 2.3554,0.9161 0.0106,0.3793 -0.9298,0.9088 -2.3608,0.9088 z"
+       fill="url(#paint1_radial_205_200)"
+       id="path22"
+       style="fill:url(#paint1_radial_205_200)" />
+    <path
+       d="m 24.9039,15.9005 c -0.0354,-2.5376 -6.2552,-3.9851 -12.1066,-4.0474 -6.19852,0 -12.63968,1.5208 -12.6751,4.0474 0,0 0,0 0,0.011 0.03542,2.5375 6.25343,3.985 12.1066,4.0473 6.1985,0 12.6397,-1.5207 12.6751,-4.0473 0,0 0,-0.0074 0,-0.011 z M 12.2324,19.0921 C 5.60524,19.0207 0.98291,17.3552 0.959887,15.9023 0.98291,14.3944 6.03737,12.7106 12.7938,12.7106 c 6.6271,0.0715 11.2494,1.7369 11.2724,3.1899 -0.023,1.5079 -5.0774,3.1916 -11.8338,3.1916 z"
+       fill="url(#paint2_radial_205_200)"
+       id="path24"
+       style="fill:url(#paint2_radial_205_200)" />
+    <path
+       d="m 12.7513,6.09277 c -5.37682,0 -10.93779,1.41263 -10.93779,3.77249 0,2.35984 5.3821,3.71574 10.44899,3.77434 5.3767,0 10.9377,-1.4126 10.9377,-3.77434 0,-2.3617 -5.375,-3.71386 -10.4489,-3.77249 z M 12.2749,12.773 C 6.60763,12.7107 2.65651,11.1881 2.65651,9.86526 c 0,-1.36865 4.32127,-2.90586 10.09479,-2.90586 5.6672,0.06596 9.6148,1.58485 9.6148,2.90586 0.0035,1.37964 -4.316,2.90774 -10.0912,2.90774 z"
+       fill="url(#paint3_radial_205_200)"
+       id="path26"
+       style="fill:url(#paint3_radial_205_200)" />
+    <path
+       d="m 12.4714,3.06781 c -0.9014,0 -2.9965,0.14108 -2.9965,1.4456 0,1.30452 2.0951,1.4456 2.9965,1.4456 0.9015,0 2.9966,-0.14108 2.9966,-1.4456 0,-1.30452 -2.0951,-1.4456 -2.9966,-1.4456 z m 0,0.87762 c 1.2663,0 2.1483,0.30048 2.1483,0.56798 0,0.2675 -0.8855,0.56798 -2.1483,0.56798 -1.2627,0 -2.1482,-0.29865 -2.1482,-0.56798 0,-0.26933 0.882,-0.56798 2.1482,-0.56798 z"
+       fill="#000000"
+       id="path28" />
+    <path
+       d="m 17.7101,23.669 c -0.051,6e-4 -0.1019,0.0048 -0.1523,0.0128 v 0 L 12.8983,15.3582 8.65669,7.77472 C 8.80781,7.5793 8.88995,7.33639 8.88955,7.08614 8.88915,6.83588 8.80622,6.59326 8.65448,6.39837 8.50274,6.20347 8.29126,6.06797 8.055,6.01426 7.81874,5.96056 7.57183,5.99185 7.35509,6.10298 7.13835,6.2141 6.96475,6.39841 6.86297,6.62544 6.76119,6.85247 6.73734,7.10862 6.79534,7.35158 6.85335,7.59453 6.98975,7.80974 7.18199,7.96163 7.37424,8.11353 7.61082,8.19301 7.85265,8.18696 7.89953,8.18498 7.94625,8.18009 7.99256,8.1723 l 4.24154,7.5835 1.9163,3.428 2.7344,4.8864 c -0.1533,0.193 -0.2385,0.4342 -0.2416,0.684 -0.0031,0.2497 0.0761,0.4931 0.2245,0.6901 0.1485,0.197 0.3574,0.3358 0.5923,0.3935 0.2349,0.0578 0.4818,0.0311 0.7,-0.0757 0.2183,-0.1068 0.3949,-0.2873 0.5007,-0.5118 0.1059,-0.2245 0.1347,-0.4796 0.0817,-0.7233 -0.053,-0.2437 -0.1847,-0.4615 -0.3733,-0.6174 -0.1886,-0.156 -0.4229,-0.2408 -0.6643,-0.2406 z"
+       fill="url(#paint4_radial_205_200)"
+       id="path30"
+       style="fill:url(#paint4_radial_205_200)" />
+  </g>
+  <defs
+     id="defs66">
+    <radialGradient
+       id="paint0_radial_205_200"
+       cx="0"
+       cy="0"
+       r="1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(11.04597,2.4997924,-1.6929647,7.4807961,16.6478,16.1861)">
+      <stop
+         offset="0.16"
+         stop-color="#010101"
+         stop-opacity="0"
+         id="stop38" />
+      <stop
+         offset="1"
+         stop-color="#010101"
+         id="stop40" />
+    </radialGradient>
+    <radialGradient
+       id="paint1_radial_205_200"
+       cx="0"
+       cy="0"
+       r="1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(6.07803,0,0,3.84981,12.567,23.8474)">
+      <stop
+         stop-color="#010101"
+         stop-opacity="0"
+         id="stop43" />
+      <stop
+         offset="1"
+         stop-color="#010101"
+         id="stop45" />
+    </radialGradient>
+    <radialGradient
+       id="paint2_radial_205_200"
+       cx="0"
+       cy="0"
+       r="1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(10.4621,0,0,8.28335,12.6256,8.84102)">
+      <stop
+         offset="0.2"
+         stop-color="#010101"
+         stop-opacity="0"
+         id="stop48" />
+      <stop
+         offset="1"
+         stop-color="#010101"
+         id="stop50" />
+    </radialGradient>
+    <radialGradient
+       id="paint3_radial_205_200"
+       cx="0"
+       cy="0"
+       r="1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.881779,6.6334945,-9.1890392,3.9919805,6.15139,3.39141)">
+      <stop
+         offset="0.36"
+         stop-color="#010101"
+         stop-opacity="0"
+         id="stop53" />
+      <stop
+         offset="1"
+         stop-color="#010101"
+         id="stop55" />
+    </radialGradient>
+    <radialGradient
+       id="paint4_radial_205_200"
+       cx="0"
+       cy="0"
+       r="1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(185.524,0,0,191.934,-65.9476,-212.607)">
+      <stop
+         stop-color="#010101"
+         stop-opacity="0"
+         id="stop58" />
+      <stop
+         offset="0.37"
+         stop-color="#010101"
+         id="stop60" />
+    </radialGradient>
+    <clipPath
+       id="clip0_205_200">
+      <rect
+         width="80"
+         height="25.806499"
+         fill="#ffffff"
+         transform="translate(0,3)"
+         id="rect63"
+         x="0"
+         y="0" />
+    </clipPath>
+  </defs>
+</svg>
diff --git a/docs/conf.py b/docs/conf.py
index 1448e0ba7..ec2bb5465 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -80,7 +80,10 @@
     "source_repository": "https://github.com/Qiskit-Extensions/circuit-knitting-toolbox/",
     "source_branch": "main",
     "source_directory": "docs/",
+    "dark_logo": "images/qiskit-dark-logo.svg",
+    "light_logo": "images/qiskit-light-logo.svg",
 }
+html_static_path = ["_static"]
 
 # autodoc/autosummary options
 autosummary_generate = True
diff --git a/pyproject.toml b/pyproject.toml
index a3293c311..ead9dc1cb 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -74,7 +74,7 @@ docs = [
     "nbsphinx>=0.8.8",
     "sphinx-copybutton>=0.5.0",
     "reno>=3.4.0",
-    "qiskit-sphinx-theme>=1.14.0, <2"
+    "qiskit-sphinx-theme>=2.0.0, <3"
 ]
 notebook-dependencies = [
     "matplotlib",

From 51e7096ccd44fbb8bd05c5d814ae8ff964b555db Mon Sep 17 00:00:00 2001
From: Jim Garrison <garrison@ibm.com>
Date: Tue, 10 Sep 2024 10:20:10 -0400
Subject: [PATCH 19/26] Rename package to qiskit-addon-cutting (#678)

* Rename package to qiskit-addon-cutting

This is a follow-up to #661, which contained only the necessary
source code changes.

* Update the Docker registry, don't specify a particular python version

* Update description
---
 .github/workflows/docs.yml                    |  4 +-
 CITATION.bib                                  |  8 +-
 CONTRIBUTING.md                               |  5 +-
 Dockerfile                                    |  8 +-
 INSTALL.rst                                   | 34 ++++----
 README.md                                     | 40 ++++-----
 SECURITY.md                                   |  7 +-
 compose.yaml                                  | 10 +--
 docs/apidocs/index.rst                        |  6 +-
 docs/conf.py                                  | 86 ++++++++++++++++---
 .../explanation/index.rst                     | 26 +++---
 docs/{circuit_cutting => }/how-tos/README.rst |  4 +-
 ...erate_exact_quasi_dists_from_sampler.ipynb |  0
 ...generate_exact_sampling_coefficients.ipynb |  0
 .../how-tos/how_to_specify_cut_wires.ipynb    |  0
 docs/{circuit_cutting => }/how-tos/index.rst  |  0
 docs/index.rst                                | 49 +++++------
 ...gate_cutting_to_reduce_circuit_width.ipynb |  0
 ...gate_cutting_to_reduce_circuit_depth.ipynb |  0
 ...03_wire_cutting_via_move_instruction.ipynb |  0
 .../tutorials/04_automatic_cut_finding.ipynb  |  2 +-
 .../tutorials/README.rst                      |  4 +-
 .../{circuit_cutting => }/tutorials/index.rst |  0
 pyproject.toml                                |  8 +-
 .../cut_finding/circuit_interface.py          |  2 +-
 .../cut_finding/cutting_actions.py            |  2 +-
 qiskit_addon_cutting/cutting_experiments.py   |  4 +-
 qiskit_addon_cutting/instructions/move.py     |  2 +-
 .../utils/observable_grouping.py              |  2 +-
 .../0.7/prepare-0.7.0-48b344ae77523c34.yaml   |  2 +-
 test/conftest.py                              |  2 +-
 test/test_cutting_roundtrip.py                |  2 +-
 test/test_find_cuts.py                        |  2 +-
 test/utils/test_transpiler_passes.py          |  2 +-
 34 files changed, 186 insertions(+), 137 deletions(-)
 rename docs/{circuit_cutting => }/explanation/index.rst (91%)
 rename docs/{circuit_cutting => }/how-tos/README.rst (91%)
 rename docs/{circuit_cutting => }/how-tos/how_to_generate_exact_quasi_dists_from_sampler.ipynb (100%)
 rename docs/{circuit_cutting => }/how-tos/how_to_generate_exact_sampling_coefficients.ipynb (100%)
 rename docs/{circuit_cutting => }/how-tos/how_to_specify_cut_wires.ipynb (100%)
 rename docs/{circuit_cutting => }/how-tos/index.rst (100%)
 rename docs/{circuit_cutting => }/tutorials/01_gate_cutting_to_reduce_circuit_width.ipynb (100%)
 rename docs/{circuit_cutting => }/tutorials/02_gate_cutting_to_reduce_circuit_depth.ipynb (100%)
 rename docs/{circuit_cutting => }/tutorials/03_wire_cutting_via_move_instruction.ipynb (100%)
 rename docs/{circuit_cutting => }/tutorials/04_automatic_cut_finding.ipynb (99%)
 rename docs/{circuit_cutting => }/tutorials/README.rst (90%)
 rename docs/{circuit_cutting => }/tutorials/index.rst (100%)

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index e181deadf..b9e124a26 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -44,12 +44,12 @@ jobs:
         shell: bash
         run: |
           mkdir artifact
-          cp -a docs/_build/html artifact/ckt_html_docs
+          cp -a docs/_build/html artifact/qiskit-addon-cutting-htmldocs
       - name: Upload docs artifact
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: ckt_html_docs
+          name: qiskit-addon-cutting-htmldocs
           path: ./artifact
       - name: Deploy docs
         if: ${{ github.ref == 'refs/heads/stable/0.7' }}
diff --git a/CITATION.bib b/CITATION.bib
index 7f90b42a3..06b82f1f5 100644
--- a/CITATION.bib
+++ b/CITATION.bib
@@ -1,4 +1,4 @@
-@misc{circuit-knitting-toolbox,
+@misc{qiskit-addon-cutting,
   author = {
     Agata M. Bra\'{n}czyk
     and Almudena {Carrera Vazquez}
@@ -15,8 +15,8 @@ @misc{circuit-knitting-toolbox
     and Ibrahim Shehzad
     and Stefan Woerner
   },
-  title = {{Circuit Knitting Toolbox}},
-  howpublished = {\url{https://github.com/Qiskit-Extensions/circuit-knitting-toolbox}},
-  year = {2023},
+  title = {{Qiskit addon: circuit cutting}},
+  howpublished = {\url{https://github.com/Qiskit/qiskit-addon-cutting}},
+  year = {2024},
   doi = {10.5281/zenodo.7987997}
 }
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 19f3f18a3..8ce24fb67 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,8 +1,8 @@
 # Developer guide
 
-Development of the Circuit Knitting Toolbox takes place [on GitHub](https://github.com/Qiskit-Extensions/circuit-knitting-toolbox). The [Contributing to Qiskit](https://github.com/Qiskit/qiskit/blob/main/CONTRIBUTING.md) guide may serve as a useful starting point, as the toolbox builds on [Qiskit] and is part of the [Qiskit Ecosystem].
+Development of the `qiskit-addon-cutting` package takes place [on GitHub](https://github.com/Qiskit/qiskit-addon-cutting). The [Contributing to Qiskit](https://github.com/Qiskit/qiskit/blob/main/CONTRIBUTING.md) guide may serve as a useful starting point, as this package builds on [Qiskit].
 
-The toolbox is written in [Python] and uses [tox] as a testing framework.  A description of the available `tox` test environments is located at [`test/README.md`](test/README.md).  These environments are used in the CI workflows, which are described at [`.github/workflows/README.md`](.github/workflows/README.md).
+This package is written in [Python] and uses [tox] as a testing framework.  A description of the available `tox` test environments is located at [`test/README.md`](test/README.md).  These environments are used in the CI workflows, which are described at [`.github/workflows/README.md`](.github/workflows/README.md).
 
 Project configuration, including information about dependencies, is stored in [`pyproject.toml`](pyproject.toml).
 
@@ -11,7 +11,6 @@ We use [Sphinx] for documentation and [reno] for release notes.  We use [Google
 We require 100% coverage in all new code.  In rare cases where it is not possible to test a code block, we mark it with ``# pragma: no cover`` so that the ``coverage`` tests will pass.
 
 [Qiskit]: https://www.ibm.com/quantum/qiskit
-[Qiskit Ecosystem]: https://qiskit.github.io/ecosystem/
 [Python]: https://www.python.org/
 [tox]: https://github.com/tox-dev/tox
 [Sphinx]: https://www.sphinx-doc.org/
diff --git a/Dockerfile b/Dockerfile
index 8a607a1dd..55806e286 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM jupyter/minimal-notebook:python-3.11
+FROM quay.io/jupyter/minimal-notebook
 
 LABEL maintainer="Jim Garrison <garrison@ibm.com>"
 
@@ -7,7 +7,7 @@ LABEL maintainer="Jim Garrison <garrison@ibm.com>"
 RUN rm -rf work && \
     mkdir .src
 
-COPY . .src/circuit-knitting-toolbox
+COPY . .src/qiskit-addon-cutting
 
 # Fix the permissions of ~/.src and ~/persistent-volume
 USER root
@@ -17,7 +17,7 @@ USER ${NB_UID}
 
 # Consolidate the docs into the home directory
 RUN mkdir docs && \
-    cp -a .src/circuit-knitting-toolbox/docs docs/circuit-knitting-toolbox
+    cp -a .src/qiskit-addon-cutting/docs docs/qiskit-addon-cutting
 
 # Pip install everything
-RUN pip install -e '.src/circuit-knitting-toolbox[notebook-dependencies]'
+RUN pip install -e '.src/qiskit-addon-cutting[notebook-dependencies]'
diff --git a/INSTALL.rst b/INSTALL.rst
index 0d84681b5..60b613f46 100644
--- a/INSTALL.rst
+++ b/INSTALL.rst
@@ -1,7 +1,7 @@
 Installation Instructions
 =========================
 
-Let's see how to install the Circuit Knitting Toolbox (CKT). The first
+Let's see how to install the Qiskit addon for circuit cutting. The first
 thing to do is choose how you're going to run and install the
 packages. There are three primary ways to do this:
 
@@ -17,7 +17,7 @@ Pre-Installation
 
 Users who wish to install locally (using either :ref:`Option 1` or :ref:`Option 2`) are encouraged to
 follow a brief set of common instructions to prepare a Python environment for
-installation of CKT:
+installation:
 
 First, create a minimal environment with only Python installed in it. We recommend using `Python virtual environments <https://docs.python.org/3.10/tutorial/venv.html>`__.
 
@@ -41,15 +41,15 @@ Note: If you are using Windows, use the following commands in PowerShell:
 
 .. _Option 1:
 
-Option 1: Pip Installation
-^^^^^^^^^^^^^^^^^^^^^^^^^^
+Option 1: Install from PyPI
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Upgrade pip and install the CKT package.
+The most straightforward way to install the ``qiskit-addon-cutting`` package is via PyPI.
 
 .. code:: sh
 
     pip install --upgrade pip
-    pip install circuit-knitting-toolbox
+    pip install qiskit-addon-cutting
 
 
 .. _Option 2:
@@ -57,22 +57,22 @@ Upgrade pip and install the CKT package.
 Option 2: Install from Source
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Users who wish to develop in the repository or run the tutorials locally may want to install from source.
+Users who wish to develop in the repository or run the notebooks locally may want to install from source.
 
-In either case, the first step is to clone the CKT repository.
+In either case, the first step is to clone the ``qiskit-addon-cutting`` repository.
 
 .. code:: sh
 
-    git clone git@github.com:Qiskit-Extensions/circuit-knitting-toolbox.git
+    git clone git@github.com:Qiskit/qiskit-addon-cutting.git
     
 Next, upgrade pip and enter the repository. 
 
 .. code:: sh
     
     pip install --upgrade pip
-    cd circuit-knitting-toolbox
+    cd qiskit-addon-cutting
 
-The next step is to install CKT to the virtual environment. If you plan on running the tutorials, install the
+The next step is to install to the virtual environment. If you plan on running the notebooks, install the
 notebook dependencies in order to run all the visualizations in the notebooks.
 If you plan on developing in the repository, you may want to install the ``dev`` dependencies.
 
@@ -82,7 +82,7 @@ Adjust the options below to suit your needs.
     
     pip install tox notebook -e '.[notebook-dependencies,dev]'
 
-If you installed the notebook dependencies, you can get started with CKT by running the notebooks in the docs.
+If you installed the notebook dependencies, you can get started with the addon by running the notebooks in the docs.
 
 .. code::
     
@@ -95,15 +95,15 @@ If you installed the notebook dependencies, you can get started with CKT by runn
 Option 3: Use within Docker
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-We have provided a `Dockerfile <https://github.com/Qiskit-Extensions/circuit-knitting-toolbox/blob/main/Dockerfile>`__, which can be used to
+We have provided a `Dockerfile <https://github.com/Qiskit/qiskit-addon-cutting/blob/main/Dockerfile>`__, which can be used to
 build a Docker image, as well as a
-`compose.yaml <https://github.com/Qiskit-Extensions/circuit-knitting-toolbox/blob/main/compose.yaml>`__ file, which allows one
+`compose.yaml <https://github.com/Qiskit/qiskit-addon-cutting/blob/main/compose.yaml>`__ file, which allows one
 to use the Docker image with just a few simple commands.
 
 .. code:: sh
 
-    git clone git@github.com:Qiskit-Extensions/circuit-knitting-toolbox.git
-    cd circuit-knitting-toolbox
+    git clone git@github.com:Qiskit/qiskit-addon-cutting.git
+    cd qiskit-addon-cutting
     docker compose build
     docker compose up
 
@@ -148,4 +148,4 @@ Platform Support
 
 We expect this package to work on `any platform supported by Qiskit <https://docs.quantum.ibm.com/start/install#operating-system-support>`__. If
 you are experiencing issues running the software on your device, you
-may consider :ref:`using the toolbox within Docker <Option 3>`.
+may consider :ref:`using this package within Docker <Option 3>`.
diff --git a/README.md b/README.md
index 86de7246a..1d62e2e9d 100644
--- a/README.md
+++ b/README.md
@@ -1,24 +1,19 @@
-:exclamation: _This repository is in the process of being renamed to `qiskit-addon-cutting`.  The first release under the new name is expected by mid-September._
-
----
-
 <!-- SHIELDS -->
 <div align="left">
 
-  [![Stability](https://img.shields.io/badge/Stability-alpha-f4d03f.svg)](https://github.com/Qiskit-Extensions/circuit-knitting-toolbox/releases)
-  [![Release](https://img.shields.io/pypi/v/circuit-knitting-toolbox.svg?label=Release)](https://github.com/Qiskit-Extensions/circuit-knitting-toolbox/releases)
+  [![Release](https://img.shields.io/pypi/v/qiskit-addon-cutting.svg?label=Release)](https://github.com/Qiskit-Extensions/qiskit-addon-cutting/releases)
   ![Platform](https://img.shields.io/badge/%F0%9F%92%BB%20Platform-Linux%20%7C%20macOS%20%7C%20Windows-informational)
-  [![Python](https://img.shields.io/pypi/pyversions/circuit-knitting-toolbox?label=Python&logo=python)](https://www.python.org/)
+  [![Python](https://img.shields.io/pypi/pyversions/qiskit-addon-cutting?label=Python&logo=python)](https://www.python.org/)
   [![Qiskit](https://img.shields.io/badge/Qiskit%20-%20%3E%3D1.1%20-%20%236133BD?logo=Qiskit)](https://github.com/Qiskit/qiskit)
 <br />
-  [![Docs (stable)](https://img.shields.io/badge/%F0%9F%93%84%20Docs-stable-blue.svg)](https://qiskit-extensions.github.io/circuit-knitting-toolbox/)
+  [![Docs (stable)](https://img.shields.io/badge/%F0%9F%93%84%20Docs-stable-blue.svg)](https://qiskit.github.io/qiskit-addon-cutting/)
   [![DOI](https://zenodo.org/badge/543181258.svg)](https://zenodo.org/badge/latestdoi/543181258)
-  [![License](https://img.shields.io/github/license/Qiskit-Extensions/circuit-knitting-toolbox?label=License)](LICENSE.txt)
-  [![Downloads](https://img.shields.io/pypi/dm/circuit-knitting-toolbox.svg?label=Downloads)](https://pypi.org/project/circuit-knitting-toolbox/)
-  [![Tests](https://github.com/Qiskit-Extensions/circuit-knitting-toolbox/actions/workflows/test_latest_versions.yml/badge.svg)](https://github.com/Qiskit-Extensions/circuit-knitting-toolbox/actions/workflows/test_latest_versions.yml)
-  [![Coverage](https://coveralls.io/repos/github/Qiskit-Extensions/circuit-knitting-toolbox/badge.svg?branch=main)](https://coveralls.io/github/Qiskit-Extensions/circuit-knitting-toolbox?branch=main)
+  [![License](https://img.shields.io/github/license/Qiskit/qiskit-addon-cutting?label=License)](LICENSE.txt)
+  [![Downloads](https://img.shields.io/pypi/dm/qiskit-addon-cutting.svg?label=Downloads)](https://pypi.org/project/qiskit-addon-cutting/)
+  [![Tests](https://github.com/Qiskit/qiskit-addon-cutting/actions/workflows/test_latest_versions.yml/badge.svg)](https://github.com/Qiskit/qiskit-addon-cutting/actions/workflows/test_latest_versions.yml)
+  [![Coverage](https://coveralls.io/repos/github/Qiskit/qiskit-addon-cutting/badge.svg?branch=main)](https://coveralls.io/github/Qiskit/qiskit-addon-cutting?branch=main)
 
-# Circuit Knitting Toolbox
+# Qiskit addon: circuit cutting
 
 ### Table of Contents
 
@@ -33,36 +28,35 @@
 
 ### About
 
-Circuit Knitting is the process of decomposing a larger quantum circuit into many smaller circuits, executing those circuits on a quantum processor(s), and then knitting their results into a reconstruction of the original circuit's outcome.
+Qiskit addons are a collection of modular tools for building utility-scale workloads powered by Qiskit.
+
+This package implements circuit cutting.  In this technique, a handful of gates and/or wires are cut, resulting in smaller circuits that are better suited for execution on hardware.  The result of the original circuit can then be reconstructed; however, the trade-off is that the overall number of shots must be increased by a factor exponential in the number of cuts.
 
-The toolbox currently contains the following tools:
-- Circuit Cutting [[1-5]](#references)
- 
-For a more detailed discussion on circuit cutting, check out our [technical guide](https://qiskit-extensions.github.io/circuit-knitting-toolbox/circuit_cutting/explanation/index.html#overview-of-circuit-cutting).
+For a more detailed discussion on circuit cutting, check out our [technical guide](https://qiskit.github.io/qiskit-addon-cutting/explanation/index.html#overview-of-circuit-cutting).
 
 ----------------------------------------------------------------------------------------------------
   
 ### Documentation
 
-All CKT documentation is available at https://qiskit-extensions.github.io/circuit-knitting-toolbox/.
+All documentation is available at https://qiskit.github.io/qiskit-addon-cutting/.
 
 ----------------------------------------------------------------------------------------------------
   
 ### Installation
 
-We encourage installing CKT via ``pip``, when possible.
+We encourage installing this package via ``pip``, when possible.
 
 ```bash
-pip install 'circuit-knitting-toolbox'
+pip install 'qiskit-addon-cutting'
 ```
 
-For information on installing from source, running CKT in a container, and platform support, refer to the [installation instructions](https://qiskit-extensions.github.io/circuit-knitting-toolbox/install.html) in the CKT documentation.
+For information on installing from source, running in a container, and platform support, refer to the [installation instructions](https://qiskit.github.io/qiskit-addon-cutting/install.html) in the documentation.
 
 ----------------------------------------------------------------------------------------------------
 
 ### Deprecation Policy
 
-We follow [semantic versioning](https://semver.org/) and are guided by the principles in [Qiskit's deprecation policy](https://github.com/Qiskit/qiskit/blob/main/DEPRECATION.md).  We may occasionally make breaking changes in order to improve the user experience.  When possible, we will keep old interfaces and mark them as deprecated, as long as they can co-exist with the new ones.  Each substantial improvement, breaking change, or deprecation will be documented in the [release notes](https://qiskit-extensions.github.io/circuit-knitting-toolbox/release-notes.html).
+We follow [semantic versioning](https://semver.org/) and are guided by the principles in [Qiskit's deprecation policy](https://github.com/Qiskit/qiskit/blob/main/DEPRECATION.md).  We may occasionally make breaking changes in order to improve the user experience.  When possible, we will keep old interfaces and mark them as deprecated, as long as they can co-exist with the new ones.  Each substantial improvement, breaking change, or deprecation will be documented in the [release notes](https://qiskit.github.io/qiskit-addon-cutting/release-notes.html).
 
 ----------------------------------------------------------------------------------------------------
 
diff --git a/SECURITY.md b/SECURITY.md
index 296fcd2c0..0913880cd 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -2,16 +2,15 @@
 
 ## Supported Versions
 
-The Circuit Knitting Toolbox supports one minor version release at a time, both for bug and
-security fixes. For example, if the most recent release is 0.2.1, then the 0.2.x
-release series is currently supported.
+The package supports one minor version release at a time, both for bug and security fixes.
+For example, if the most recent release is 0.2.1, then the 0.2.x release series is currently supported.
 
 ## Reporting a Vulnerability
 
 To report vulnerabilities, you can privately report a potential security issue
 via the GitHub security vulnerabilities feature. This can be done here:
 
-https://github.com/Qiskit-Extensions/circuit-knitting-toolbox/security/advisories
+https://github.com/Qiskit/qiskit-addon-cutting/security/advisories
 
 Please do **not** open a public issue about a potential security vulnerability.
 
diff --git a/compose.yaml b/compose.yaml
index ada62cb74..945a3f251 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -1,8 +1,8 @@
-# This file exists so users can easily get started with the Circuit
-# Knitting Toolbox in a container using Docker Compose.
+# This file exists so users can easily get started with this package
+# in a container using Docker Compose.
 #
 # Instructions are available at:
-# https://qiskit-extensions.github.io/circuit-knitting-toolbox/install.html#option-3-use-within-docker
+# https://qiskit.github.io/qiskit-addon-cutting/install.html#option-3-use-within-docker
 
 services:
   notebook:
@@ -14,7 +14,7 @@ services:
     ports:
       - 8888:8888
     volumes:
-      - circuit-knitting-toolbox:/home/jovyan/persistent-volume
+      - qiskit-addon-cutting:/home/jovyan/persistent-volume
 
 volumes:
-  circuit-knitting-toolbox:
+  qiskit-addon-cutting:
diff --git a/docs/apidocs/index.rst b/docs/apidocs/index.rst
index 0cc647d1c..bb0e8d42c 100644
--- a/docs/apidocs/index.rst
+++ b/docs/apidocs/index.rst
@@ -2,9 +2,9 @@
 
 .. module:: qiskit_addon_cutting
 
-=======================================
-Circuit Knitting Toolbox API References
-=======================================
+==============
+API References
+==============
 
 ###############
 Circuit Cutting
diff --git a/docs/conf.py b/docs/conf.py
index ec2bb5465..3ce92a2a5 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -17,15 +17,17 @@
 """
 
 # General options:
+import inspect
 from pathlib import Path
 import os
+import re
 import sys
 
 import qiskit_addon_cutting
 
-project = "Circuit Knitting Toolbox"
+project = "Qiskit addon: circuit cutting"
 copyright = "2024"  # pylint: disable=redefined-builtin
-author = "IBM Quantum"
+author = "Qiskit addons team"
 
 _rootdir = Path(__file__).parent.parent
 sys.path.insert(0, str(_rootdir))
@@ -68,7 +70,7 @@
         # https://pradyunsg.me/furo/customisation/footer/#using-embedded-svgs
         {
             "name": "GitHub",
-            "url": "https://github.com/Qiskit-Extensions/circuit-knitting-toolbox",
+            "url": "https://github.com/Qiskit/qiskit-addon-cutting",
             "html": """
                 <svg stroke="currentColor" fill="currentColor" stroke-width="0" viewBox="0 0 16 16">
                     <path fill-rule="evenodd" d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0 0 16 8c0-4.42-3.58-8-8-8z"></path>
@@ -77,9 +79,6 @@
             "class": "",
         },
     ],
-    "source_repository": "https://github.com/Qiskit-Extensions/circuit-knitting-toolbox/",
-    "source_branch": "main",
-    "source_directory": "docs/",
     "dark_logo": "images/qiskit-dark-logo.svg",
     "light_logo": "images/qiskit-light-logo.svg",
 }
@@ -106,10 +105,7 @@
 plot_formats = ["svg"]
 
 # Redirects for pages that have moved
-redirects = {
-    "circuit_cutting/tutorials/gate_cutting_to_reduce_circuit_width.html": "01_gate_cutting_to_reduce_circuit_width.html",
-    "circuit_cutting/tutorials/gate_cutting_to_reduce_circuit_depth.html": "02_gate_cutting_to_reduce_circuit_depth.html",
-}
+redirects = {}
 
 intersphinx_mapping = {
     "python": ("https://docs.python.org/3", None),
@@ -123,3 +119,73 @@
     "qiskit-aer": ("https://qiskit.github.io/qiskit-aer/", None),
     "rustworkx": ("https://www.rustworkx.org/", None),
 }
+
+# ----------------------------------------------------------------------------------
+# Source code links
+# ----------------------------------------------------------------------------------
+
+
+def determine_github_branch() -> str:
+    """Determine the GitHub branch name to use for source code links.
+
+    We need to decide whether to use `stable/<version>` vs. `main` for dev builds.
+    Refer to https://docs.github.com/en/actions/learn-github-actions/variables
+    for how we determine this with GitHub Actions.
+    """
+    # If CI env vars not set, default to `main`. This is relevant for local builds.
+    if "GITHUB_REF_NAME" not in os.environ:
+        return "main"
+
+    # PR workflows set the branch they're merging into.
+    if base_ref := os.environ.get("GITHUB_BASE_REF"):
+        return base_ref
+
+    ref_name = os.environ["GITHUB_REF_NAME"]
+
+    # Check if the ref_name is a tag like `1.0.0` or `1.0.0rc1`. If so, we need
+    # to transform it to a Git branch like `stable/1.0`.
+    version_without_patch = re.match(r"(\d+\.\d+)", ref_name)
+    return (
+        f"stable/{version_without_patch.group()}" if version_without_patch else ref_name
+    )
+
+
+GITHUB_BRANCH = determine_github_branch()
+
+
+def linkcode_resolve(domain, info):
+    if domain != "py":
+        return None
+
+    module_name = info["module"]
+    module = sys.modules.get(module_name)
+    if module is None or "qiskit_addon_cutting" not in module_name:
+        return None
+
+    obj = module
+    for part in info["fullname"].split("."):
+        try:
+            obj = getattr(obj, part)
+        except AttributeError:
+            return None
+        is_valid_code_object = (
+            inspect.isclass(obj) or inspect.ismethod(obj) or inspect.isfunction(obj)
+        )
+        if not is_valid_code_object:
+            return None
+    try:
+        full_file_name = inspect.getsourcefile(obj)
+    except TypeError:
+        return None
+    if full_file_name is None or "/qiskit_addon_cutting/" not in full_file_name:
+        return None
+    file_name = full_file_name.split("/qiskit_addon_cutting/")[-1]
+
+    try:
+        source, lineno = inspect.getsourcelines(obj)
+    except (OSError, TypeError):
+        linespec = ""
+    else:
+        ending_lineno = lineno + len(source) - 1
+        linespec = f"#L{lineno}-L{ending_lineno}"
+    return f"https://github.com/Qiskit/qiskit-addon-cutting/tree/{GITHUB_BRANCH}/qiskit_addon_cutting/{file_name}{linespec}"
diff --git a/docs/circuit_cutting/explanation/index.rst b/docs/explanation/index.rst
similarity index 91%
rename from docs/circuit_cutting/explanation/index.rst
rename to docs/explanation/index.rst
index 8f9e2208c..3ba9fc51b 100644
--- a/docs/circuit_cutting/explanation/index.rst
+++ b/docs/explanation/index.rst
@@ -1,8 +1,8 @@
 .. _circuit cutting explanation:
 
-###################################################
-Explanatory material for the circuit cutting module
-###################################################
+####################
+Explanatory material
+####################
 
 Overview of circuit cutting
 ---------------------------
@@ -20,7 +20,7 @@ Circuit cutting as a quasiprobability decomposition (QPD)
 ---------------------------------------------------------
 Quasiprobability decomposition is a technique which can be used to simulate quantum circuit executions that go beyond the actual capabilities of current quantum hardware while using that same hardware.  It forms the basis of many error mitigation techniques, which allow simulating a noise-free quantum computer using a noisy one.  Circuit cutting techniques, which allow simulating a quantum circuit using fewer qubits than would otherwise be necessary, can also be phrased in terms of a quasiprobability decomposition.  No matter the goal, the cost of the quasiprobability decomposition is an exponential overhead in the number of circuit executions which must be performed.  In certain cases, this tradeoff is worth it, because it can allow the estimation of quantities that would otherwise be impossible on today's hardware.
 
-There are two types of cuts: gate cuts and wire cuts.  Gate cuts, also known as "space-like" cuts, exist when the cut goes through a gate operating on two (or more) qubits.  Wire cuts, also known as "time-like" cuts, are direct cuts through a qubit wire, essentially a single-qubit identity gate that has been cut into two pieces.  In CKT, a wire cut is represented by introducing a new qubit into the circuit and moving remaining operations after the cut identity gate to the new qubit; see :ref:`wire cutting as move`, below.
+There are two types of cuts: gate cuts and wire cuts.  Gate cuts, also known as "space-like" cuts, exist when the cut goes through a gate operating on two (or more) qubits.  Wire cuts, also known as "time-like" cuts, are direct cuts through a qubit wire, essentially a single-qubit identity gate that has been cut into two pieces.  In this package, a wire cut is represented by introducing a new qubit into the circuit and moving remaining operations after the cut identity gate to the new qubit; see :ref:`wire cutting as move`, below.
 
 There are `three settings <https://research.ibm.com/blog/circuit-knitting-with-classical-communication>`__ to consider for circuit cutting.  The first is where only local operations (LO) [i.e., local *quantum* operations] are available.  The other settings introduce classical communication between the circuit executions, which is known in the quantum information literature as LOCC, for `local operations and classical communication <https://en.wikipedia.org/wiki/LOCC>`__.  The LOCC can be either near-time, one-directional communication between the circuit executions (the second setting), or real-time, bi-directional communication (the third setting).
 
@@ -29,7 +29,7 @@ The sampling overhead is the factor by which the overall number of shots must in
 The overhead of a cut gate depends on which gate is cut; see the final appendix of [`1 <https://arxiv.org/abs/2205.00016>`__] for details.
 For instance, a single cut CNOT gate incurs a sampling overhead of 9 [`2 <https://arxiv.org/abs/1909.07534>`__,\ `6 <https://arxiv.org/abs/2312.11638>`__].
 A circuit with :math:`n` wire cuts incurs a sampling overhead of O(:math:`16^n`) when classical communication is not available (LO setting); this is reduced to O(:math:`4^n`) when classical communication is available (LOCC setting) [`4 <https://arxiv.org/abs/2302.03366>`__].
-However, wire cutting with classical communication (LOCC) is not yet supported in CKT (see issue `#264 <https://github.com/Qiskit-Extensions/circuit-knitting-toolbox/issues/264>`__).
+However, wire cutting with classical communication (LOCC) is not yet supported by this package (see issue `#264 <https://github.com/Qiskit/qiskit-addon-cutting/issues/264>`__).
 
 The QPD can be given explicitly as follows:
 
@@ -121,14 +121,14 @@ We can formalize this notion of local unitary equivalence and expand it to all t
 where :math:`V_1`, :math:`V_2`, :math:`V_3`, and :math:`V_4` are local, single-qubit operations, and the two-qubit portion of the interaction is parametrized entirely by :math:`\vec{\theta} = (\theta_x, \theta_y, \theta_z)`.  By convention, we have chosen :math:`\vec{\theta}` to be in the "Weyl chamber" restricted by :math:`\pi/4 \geq \theta_x \geq \theta_y \geq | \theta_z | \geq 0` [`6 <https://arxiv.org/abs/2312.11638>`__].
 For more information on the KAK decomposition, see Ref. [`7 <https://arxiv.org/abs/quant-ph/0209120>`__].
 
-The code that generates subexperiments from the KAK decomposition currently follows Ref. [`3 <https://arxiv.org/abs/2006.11174>`__], which is now known to be non-optimal.  A provably optimal method has been presented in Ref. [`6 <https://arxiv.org/abs/2312.11638>`__], but this newer method has not yet been implemented in CKT (see issue `#531 <https://github.com/Qiskit-Extensions/circuit-knitting-toolbox/issues/531>`__).
+The code that generates subexperiments from the KAK decomposition currently follows Ref. [`3 <https://arxiv.org/abs/2006.11174>`__], which is now known to be non-optimal.  A provably optimal method has been presented in Ref. [`6 <https://arxiv.org/abs/2312.11638>`__], but this newer method has not yet been implemented in this package (see issue `#531 <https://github.com/Qiskit/qiskit-addon-cutting/issues/531>`__).
 
 .. _wire cutting as move:
 
 Wire cutting phrased as a two-qubit :class:`.Move` operation
 ------------------------------------------------------------
 
-A wire cut is represented fundamentally in CKT as a two-qubit :class:`.Move` instruction, which is defined as a reset of the second qubit followed by a swap of both qubits.  Equivalently, the operation is defined as transferring the state of the first qubit wire to the second qubit wire, while simultaneously discarding the state of the second qubit wire (the first qubit ends up in state :math:`\lvert 0 \rangle`).
+A wire cut is represented fundamentally by this package as a two-qubit :class:`.Move` instruction, which is defined as a reset of the second qubit followed by a swap of both qubits.  Equivalently, the operation is defined as transferring the state of the first qubit wire to the second qubit wire, while simultaneously discarding the state of the second qubit wire (the first qubit ends up in state :math:`\lvert 0 \rangle`).
 
 We have chosen to represent wire cuts in this way primarily because it is consistent with the way one must treat wire cuts when acting on physical qubits: for instance, a wire cut might take the state of physical qubit :math:`n` and continue it as physical qubit :math:`m` after the cut.  Our choice also has the benefit of allowing us to think of "instruction cutting" as a unified framework for considering both wire cuts and gate cuts in the same formalism, being that a wire cut is just a cut :class:`.Move` instruction.
 
@@ -136,11 +136,11 @@ More information on this formalism is given in Sec. 3 of Ref. [`4 <https://arxiv
 
 If you prefer to place cut wires abstractly on a single qubit wire, please see the `how-to guide on placing wire cuts using a single-qubit instruction <../how-tos/how_to_specify_cut_wires.ipynb>`__, which explains how to use the :func:`.cut_wires` function to convert a circuit with :class:`.CutWire` instructions to a circuit with :class:`.Move`\ s on additional qubits.
 
-Sample weights in CKT
----------------------
-In CKT, the number of samples taken from the distribution is generally controlled by a ``num_samples`` argument, and each sample has an associated weight which is used during expectation value reconstruction. Each weight with absolute value above a threshold of 1 / ``num_samples`` will be evaluated exactly.  The remaining low-probability elements -- those in the tail of the distribution -- will then be sampled, resulting in at most ``num_samples`` unique weights. Setting ``num_samples`` to infinity indicates that all weights should be generated rigorously, rather than by sampling from the distribution.
+Sample weights in the Qiskit addon for circuit cutting
+------------------------------------------------------
+In this package, the number of samples taken from the distribution is generally controlled by a ``num_samples`` argument, and each sample has an associated weight which is used during expectation value reconstruction. Each weight with absolute value above a threshold of 1 / ``num_samples`` will be evaluated exactly.  The remaining low-probability elements -- those in the tail of the distribution -- will then be sampled, resulting in at most ``num_samples`` unique weights. Setting ``num_samples`` to infinity indicates that all weights should be generated rigorously, rather than by sampling from the distribution.
 
-Much of the circuit cutting literature describes a process where we sample from the distribution, take a single shot, then sample from the distribution again and repeat; however, this is not feasible in practice, so we instead perform all sampling upfront.  For now, because of limitations in version 1 of the Qiskit primitives, we take a fixed number of shots for each considered subexperiment and send the subexperiments to the backend(s) in batches. During reconstruction, each subexperiment contributes to the final result with proportion equal to its weight.  One must ensure the number of shots taken is sufficient for the heaviest weighted subexperiment.  In the future, we plan to support passing an individual ``shots`` count with each subexperiment to Qiskit Runtime, so that each subexperiment will be run with a number of shots proportional to that subexperiment's weight in the final result (see issue `#532 <https://github.com/Qiskit-Extensions/circuit-knitting-toolbox/issues/532>`__).  This per-experiment shots count is a new feature enabled by version 2 of the Qiskit primitives.
+Much of the circuit cutting literature describes a process where we sample from the distribution, take a single shot, then sample from the distribution again and repeat; however, this is not feasible in practice, so we instead perform all sampling upfront.  For now, because of limitations in version 1 of the Qiskit primitives, we take a fixed number of shots for each considered subexperiment and send the subexperiments to the backend(s) in batches. During reconstruction, each subexperiment contributes to the final result with proportion equal to its weight.  One must ensure the number of shots taken is sufficient for the heaviest weighted subexperiment.  In the future, we plan to support passing an individual ``shots`` count with each subexperiment to Qiskit Runtime, so that each subexperiment will be run with a number of shots proportional to that subexperiment's weight in the final result (see issue `#532 <https://github.com/Qiskit/qiskit-addon-cutting/issues/532>`__).  This per-experiment shots count is a new feature enabled by version 2 of the Qiskit primitives.
 
 Sampling overhead reference table
 ---------------------------------
@@ -184,8 +184,8 @@ The below table provides the sampling overhead factor for a variety of two-qubit
 
 Current limitations
 -------------------
-* The workflow only allows taking the *expectation value* of observables with respect to a circuit.  Limited support for reconstructing an output probability distribution may be added to a future version of CKT (see issue `#259 <https://github.com/Qiskit-Extensions/circuit-knitting-toolbox/issues/259>`__).
-* Due to current code limitations, some of the generated subexperiments are redundant.  This can result in more subexperiments than expected, particularly when using wire cutting.  This is tracked by issue `#262 <https://github.com/Qiskit-Extensions/circuit-knitting-toolbox/issues/262>`__.
+* The workflow only allows taking the *expectation value* of observables with respect to a circuit.  Limited support for reconstructing an output probability distribution may be added to a future version of this package (see issue `#259 <https://github.com/Qiskit/qiskit-addon-cutting/issues/259>`__).
+* Due to current code limitations, some of the generated subexperiments are redundant.  This can result in more subexperiments than expected, particularly when using wire cutting.  This is tracked by issue `#262 <https://github.com/Qiskit/qiskit-addon-cutting/issues/262>`__.
 
 References
 ----------
diff --git a/docs/circuit_cutting/how-tos/README.rst b/docs/how-tos/README.rst
similarity index 91%
rename from docs/circuit_cutting/how-tos/README.rst
rename to docs/how-tos/README.rst
index 9cb7f9223..3c2c501fc 100644
--- a/docs/circuit_cutting/how-tos/README.rst
+++ b/docs/how-tos/README.rst
@@ -1,5 +1,5 @@
-Circuit Cutting How-To Guides
------------------------------
+How-To Guides
+-------------
 
 - `Generate exact quasi-distributions <how_to_generate_exact_quasi_dists_from_sampler.ipynb>`__:
   Use the :class:`~qiskit_addon_cutting.utils.simulation.ExactSampler` interface to generate
diff --git a/docs/circuit_cutting/how-tos/how_to_generate_exact_quasi_dists_from_sampler.ipynb b/docs/how-tos/how_to_generate_exact_quasi_dists_from_sampler.ipynb
similarity index 100%
rename from docs/circuit_cutting/how-tos/how_to_generate_exact_quasi_dists_from_sampler.ipynb
rename to docs/how-tos/how_to_generate_exact_quasi_dists_from_sampler.ipynb
diff --git a/docs/circuit_cutting/how-tos/how_to_generate_exact_sampling_coefficients.ipynb b/docs/how-tos/how_to_generate_exact_sampling_coefficients.ipynb
similarity index 100%
rename from docs/circuit_cutting/how-tos/how_to_generate_exact_sampling_coefficients.ipynb
rename to docs/how-tos/how_to_generate_exact_sampling_coefficients.ipynb
diff --git a/docs/circuit_cutting/how-tos/how_to_specify_cut_wires.ipynb b/docs/how-tos/how_to_specify_cut_wires.ipynb
similarity index 100%
rename from docs/circuit_cutting/how-tos/how_to_specify_cut_wires.ipynb
rename to docs/how-tos/how_to_specify_cut_wires.ipynb
diff --git a/docs/circuit_cutting/how-tos/index.rst b/docs/how-tos/index.rst
similarity index 100%
rename from docs/circuit_cutting/how-tos/index.rst
rename to docs/how-tos/index.rst
diff --git a/docs/index.rst b/docs/index.rst
index d8022f570..86b2b2759 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1,39 +1,40 @@
-########################
-Circuit Knitting Toolbox
-########################
+#############################
+Qiskit addon: circuit cutting
+#############################
 
-.. image:: https://img.shields.io/github/stars/Qiskit-Extensions/circuit-knitting-toolbox?style=social
+.. image:: https://img.shields.io/github/stars/Qiskit/qiskit-addon-cutting?style=social
    :alt: GitHub repository star counter badge
-   :target: https://github.com/Qiskit-Extensions/circuit-knitting-toolbox
+   :target: https://github.com/Qiskit/qiskit-addon-cutting
 
-Circuit Knitting is the process of decomposing a quantum circuit into smaller circuits, executing those smaller circuits on a quantum processor(s), and then knitting their results into a reconstruction of the original circuit's outcome.
+Qiskit addons are a collection of modular tools for building utility-scale workloads powered by Qiskit.
 
-The toolbox currently contains the following tools:
-
-- Circuit Cutting
+This package implements circuit cutting.  In this technique, a handful of gates and/or wires are cut, resulting in smaller circuits that are better suited for execution on hardware.  The result of the original circuit can then be reconstructed; however, the trade-off is that the overall number of shots must be increased by a factor exponential in the number of cuts.
 
 For a more detailed discussion on circuit cutting, check out our `technical guide <./circuit_cutting/explanation/index.rst#overview-of-circuit-cutting>`__.
 
 We follow `semantic versioning <https://semver.org/>`__ and are guided by the principles in  `Qiskit's deprecation policy <https://github.com/Qiskit/qiskit/blob/main/DEPRECATION.md>`__.  We may occasionally make breaking changes in order to improve the user experience.  When possible, we will keep old interfaces and mark them as deprecated, as long as they can co-exist with the new ones.  Each substantial improvement, breaking change, or deprecation will be documented in the :ref:`release notes`.
 
+.. note::
+   This package was known as the Circuit Knitting Toolbox prior to September 2024.
+
 Citing this project
 -------------------
 
-If you use the Circuit Knitting Toolbox in your research, please cite it according to ``CITATON.bib`` file included in this repository:
+If you use this package in your research, please cite it according to ``CITATON.bib`` file included in this repository:
 
 .. literalinclude:: ../CITATION.bib
    :language: bibtex
 
-If you are using the entanglement forging tool in CKT version 0.5 or earlier, please use `an older version of the citation file <https://github.com/Qiskit-Extensions/circuit-knitting-toolbox/blob/stable/0.5/CITATION.bib>`__ which includes the authors of that tool.
+If you are using the entanglement forging tool in Circuit Knitting Toolbox version 0.5 or earlier, please use `an older version of the citation file <https://github.com/Qiskit/qiskit-addon-cutting/blob/stable/0.5/CITATION.bib>`__ which includes the authors of that tool.
 
-If you are using the CutQC tool in CKT version 0.7 or earlier, please use `an older version of the citation file <https://github.com/Qiskit-Extensions/circuit-knitting-toolbox/blob/stable/0.7/CITATION.bib>`__ which includes the authors of that tool.
+If you are using the CutQC tool in Circuit Knitting Toolbox version 0.7 or earlier, please use `an older version of the citation file <https://github.com/Qiskit/qiskit-addon-cutting/blob/stable/0.7/CITATION.bib>`__ which includes the authors of that tool.
 
 Developer guide
 ---------------
 
-The source code to the toolbox is available `on GitHub <https://github.com/Qiskit-Extensions/circuit-knitting-toolbox>`__.
+The source code to this package is available `on GitHub <https://github.com/Qiskit/qiskit-addon-cutting>`__.
 
-The developer guide is located at `CONTRIBUTING.md <https://github.com/Qiskit-Extensions/circuit-knitting-toolbox/blob/main/CONTRIBUTING.md>`__ in the root of this project's repository.
+The developer guide is located at `CONTRIBUTING.md <https://github.com/Qiskit/qiskit-addon-cutting/blob/main/CONTRIBUTING.md>`__ in the root of this project's repository.
 
 Contents
 --------
@@ -41,24 +42,14 @@ Contents
 .. toctree::
   :maxdepth: 2
 
-  About Circuit Knitting Toolbox <self>
+  Documentation Home <self>
   Installation Instructions <install>
-
-.. toctree::
-  :maxdepth: 2
-  :caption: Circuit Cutting
-
-  Cutting Tutorials <circuit_cutting/tutorials/index>
-  Cutting Explanatory Material <circuit_cutting/explanation/index>
-  Cutting How-To Guides <circuit_cutting/how-tos/index>
-
-.. toctree::
-  :maxdepth: 2
-  :caption: References
-
+  Tutorials <tutorials/index>
+  Explanatory Material <explanation/index>
+  How-To Guides <how-tos/index>
   API References <apidocs/index>
+  GitHub <https://github.com/Qiskit/qiskit-addon-cutting>
   Release Notes <release-notes>
-  GitHub <https://github.com/Qiskit-Extensions/circuit-knitting-toolbox>
 
 .. Hiding - Indices and tables
    :ref:`genindex`
diff --git a/docs/circuit_cutting/tutorials/01_gate_cutting_to_reduce_circuit_width.ipynb b/docs/tutorials/01_gate_cutting_to_reduce_circuit_width.ipynb
similarity index 100%
rename from docs/circuit_cutting/tutorials/01_gate_cutting_to_reduce_circuit_width.ipynb
rename to docs/tutorials/01_gate_cutting_to_reduce_circuit_width.ipynb
diff --git a/docs/circuit_cutting/tutorials/02_gate_cutting_to_reduce_circuit_depth.ipynb b/docs/tutorials/02_gate_cutting_to_reduce_circuit_depth.ipynb
similarity index 100%
rename from docs/circuit_cutting/tutorials/02_gate_cutting_to_reduce_circuit_depth.ipynb
rename to docs/tutorials/02_gate_cutting_to_reduce_circuit_depth.ipynb
diff --git a/docs/circuit_cutting/tutorials/03_wire_cutting_via_move_instruction.ipynb b/docs/tutorials/03_wire_cutting_via_move_instruction.ipynb
similarity index 100%
rename from docs/circuit_cutting/tutorials/03_wire_cutting_via_move_instruction.ipynb
rename to docs/tutorials/03_wire_cutting_via_move_instruction.ipynb
diff --git a/docs/circuit_cutting/tutorials/04_automatic_cut_finding.ipynb b/docs/tutorials/04_automatic_cut_finding.ipynb
similarity index 99%
rename from docs/circuit_cutting/tutorials/04_automatic_cut_finding.ipynb
rename to docs/tutorials/04_automatic_cut_finding.ipynb
index 366cda7bd..2a29ad102 100644
--- a/docs/circuit_cutting/tutorials/04_automatic_cut_finding.ipynb
+++ b/docs/tutorials/04_automatic_cut_finding.ipynb
@@ -4,7 +4,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "## Automatically find cuts using CKT"
+    "## Automatically find cuts"
    ]
   },
   {
diff --git a/docs/circuit_cutting/tutorials/README.rst b/docs/tutorials/README.rst
similarity index 90%
rename from docs/circuit_cutting/tutorials/README.rst
rename to docs/tutorials/README.rst
index 17f8361e1..3b3615c38 100644
--- a/docs/circuit_cutting/tutorials/README.rst
+++ b/docs/tutorials/README.rst
@@ -1,5 +1,5 @@
-Circuit Cutting Tutorials
--------------------------
+Tutorials
+---------
 
 - `Tutorial 1 <01_gate_cutting_to_reduce_circuit_width.ipynb>`__:
   Separate sets of qubits by cutting nonlocal gates.
diff --git a/docs/circuit_cutting/tutorials/index.rst b/docs/tutorials/index.rst
similarity index 100%
rename from docs/circuit_cutting/tutorials/index.rst
rename to docs/tutorials/index.rst
diff --git a/pyproject.toml b/pyproject.toml
index ead9dc1cb..90cd1d059 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -5,17 +5,17 @@ build-backend = "hatchling.build"
 [project]
 name = "qiskit-addon-cutting"
 version = "0.9.0.dev"
-description = "A software prototype for a circuit knitting toolbox which connects user applications with runtime primitives"
+description = "Reduce width and depth of quantum circuits by cutting gates and wires."
 readme = "README.md"
 license = {file = "LICENSE.txt"}
 classifiers = [
-    "Development Status :: 3 - Alpha",
     "Intended Audience :: Developers",
     "Intended Audience :: Science/Research",
     "License :: OSI Approved :: Apache Software License",
     "Natural Language :: English",
     "Operating System :: MacOS",
     "Operating System :: POSIX :: Linux",
+    "Operating System :: Microsoft :: Windows",
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
@@ -83,8 +83,8 @@ notebook-dependencies = [
 ]
 
 [project.urls]
-"Documentation" = "https://qiskit-extensions.github.io/circuit-knitting-toolbox/"
-"Repository" = "https://github.com/Qiskit-Extensions/circuit-knitting-toolbox"
+"Documentation" = "https://qiskit.github.io/qiskit-addon-cutting/"
+"Repository" = "https://github.com/Qiskit/qiskit-addon-cutting"
 
 [tool.hatch.build.targets.wheel]
 only-include = [
diff --git a/qiskit_addon_cutting/cut_finding/circuit_interface.py b/qiskit_addon_cutting/cut_finding/circuit_interface.py
index 4f9242a53..2e6d08a32 100644
--- a/qiskit_addon_cutting/cut_finding/circuit_interface.py
+++ b/qiskit_addon_cutting/cut_finding/circuit_interface.py
@@ -324,7 +324,7 @@ def export_subcircuits_as_string(
     ) -> str:
         """Return a string that maps qubits/wires in the output circuit to subcircuits.
 
-        This mapping is done per the Circuit Knitting Toolbox convention. This
+        This mapping is done per this package's convention. This
         method only works with mappings to numeric qubit/wire names.
         """
         wire_map = self.make_wire_mapping(name_mapping)
diff --git a/qiskit_addon_cutting/cut_finding/cutting_actions.py b/qiskit_addon_cutting/cut_finding/cutting_actions.py
index 450f35ed3..476a47479 100644
--- a/qiskit_addon_cutting/cut_finding/cutting_actions.py
+++ b/qiskit_addon_cutting/cut_finding/cutting_actions.py
@@ -181,7 +181,7 @@ def get_cost_params(
         This method returns a tuple of the form:
             (<gamma_lower_bound>, <num_bell_pairs>, <gamma_upper_bound>)
 
-        Since CKT does not support LOCC at the moment, these tuples will be of
+        Since this package does not support LOCC at the moment, these tuples will be of
         the form (gamma, 0, gamma).
         """
         gate = gate_spec.gate
diff --git a/qiskit_addon_cutting/cutting_experiments.py b/qiskit_addon_cutting/cutting_experiments.py
index 9870b5f03..106609404 100644
--- a/qiskit_addon_cutting/cutting_experiments.py
+++ b/qiskit_addon_cutting/cutting_experiments.py
@@ -159,7 +159,7 @@ def generate_cutting_experiments(
     # Remove initial and final resets from the subexperiments.  This will
     # enable the `Move` operation to work on backends that don't support
     # `Reset`, as long as qubits are not re-used.  See
-    # https://github.com/Qiskit-Extensions/circuit-knitting-toolbox/issues/452.
+    # https://github.com/Qiskit/qiskit-addon-cutting/issues/452.
     # While we are at it, we also consolidate each run of multiple resets
     # (which can arise when re-using qubits) into a single reset.
     for subexperiments in subexperiments_dict.values():
@@ -363,7 +363,7 @@ def _get_pauli_indices(cog: CommutingObservableGroup) -> list[int]:
     """Return the indices to qubits to be measured."""
     # If the circuit has no measurements, the Sampler will fail.  So, we
     # measure one qubit as a temporary workaround to
-    # https://github.com/Qiskit-Extensions/circuit-knitting-toolbox/issues/422
+    # https://github.com/Qiskit/qiskit-addon-cutting/issues/422
     pauli_indices = cog.pauli_indices
     if not pauli_indices:
         pauli_indices = [0]
diff --git a/qiskit_addon_cutting/instructions/move.py b/qiskit_addon_cutting/instructions/move.py
index ebe8ac825..cb7afa4c0 100644
--- a/qiskit_addon_cutting/instructions/move.py
+++ b/qiskit_addon_cutting/instructions/move.py
@@ -67,7 +67,7 @@ class Move(Instruction):
 
     A full demonstration of the :class:`Move` instruction is available in `the
     introductory tutorial on wire cutting
-    <../circuit_cutting/tutorials/03_wire_cutting_via_move_instruction.ipynb>`__.
+    <../tutorials/03_wire_cutting_via_move_instruction.ipynb>`__.
     """
 
     def __init__(self, label: str | None = None):
diff --git a/qiskit_addon_cutting/utils/observable_grouping.py b/qiskit_addon_cutting/utils/observable_grouping.py
index 05d26413b..9231e7938 100644
--- a/qiskit_addon_cutting/utils/observable_grouping.py
+++ b/qiskit_addon_cutting/utils/observable_grouping.py
@@ -213,7 +213,7 @@ def __init__(self, observables: PauliList | Iterable[Pauli], /):
         # important case, evaluating the "expectation value" of the identity of
         # the current subsystem (which really just involves keeping track of
         # QPD measurements only).
-        # https://github.com/Qiskit-Extensions/circuit-knitting-toolbox/issues/155
+        # https://github.com/Qiskit/qiskit-addon-cutting/issues/155
 
         # For each mutually commuting group of observables, we put together a
         # CommutingObservableGroup data structure.
diff --git a/releasenotes/notes/0.7/prepare-0.7.0-48b344ae77523c34.yaml b/releasenotes/notes/0.7/prepare-0.7.0-48b344ae77523c34.yaml
index 116803814..cb8bebdf8 100644
--- a/releasenotes/notes/0.7/prepare-0.7.0-48b344ae77523c34.yaml
+++ b/releasenotes/notes/0.7/prepare-0.7.0-48b344ae77523c34.yaml
@@ -18,5 +18,5 @@ other:
     :class:`~qiskit.quantum_info.Pauli` observables.
   - |
     The `circuit cutting explanation
-    <./circuit_cutting/explanation/index.rst>`__ document has been
+    <./explanation/index.rst>`__ document has been
     expanded significantly.
diff --git a/test/conftest.py b/test/conftest.py
index a061a8ce8..2f3a2936b 100644
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -9,7 +9,7 @@
 # copyright notice, and modified files need to carry a notice indicating
 # that they have been altered from the originals.
 
-"""Pytest configuration for Circuit Knitting Toolbox"""
+"""Pytest configuration for the Qiskit addon for circuit cutting"""
 
 import pytest
 
diff --git a/test/test_cutting_roundtrip.py b/test/test_cutting_roundtrip.py
index 92d0a4252..5a3f99526 100644
--- a/test/test_cutting_roundtrip.py
+++ b/test/test_cutting_roundtrip.py
@@ -183,7 +183,7 @@ def test_sampler_with_identity_subobservable(sampler, is_exact_sampler):
     - ``Sampler`` does not blow up (Issue #422); and
     - ``ExactSampler`` returns correct results
 
-    This is related to https://github.com/Qiskit-Extensions/circuit-knitting-toolbox/issues/422.
+    This is related to https://github.com/Qiskit/qiskit-addon-cutting/issues/422.
     """
     # Create a circuit to cut
     qc = QuantumCircuit(3)
diff --git a/test/test_find_cuts.py b/test/test_find_cuts.py
index 5a8f2d67d..a107af41b 100644
--- a/test/test_find_cuts.py
+++ b/test/test_find_cuts.py
@@ -80,7 +80,7 @@ def test_find_cuts(self):
             )
         with self.subTest(
             "right-wire-cut"
-        ):  # tests resolution of https://github.com/Qiskit-Extensions/circuit-knitting-toolbox/issues/508
+        ):  # tests resolution of https://github.com/Qiskit/qiskit-addon-cutting/issues/508
 
             circuit = QuantumCircuit(5)
             circuit.cx(0, 3)
diff --git a/test/utils/test_transpiler_passes.py b/test/utils/test_transpiler_passes.py
index 84cbc9cb3..5836d68e1 100644
--- a/test/utils/test_transpiler_passes.py
+++ b/test/utils/test_transpiler_passes.py
@@ -9,7 +9,7 @@
 # copyright notice, and modified files need to carry a notice indicating
 # that they have been altered from the originals.
 
-"""Tests for CKT transpilation passes."""
+"""Tests for transpilation passes."""
 
 import unittest
 

From cf6c61b510608a9ece07d98716c56f3e155ce4cd Mon Sep 17 00:00:00 2001
From: Jim Garrison <garrison@ibm.com>
Date: Tue, 10 Sep 2024 10:24:55 -0400
Subject: [PATCH 20/26] Prepare 0.9.0 release (#679)

* Prepare 0.9.0 release

* Bump version
---
 .github/workflows/docs.yml                                  | 2 +-
 .mergify.yml                                                | 2 +-
 pyproject.toml                                              | 2 +-
 .../bump-dependency-versions-26e93b55695c3034.yaml          | 2 +-
 .../{ => 0.9}/cut-finder-enhancement-1e1d37174d7a8860.yaml  | 0
 .../{ => 0.9}/min-reached-finder-flag-aa6dd9021e165f80.yaml | 0
 ...flags-to-control-cut-finder-search-e499e1ea49abb0bc.yaml | 0
 releasenotes/notes/0.9/prepare-0.9.0-6642e0bf18e2f66c.yaml  | 6 ++++++
 .../notes/{ => 0.9}/remove-cutqc-fe70369bdbe65668.yaml      | 0
 .../notes/{ => 0.9}/rm-idle-wires-1758bf8763081a9b.yaml     | 0
 10 files changed, 10 insertions(+), 4 deletions(-)
 rename releasenotes/notes/{ => 0.9}/bump-dependency-versions-26e93b55695c3034.yaml (50%)
 rename releasenotes/notes/{ => 0.9}/cut-finder-enhancement-1e1d37174d7a8860.yaml (100%)
 rename releasenotes/notes/{ => 0.9}/min-reached-finder-flag-aa6dd9021e165f80.yaml (100%)
 rename releasenotes/notes/{ => 0.9}/new-flags-to-control-cut-finder-search-e499e1ea49abb0bc.yaml (100%)
 create mode 100644 releasenotes/notes/0.9/prepare-0.9.0-6642e0bf18e2f66c.yaml
 rename releasenotes/notes/{ => 0.9}/remove-cutqc-fe70369bdbe65668.yaml (100%)
 rename releasenotes/notes/{ => 0.9}/rm-idle-wires-1758bf8763081a9b.yaml (100%)

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index b9e124a26..0ae818810 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -52,7 +52,7 @@ jobs:
           name: qiskit-addon-cutting-htmldocs
           path: ./artifact
       - name: Deploy docs
-        if: ${{ github.ref == 'refs/heads/stable/0.7' }}
+        if: ${{ github.ref == 'refs/heads/stable/0.9' }}
         uses: peaceiris/actions-gh-pages@v4
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.mergify.yml b/.mergify.yml
index 7eabeb009..a8fe0e995 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -5,4 +5,4 @@ pull_request_rules:
     actions:
       backport:
         branches:
-          - stable/0.7
+          - stable/0.9
diff --git a/pyproject.toml b/pyproject.toml
index 90cd1d059..48ebbe6ee 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "qiskit-addon-cutting"
-version = "0.9.0.dev"
+version = "0.9.0"
 description = "Reduce width and depth of quantum circuits by cutting gates and wires."
 readme = "README.md"
 license = {file = "LICENSE.txt"}
diff --git a/releasenotes/notes/bump-dependency-versions-26e93b55695c3034.yaml b/releasenotes/notes/0.9/bump-dependency-versions-26e93b55695c3034.yaml
similarity index 50%
rename from releasenotes/notes/bump-dependency-versions-26e93b55695c3034.yaml
rename to releasenotes/notes/0.9/bump-dependency-versions-26e93b55695c3034.yaml
index 820752b4c..0a41e5404 100644
--- a/releasenotes/notes/bump-dependency-versions-26e93b55695c3034.yaml
+++ b/releasenotes/notes/0.9/bump-dependency-versions-26e93b55695c3034.yaml
@@ -1,5 +1,5 @@
 ---
 upgrade:
   - |
-    CKT now requires updated versions of some dependencies: ``qiskit``
+    This package now requires updated versions of some dependencies: ``qiskit``
     1.1 or later, and ``qiskit-ibm-runtime`` 0.24.0 or later.
diff --git a/releasenotes/notes/cut-finder-enhancement-1e1d37174d7a8860.yaml b/releasenotes/notes/0.9/cut-finder-enhancement-1e1d37174d7a8860.yaml
similarity index 100%
rename from releasenotes/notes/cut-finder-enhancement-1e1d37174d7a8860.yaml
rename to releasenotes/notes/0.9/cut-finder-enhancement-1e1d37174d7a8860.yaml
diff --git a/releasenotes/notes/min-reached-finder-flag-aa6dd9021e165f80.yaml b/releasenotes/notes/0.9/min-reached-finder-flag-aa6dd9021e165f80.yaml
similarity index 100%
rename from releasenotes/notes/min-reached-finder-flag-aa6dd9021e165f80.yaml
rename to releasenotes/notes/0.9/min-reached-finder-flag-aa6dd9021e165f80.yaml
diff --git a/releasenotes/notes/new-flags-to-control-cut-finder-search-e499e1ea49abb0bc.yaml b/releasenotes/notes/0.9/new-flags-to-control-cut-finder-search-e499e1ea49abb0bc.yaml
similarity index 100%
rename from releasenotes/notes/new-flags-to-control-cut-finder-search-e499e1ea49abb0bc.yaml
rename to releasenotes/notes/0.9/new-flags-to-control-cut-finder-search-e499e1ea49abb0bc.yaml
diff --git a/releasenotes/notes/0.9/prepare-0.9.0-6642e0bf18e2f66c.yaml b/releasenotes/notes/0.9/prepare-0.9.0-6642e0bf18e2f66c.yaml
new file mode 100644
index 000000000..e80cec75b
--- /dev/null
+++ b/releasenotes/notes/0.9/prepare-0.9.0-6642e0bf18e2f66c.yaml
@@ -0,0 +1,6 @@
+---
+prelude:
+
+  The most notable change in this release is that the package has been
+  renamed to ``qiskit-cutting-addon``.  It also marks the removal of
+  this package's original implementation of wire cutting, CutQC.
diff --git a/releasenotes/notes/remove-cutqc-fe70369bdbe65668.yaml b/releasenotes/notes/0.9/remove-cutqc-fe70369bdbe65668.yaml
similarity index 100%
rename from releasenotes/notes/remove-cutqc-fe70369bdbe65668.yaml
rename to releasenotes/notes/0.9/remove-cutqc-fe70369bdbe65668.yaml
diff --git a/releasenotes/notes/rm-idle-wires-1758bf8763081a9b.yaml b/releasenotes/notes/0.9/rm-idle-wires-1758bf8763081a9b.yaml
similarity index 100%
rename from releasenotes/notes/rm-idle-wires-1758bf8763081a9b.yaml
rename to releasenotes/notes/0.9/rm-idle-wires-1758bf8763081a9b.yaml

From 90528067e35e85366cb004e802d6ea5625751236 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 10 Sep 2024 13:48:33 -0400
Subject: [PATCH 21/26] Bump ruff from 0.6.3 to 0.6.4 (#680)

Bumps [ruff](https://github.com/astral-sh/ruff) from 0.6.3 to 0.6.4.
- [Release notes](https://github.com/astral-sh/ruff/releases)
- [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md)
- [Commits](https://github.com/astral-sh/ruff/compare/0.6.3...0.6.4)

---
updated-dependencies:
- dependency-name: ruff
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 48ebbe6ee..c5af78d35 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -54,7 +54,7 @@ nbtest = [
 style = [
     "autoflake==2.3.1",
     "black[jupyter]~=24.1",
-    "ruff==0.6.3",
+    "ruff==0.6.4",
     "nbqa>=1.6.0",
 ]
 lint = [

From 4e4643d892aa4c143fbcfb7a5d0637cab3133c27 Mon Sep 17 00:00:00 2001
From: Jim Garrison <garrison@ibm.com>
Date: Tue, 10 Sep 2024 15:23:12 -0400
Subject: [PATCH 22/26] Disable highlighting of BibTeX background (#681)

* Disable highlighting of BibTeX background

* Just disable all background highlighting
---
 docs/_static/css/custom.css | 4 ++++
 docs/conf.py                | 1 +
 2 files changed, 5 insertions(+)
 create mode 100644 docs/_static/css/custom.css

diff --git a/docs/_static/css/custom.css b/docs/_static/css/custom.css
new file mode 100644
index 000000000..79631ba52
--- /dev/null
+++ b/docs/_static/css/custom.css
@@ -0,0 +1,4 @@
+/* Disable backgrounds in code highlighting, which look especially bad in dark mode. */
+.highlight * {
+    background-color: transparent !important;
+}
diff --git a/docs/conf.py b/docs/conf.py
index 3ce92a2a5..9c97ac495 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -83,6 +83,7 @@
     "light_logo": "images/qiskit-light-logo.svg",
 }
 html_static_path = ["_static"]
+html_css_files = ["css/custom.css"]
 
 # autodoc/autosummary options
 autosummary_generate = True

From 587b084d3af0d1bdbe80665560b5a8cced030e89 Mon Sep 17 00:00:00 2001
From: Max Rossmannek <max@rossmannek.de>
Date: Thu, 12 Sep 2024 15:29:10 +0200
Subject: [PATCH 23/26] fix: broken link in Release shield (#683)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1d62e2e9d..3b9fa6567 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 <!-- SHIELDS -->
 <div align="left">
 
-  [![Release](https://img.shields.io/pypi/v/qiskit-addon-cutting.svg?label=Release)](https://github.com/Qiskit-Extensions/qiskit-addon-cutting/releases)
+  [![Release](https://img.shields.io/pypi/v/qiskit-addon-cutting.svg?label=Release)](https://github.com/Qiskit/qiskit-addon-cutting/releases)
   ![Platform](https://img.shields.io/badge/%F0%9F%92%BB%20Platform-Linux%20%7C%20macOS%20%7C%20Windows-informational)
   [![Python](https://img.shields.io/pypi/pyversions/qiskit-addon-cutting?label=Python&logo=python)](https://www.python.org/)
   [![Qiskit](https://img.shields.io/badge/Qiskit%20-%20%3E%3D1.1%20-%20%236133BD?logo=Qiskit)](https://github.com/Qiskit/qiskit)

From 1ed9d8a5dd516966f78c6574b27098421d66e718 Mon Sep 17 00:00:00 2001
From: Jim Garrison <garrison@ibm.com>
Date: Mon, 16 Sep 2024 11:04:00 -0400
Subject: [PATCH 24/26] Phrase tutorials as Qiskit patterns (#682)

* Add section headers to denote Qiskit pattern steps

* Introduce text about Qiskit patterns

Co-authored-by: Ibrahim Shehzad <75153717+ibrahim-shehzad@users.noreply.github.com>

* Rename `final_expval` to `reconstructed_expval`

---------

Co-authored-by: Ibrahim Shehzad <75153717+ibrahim-shehzad@users.noreply.github.com>
---
 docs/how-tos/how_to_specify_cut_wires.ipynb   | 10 +--
 ...gate_cutting_to_reduce_circuit_width.ipynb | 38 +++++++----
 ...gate_cutting_to_reduce_circuit_depth.ipynb | 64 ++++++++++++++-----
 ...03_wire_cutting_via_move_instruction.ipynb | 36 +++++++----
 docs/tutorials/04_automatic_cut_finding.ipynb | 13 +++-
 5 files changed, 115 insertions(+), 46 deletions(-)

diff --git a/docs/how-tos/how_to_specify_cut_wires.ipynb b/docs/how-tos/how_to_specify_cut_wires.ipynb
index 1711d23c0..d3a5cf12d 100644
--- a/docs/how-tos/how_to_specify_cut_wires.ipynb
+++ b/docs/how-tos/how_to_specify_cut_wires.ipynb
@@ -350,12 +350,12 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "reconstructed_expvals = reconstruct_expectation_values(\n",
+    "reconstructed_expval_terms = reconstruct_expectation_values(\n",
     "    results,\n",
     "    coefficients,\n",
     "    subobservables,\n",
     ")\n",
-    "final_expval = np.dot(reconstructed_expvals, observable.coeffs)"
+    "reconstructed_expval = np.dot(reconstructed_expval_terms, observable.coeffs)"
    ]
   },
   {
@@ -380,11 +380,11 @@
     "exact_expval = (\n",
     "    estimator.run([(qc_0.decompose(\"cut_wire\"), observable)]).result()[0].data.evs\n",
     ")\n",
-    "print(f\"Reconstructed expectation value: {np.real(np.round(final_expval, 8))}\")\n",
+    "print(f\"Reconstructed expectation value: {np.real(np.round(reconstructed_expval, 8))}\")\n",
     "print(f\"Exact expectation value: {np.round(exact_expval, 8)}\")\n",
-    "print(f\"Error in estimation: {np.real(np.round(final_expval-exact_expval, 8))}\")\n",
+    "print(f\"Error in estimation: {np.real(np.round(reconstructed_expval-exact_expval, 8))}\")\n",
     "print(\n",
-    "    f\"Relative error in estimation: {np.real(np.round((final_expval-exact_expval) / exact_expval, 8))}\"\n",
+    "    f\"Relative error in estimation: {np.real(np.round((reconstructed_expval-exact_expval) / exact_expval, 8))}\"\n",
     ")"
    ]
   }
diff --git a/docs/tutorials/01_gate_cutting_to_reduce_circuit_width.ipynb b/docs/tutorials/01_gate_cutting_to_reduce_circuit_width.ipynb
index ac2480fa0..bdc1f2fc1 100644
--- a/docs/tutorials/01_gate_cutting_to_reduce_circuit_width.ipynb
+++ b/docs/tutorials/01_gate_cutting_to_reduce_circuit_width.ipynb
@@ -7,13 +7,19 @@
    "source": [
     "## Gate Cutting to Reduce Circuit Width\n",
     "\n",
-    "In this tutorial we will simulate the expectation value of a four-qubit circuit using only two-qubit experiments by cutting gates in the circuit.\n",
+    "In this notebook, we will work through the steps of a [Qiskit pattern](https://docs.quantum.ibm.com/guides/intro-to-patterns) while using **circuit cutting** to reduce the number of qubits in a circuit.  We will cut gates to enable us to reconstruct the expectation value of a four-qubit circuit using only two-qubit experiments.\n",
     "\n",
-    "Like any circuit knitting technique, gate cutting can be described as three consecutive steps:\n",
+    "These are the steps that we will take:\n",
     "\n",
-    "- **cut** some non-local gates in the circuit and possibly separate the circuit into subcircuits\n",
-    "- **execute** many sampled subexperiments using the Qiskit Sampler primitive\n",
-    "- **reconstruct** the expectation value of the full-sized circuit"
+    "- **Step 1: Map problem to quantum circuits and operators:**\n",
+    "    - Map the hamiltonian onto a quantum circuit.\n",
+    "- **Step 2: Optimize for target hardware** [_Uses the cutting addon_]:\n",
+    "    - <font color='#0F62FE'>Cut the circuit and observable.</font>\n",
+    "    - Transpile the subexperiments for hardware.\n",
+    "- **Step 3: Execute on target hardware:**\n",
+    "    - Run the subexperiments obtained in Step 2 using a `Sampler` primitive.\n",
+    "- **Step 4: Post-process results** [_Uses the cutting addon_]:\n",
+    "    - <font color='#0F62FE'>Combine the results of Step 3 to reconstruct the expectation value of the observable in question.</font>"
    ]
   },
   {
@@ -21,6 +27,8 @@
    "id": "510910a6",
    "metadata": {},
    "source": [
+    "## Step 1: Map\n",
+    "\n",
     "### Create a circuit to cut"
    ]
   },
@@ -76,6 +84,8 @@
    "id": "162a5629",
    "metadata": {},
    "source": [
+    "## Step 2: Optimize\n",
+    "\n",
     "### Separate the circuit and observable according to a specified qubit partitioning\n",
     "\n",
     "Each label in `partition_labels` corresponds to the `circuit` qubit in the same index. Qubits sharing a common partition label will be grouped together, and non-local gates spanning more than one partition will be cut.\n",
@@ -293,6 +303,8 @@
    "id": "d8870454-2173-4454-90b4-a034779510e0",
    "metadata": {},
    "source": [
+    "## Step 3: Execute\n",
+    "\n",
     "### Run the subexperiments using the Qiskit Runtime Sampler primitive"
    ]
   },
@@ -340,7 +352,9 @@
    "id": "f0032570",
    "metadata": {},
    "source": [
-    "### Reconstruct the expectation values\n",
+    "## Step 4: Post-process\n",
+    "\n",
+    "### Reconstruct the expectation value\n",
     "\n",
     "Reconstruct expectation values for each observable term and combine them to reconstruct the expectation value for the original observable."
    ]
@@ -355,14 +369,14 @@
     "from qiskit_addon_cutting import reconstruct_expectation_values\n",
     "\n",
     "# Get expectation values for each observable term\n",
-    "reconstructed_expvals = reconstruct_expectation_values(\n",
+    "reconstructed_expval_terms = reconstruct_expectation_values(\n",
     "    results,\n",
     "    coefficients,\n",
     "    subobservables,\n",
     ")\n",
     "\n",
     "# Reconstruct final expectation value\n",
-    "final_expval = np.dot(reconstructed_expvals, observable.coeffs)"
+    "reconstructed_expval = np.dot(reconstructed_expval_terms, observable.coeffs)"
    ]
   },
   {
@@ -370,7 +384,7 @@
    "id": "53beaca3",
    "metadata": {},
    "source": [
-    "### Compare the reconstructed expectation values with the exact expectation value from the original circuit and observable"
+    "### Compare the reconstructed expectation value with the exact expectation value from the original circuit and observable"
    ]
   },
   {
@@ -395,11 +409,11 @@
     "\n",
     "estimator = EstimatorV2()\n",
     "exact_expval = estimator.run([(qc, observable)]).result()[0].data.evs\n",
-    "print(f\"Reconstructed expectation value: {np.real(np.round(final_expval, 8))}\")\n",
+    "print(f\"Reconstructed expectation value: {np.real(np.round(reconstructed_expval, 8))}\")\n",
     "print(f\"Exact expectation value: {np.round(exact_expval, 8)}\")\n",
-    "print(f\"Error in estimation: {np.real(np.round(final_expval-exact_expval, 8))}\")\n",
+    "print(f\"Error in estimation: {np.real(np.round(reconstructed_expval-exact_expval, 8))}\")\n",
     "print(\n",
-    "    f\"Relative error in estimation: {np.real(np.round((final_expval-exact_expval) / exact_expval, 8))}\"\n",
+    "    f\"Relative error in estimation: {np.real(np.round((reconstructed_expval-exact_expval) / exact_expval, 8))}\"\n",
     ")"
    ]
   }
diff --git a/docs/tutorials/02_gate_cutting_to_reduce_circuit_depth.ipynb b/docs/tutorials/02_gate_cutting_to_reduce_circuit_depth.ipynb
index ef67b7393..61206d8fc 100644
--- a/docs/tutorials/02_gate_cutting_to_reduce_circuit_depth.ipynb
+++ b/docs/tutorials/02_gate_cutting_to_reduce_circuit_depth.ipynb
@@ -7,13 +7,19 @@
    "source": [
     "# Gate Cutting to Reduce Circuit Depth\n",
     "\n",
-    "In this tutorial, we will simulate some expectation values on a circuit of a certain depth by cutting gates resulting in swap gates and executing subexperiments on shallower circuits.\n",
+    "In this tutorial, we will reduce a circuit's depth by cutting distant gates, avoiding the swap gates that would otherwise be introduced by routing.\n",
     "\n",
-    "Like any circuit knitting technique, gate cutting can be described as three consecutive steps:\n",
+    "These are the steps that we will take in this [Qiskit pattern](https://docs.quantum.ibm.com/guides/intro-to-patterns):\n",
     "\n",
-    "- **decompose** some non-local gates in the circuit and possibly separate the circuit into subcircuits\n",
-    "- **execute** many sampled subexperiments using the Qiskit Sampler primitive\n",
-    "- **reconstruct** the expectation value of the full-sized circuit"
+    "- **Step 1: Map problem to quantum circuits and operators:**\n",
+    "    - Map the hamiltonian onto a quantum circuit.\n",
+    "- **Step 2: Optimize for target hardware** [_Uses the cutting addon_]:\n",
+    "    - <font color='#0F62FE'>Cut the circuit and observable.</font>\n",
+    "    - Transpile the subexperiments for hardware.\n",
+    "- **Step 3: Execute on target hardware:**\n",
+    "    - Run the subexperiments obtained in Step 2 using a `Sampler` primitive.\n",
+    "- **Step 4: Post-process results** [_Uses the cutting addon_]:\n",
+    "    - <font color='#0F62FE'>Combine the results of Step 3 to reconstruct the expectation value of the observable in question.</font>"
    ]
   },
   {
@@ -21,6 +27,8 @@
    "id": "07f7f75d",
    "metadata": {},
    "source": [
+    "## Step 1: Map\n",
+    "\n",
     "### Create a circuit to run on the backend"
    ]
   },
@@ -75,6 +83,8 @@
    "id": "699105a3-903e-49d8-826b-cc8b9b85c9df",
    "metadata": {},
    "source": [
+    "## Step 2: Optimize\n",
+    "\n",
     "### Specify a backend\n",
     "\n",
     "You can provide either a fake backend or a hardware backend from Qiskit Runtime."
@@ -307,20 +317,38 @@
    "id": "fd9a126c",
    "metadata": {},
    "source": [
-    "### Prepare subexperiments for the backend and run them using the Qiskit Runtime Sampler primitive"
+    "### Prepare subexperiments for the backend"
    ]
   },
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "16968c09-13f0-499b-91d0-91b58f1ce6eb",
+   "id": "736a7d14-71b0-47a0-847d-4972ab886918",
    "metadata": {},
    "outputs": [],
    "source": [
-    "from qiskit_ibm_runtime import SamplerV2\n",
-    "\n",
     "# Transpile the subeperiments to the backend's instruction set architecture (ISA)\n",
-    "isa_subexperiments = pass_manager.run(subexperiments)\n",
+    "isa_subexperiments = pass_manager.run(subexperiments)"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "id": "241fc5e5-d367-4a31-aa1f-424acdbbd8dd",
+   "metadata": {},
+   "source": [
+    "## Step 3: Execute\n",
+    "\n",
+    "### Run the subexperiments using the Qiskit Runtime Sampler primitive"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "e4dcc97b-8336-4eb9-9cc0-0d9b87a287e3",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "from qiskit_ibm_runtime import SamplerV2\n",
     "\n",
     "# Set up the Qiskit Runtime Sampler primitive.  For a fake backend, this will use a local simulator.\n",
     "sampler = SamplerV2(backend)\n",
@@ -345,7 +373,9 @@
    "id": "f04d9134-651b-446e-93f4-aa0281786200",
    "metadata": {},
    "source": [
-    "### Reconstruct the expectation values\n",
+    "## Step 4: Post-process\n",
+    "\n",
+    "### Reconstruct the expectation value\n",
     "\n",
     "Reconstruct expectation values for each observable term and combine them to reconstruct the expectation value for the original observable."
    ]
@@ -359,13 +389,13 @@
    "source": [
     "from qiskit_addon_cutting import reconstruct_expectation_values\n",
     "\n",
-    "reconstructed_expvals = reconstruct_expectation_values(\n",
+    "reconstructed_expval_terms = reconstruct_expectation_values(\n",
     "    results,\n",
     "    coefficients,\n",
     "    observable.paulis,\n",
     ")\n",
     "# Reconstruct final expectation value\n",
-    "final_expval = np.dot(reconstructed_expvals, observable.coeffs)"
+    "reconstructed_expval = np.dot(reconstructed_expval_terms, observable.coeffs)"
    ]
   },
   {
@@ -373,7 +403,7 @@
    "id": "3fc2327f",
    "metadata": {},
    "source": [
-    "### Compare the reconstructed expectation values with the exact expectation value from the original circuit and observable"
+    "### Compare the reconstructed expectation value with the exact expectation value from the original circuit and observable"
    ]
   },
   {
@@ -398,11 +428,11 @@
     "\n",
     "estimator = EstimatorV2()\n",
     "exact_expval = estimator.run([(circuit, observable)]).result()[0].data.evs\n",
-    "print(f\"Reconstructed expectation value: {np.real(np.round(final_expval, 8))}\")\n",
+    "print(f\"Reconstructed expectation value: {np.real(np.round(reconstructed_expval, 8))}\")\n",
     "print(f\"Exact expectation value: {np.round(exact_expval, 8)}\")\n",
-    "print(f\"Error in estimation: {np.real(np.round(final_expval-exact_expval, 8))}\")\n",
+    "print(f\"Error in estimation: {np.real(np.round(reconstructed_expval-exact_expval, 8))}\")\n",
     "print(\n",
-    "    f\"Relative error in estimation: {np.real(np.round((final_expval-exact_expval) / exact_expval, 8))}\"\n",
+    "    f\"Relative error in estimation: {np.real(np.round((reconstructed_expval-exact_expval) / exact_expval, 8))}\"\n",
     ")"
    ]
   }
diff --git a/docs/tutorials/03_wire_cutting_via_move_instruction.ipynb b/docs/tutorials/03_wire_cutting_via_move_instruction.ipynb
index 72c4f59db..f59094186 100644
--- a/docs/tutorials/03_wire_cutting_via_move_instruction.ipynb
+++ b/docs/tutorials/03_wire_cutting_via_move_instruction.ipynb
@@ -9,11 +9,17 @@
     "\n",
     "In this tutorial, we will reconstruct expectation values of a seven-qubit circuit by splitting it into two four-qubit circuits using wire cutting.\n",
     "\n",
-    "Like any circuit knitting technique, wire cutting can be described as three consecutive steps:\n",
+    "These are the steps that we will take in this [Qiskit pattern](https://docs.quantum.ibm.com/guides/intro-to-patterns):\n",
     "\n",
-    "- **cut** some wires in the circuit and possibly separate the circuit into subcircuits\n",
-    "- **execute** many sampled subexperiments using the Qiskit Sampler primitive\n",
-    "- **reconstruct** the expectation value of the full-sized circuit"
+    "- **Step 1: Map problem to quantum circuits and operators:**\n",
+    "    - Map the hamiltonian onto a quantum circuit.\n",
+    "- **Step 2: Optimize for target hardware** [_Uses the cutting addon_]:\n",
+    "    - <font color='#0F62FE'>Cut the circuit and observable.</font>\n",
+    "    - Transpile the subexperiments for hardware.\n",
+    "- **Step 3: Execute on target hardware:**\n",
+    "    - Run the subexperiments obtained in Step 2 using a `Sampler` primitive.\n",
+    "- **Step 4: Post-process results** [_Uses the cutting addon_]:\n",
+    "    - <font color='#0F62FE'>Combine the results of Step 3 to reconstruct the expectation value of the observable in question.</font>"
    ]
   },
   {
@@ -21,6 +27,8 @@
    "id": "ae63d837-a7f5-40a5-8186-f98076bb4cd9",
    "metadata": {},
    "source": [
+    "## Step 1: Map\n",
+    "\n",
     "### Create a circuit to cut\n",
     "\n",
     "First, we begin with a circuit inspired by Fig. 1(a) of [arXiv:2302.03366v1](https://arxiv.org/abs/2302.03366v1)."
@@ -108,6 +116,8 @@
    "id": "9f56b094-0c6f-456f-9641-1424395fc6bd",
    "metadata": {},
    "source": [
+    "## Step 2: Optimize\n",
+    "\n",
     "### Create a new circuit where `Move` instructions have been placed at the desired cut locations\n",
     "\n",
     "Given the above circuit, we would like to place two wire cuts on the middle qubit line, so that the circuit can separate into two circuits of four qubits each.  One way to do this is to manually place two-qubit `Move` instructions that move the state from one qubit wire to another.  A `Move` instruction is conceptually equivalent to a reset operation on the second qubit, followed by a SWAP gate.  The effect of this instruction is to transfer the state of the first (source) qubit to the second (detination) qubit, while discarding the incoming state of the second qubit.  For this to work as intended, it is important that the second (destination) qubit share no entanglement with the remainder of the system; otherwise, the reset operation will cause the state of the remainder of the system to be partially collapsed.\n",
@@ -387,6 +397,8 @@
    "id": "9578c64a-8087-4696-bb2b-ca53d45442ba",
    "metadata": {},
    "source": [
+    "## Step 3: Execute\n",
+    "\n",
     "### Run the subexperiments using the Qiskit Runtime Sampler primitive"
    ]
   },
@@ -434,7 +446,9 @@
    "id": "3f6e4eed-eff7-4e16-ad8d-8070011a555b",
    "metadata": {},
    "source": [
-    "### Reconstruct the expectation values\n",
+    "## Step 4: Post-process\n",
+    "\n",
+    "### Reconstruct the expectation value\n",
     "\n",
     "Reconstruct expectation values for each observable term and combine them to reconstruct the expectation value for the original observable."
    ]
@@ -448,12 +462,12 @@
    "source": [
     "from qiskit_addon_cutting import reconstruct_expectation_values\n",
     "\n",
-    "reconstructed_expvals = reconstruct_expectation_values(\n",
+    "reconstructed_expval_terms = reconstruct_expectation_values(\n",
     "    results,\n",
     "    coefficients,\n",
     "    subobservables,\n",
     ")\n",
-    "final_expval = np.dot(reconstructed_expvals, observable.coeffs)"
+    "reconstructed_expval = np.dot(reconstructed_expval_terms, observable.coeffs)"
    ]
   },
   {
@@ -461,7 +475,7 @@
    "id": "cdc793f2-3e2b-417b-b863-7b9d57b86a8f",
    "metadata": {},
    "source": [
-    "### Compare the reconstructed expectation values with the exact expectation value from the original circuit and observable"
+    "### Compare the reconstructed expectation value with the exact expectation value from the original circuit and observable"
    ]
   },
   {
@@ -486,11 +500,11 @@
     "\n",
     "estimator = EstimatorV2()\n",
     "exact_expval = estimator.run([(qc_0, observable)]).result()[0].data.evs\n",
-    "print(f\"Reconstructed expectation value: {np.real(np.round(final_expval, 8))}\")\n",
+    "print(f\"Reconstructed expectation value: {np.real(np.round(reconstructed_expval, 8))}\")\n",
     "print(f\"Exact expectation value: {np.round(exact_expval, 8)}\")\n",
-    "print(f\"Error in estimation: {np.real(np.round(final_expval-exact_expval, 8))}\")\n",
+    "print(f\"Error in estimation: {np.real(np.round(reconstructed_expval-exact_expval, 8))}\")\n",
     "print(\n",
-    "    f\"Relative error in estimation: {np.real(np.round((final_expval-exact_expval) / exact_expval, 8))}\"\n",
+    "    f\"Relative error in estimation: {np.real(np.round((reconstructed_expval-exact_expval) / exact_expval, 8))}\"\n",
     ")"
    ]
   }
diff --git a/docs/tutorials/04_automatic_cut_finding.ipynb b/docs/tutorials/04_automatic_cut_finding.ipynb
index 2a29ad102..6f49ad02f 100644
--- a/docs/tutorials/04_automatic_cut_finding.ipynb
+++ b/docs/tutorials/04_automatic_cut_finding.ipynb
@@ -11,6 +11,8 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
+    "## Step 1: Map\n",
+    "\n",
     "#### Create a circuit and observables"
    ]
   },
@@ -47,6 +49,8 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
+    "## Step 2: Optimize\n",
+    "\n",
     "#### Find cut locations, given a maximum of 4 qubits per subcircuit. This circuit can be separated in two by making a single wire cut and cutting one `CRZGate`"
    ]
   },
@@ -259,6 +263,13 @@
     "    f\"{len(subexperiments[0]) + len(subexperiments[1])} total subexperiments to run on backend.\"\n",
     ")"
    ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "Steps 3 and 4 of a [Qiskit pattern](https://docs.quantum.ibm.com/guides/intro-to-patterns) can then be performed as in the preceding tutorials."
+   ]
   }
  ],
  "metadata": {
@@ -277,7 +288,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.6"
+   "version": "3.11.0"
   }
  },
  "nbformat": 4,

From 0db84dcea03b5d5cf970f1c25c88fc8aa85a9f71 Mon Sep 17 00:00:00 2001
From: Jim Garrison <garrison@ibm.com>
Date: Mon, 16 Sep 2024 12:08:57 -0400
Subject: [PATCH 25/26] Fix tutorial headers (#685)

* Fix tutorial headers

The top header should be at h1 level

I missed this in #682.

* Make colons consistent
---
 .../tutorials/01_gate_cutting_to_reduce_circuit_width.ipynb | 6 +++---
 .../tutorials/02_gate_cutting_to_reduce_circuit_depth.ipynb | 4 ++--
 docs/tutorials/03_wire_cutting_via_move_instruction.ipynb   | 4 ++--
 docs/tutorials/04_automatic_cut_finding.ipynb               | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docs/tutorials/01_gate_cutting_to_reduce_circuit_width.ipynb b/docs/tutorials/01_gate_cutting_to_reduce_circuit_width.ipynb
index bdc1f2fc1..7e7f82b1d 100644
--- a/docs/tutorials/01_gate_cutting_to_reduce_circuit_width.ipynb
+++ b/docs/tutorials/01_gate_cutting_to_reduce_circuit_width.ipynb
@@ -5,18 +5,18 @@
    "id": "ad1f14b4",
    "metadata": {},
    "source": [
-    "## Gate Cutting to Reduce Circuit Width\n",
+    "# Gate Cutting to Reduce Circuit Width\n",
     "\n",
     "In this notebook, we will work through the steps of a [Qiskit pattern](https://docs.quantum.ibm.com/guides/intro-to-patterns) while using **circuit cutting** to reduce the number of qubits in a circuit.  We will cut gates to enable us to reconstruct the expectation value of a four-qubit circuit using only two-qubit experiments.\n",
     "\n",
     "These are the steps that we will take:\n",
     "\n",
-    "- **Step 1: Map problem to quantum circuits and operators:**\n",
+    "- **Step 1: Map problem to quantum circuits and operators**:\n",
     "    - Map the hamiltonian onto a quantum circuit.\n",
     "- **Step 2: Optimize for target hardware** [_Uses the cutting addon_]:\n",
     "    - <font color='#0F62FE'>Cut the circuit and observable.</font>\n",
     "    - Transpile the subexperiments for hardware.\n",
-    "- **Step 3: Execute on target hardware:**\n",
+    "- **Step 3: Execute on target hardware**:\n",
     "    - Run the subexperiments obtained in Step 2 using a `Sampler` primitive.\n",
     "- **Step 4: Post-process results** [_Uses the cutting addon_]:\n",
     "    - <font color='#0F62FE'>Combine the results of Step 3 to reconstruct the expectation value of the observable in question.</font>"
diff --git a/docs/tutorials/02_gate_cutting_to_reduce_circuit_depth.ipynb b/docs/tutorials/02_gate_cutting_to_reduce_circuit_depth.ipynb
index 61206d8fc..a54ded5f5 100644
--- a/docs/tutorials/02_gate_cutting_to_reduce_circuit_depth.ipynb
+++ b/docs/tutorials/02_gate_cutting_to_reduce_circuit_depth.ipynb
@@ -11,12 +11,12 @@
     "\n",
     "These are the steps that we will take in this [Qiskit pattern](https://docs.quantum.ibm.com/guides/intro-to-patterns):\n",
     "\n",
-    "- **Step 1: Map problem to quantum circuits and operators:**\n",
+    "- **Step 1: Map problem to quantum circuits and operators**:\n",
     "    - Map the hamiltonian onto a quantum circuit.\n",
     "- **Step 2: Optimize for target hardware** [_Uses the cutting addon_]:\n",
     "    - <font color='#0F62FE'>Cut the circuit and observable.</font>\n",
     "    - Transpile the subexperiments for hardware.\n",
-    "- **Step 3: Execute on target hardware:**\n",
+    "- **Step 3: Execute on target hardware**:\n",
     "    - Run the subexperiments obtained in Step 2 using a `Sampler` primitive.\n",
     "- **Step 4: Post-process results** [_Uses the cutting addon_]:\n",
     "    - <font color='#0F62FE'>Combine the results of Step 3 to reconstruct the expectation value of the observable in question.</font>"
diff --git a/docs/tutorials/03_wire_cutting_via_move_instruction.ipynb b/docs/tutorials/03_wire_cutting_via_move_instruction.ipynb
index f59094186..26963cde4 100644
--- a/docs/tutorials/03_wire_cutting_via_move_instruction.ipynb
+++ b/docs/tutorials/03_wire_cutting_via_move_instruction.ipynb
@@ -11,12 +11,12 @@
     "\n",
     "These are the steps that we will take in this [Qiskit pattern](https://docs.quantum.ibm.com/guides/intro-to-patterns):\n",
     "\n",
-    "- **Step 1: Map problem to quantum circuits and operators:**\n",
+    "- **Step 1: Map problem to quantum circuits and operators**:\n",
     "    - Map the hamiltonian onto a quantum circuit.\n",
     "- **Step 2: Optimize for target hardware** [_Uses the cutting addon_]:\n",
     "    - <font color='#0F62FE'>Cut the circuit and observable.</font>\n",
     "    - Transpile the subexperiments for hardware.\n",
-    "- **Step 3: Execute on target hardware:**\n",
+    "- **Step 3: Execute on target hardware**:\n",
     "    - Run the subexperiments obtained in Step 2 using a `Sampler` primitive.\n",
     "- **Step 4: Post-process results** [_Uses the cutting addon_]:\n",
     "    - <font color='#0F62FE'>Combine the results of Step 3 to reconstruct the expectation value of the observable in question.</font>"
diff --git a/docs/tutorials/04_automatic_cut_finding.ipynb b/docs/tutorials/04_automatic_cut_finding.ipynb
index 6f49ad02f..4463e1b5e 100644
--- a/docs/tutorials/04_automatic_cut_finding.ipynb
+++ b/docs/tutorials/04_automatic_cut_finding.ipynb
@@ -4,7 +4,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "## Automatically find cuts"
+    "# Automatically find cuts"
    ]
   },
   {

From 2aa5ab7fca76c3c491dd365b7edb1c45966f2139 Mon Sep 17 00:00:00 2001
From: Caleb Johnson <calebj1524@outlook.com>
Date: Mon, 16 Sep 2024 13:04:05 -0500
Subject: [PATCH 26/26] Add link to Qiskit addons on landing pages (#686)

* Add link to Qiskit addons on landing pages

* Fix link
---
 README.md      | 2 +-
 docs/index.rst | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 3b9fa6567..61a490d2b 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@
 
 ### About
 
-Qiskit addons are a collection of modular tools for building utility-scale workloads powered by Qiskit.
+[Qiskit addons](https://docs.quantum.ibm.com/guides/addons) are a collection of modular tools for building utility-scale workloads powered by Qiskit.
 
 This package implements circuit cutting.  In this technique, a handful of gates and/or wires are cut, resulting in smaller circuits that are better suited for execution on hardware.  The result of the original circuit can then be reconstructed; however, the trade-off is that the overall number of shots must be increased by a factor exponential in the number of cuts.
 
diff --git a/docs/index.rst b/docs/index.rst
index 86b2b2759..22cc75918 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -6,7 +6,7 @@ Qiskit addon: circuit cutting
    :alt: GitHub repository star counter badge
    :target: https://github.com/Qiskit/qiskit-addon-cutting
 
-Qiskit addons are a collection of modular tools for building utility-scale workloads powered by Qiskit.
+`Qiskit addons <https://docs.quantum.ibm.com/guides/addons>`_ are a collection of modular tools for building utility-scale workloads powered by Qiskit.
 
 This package implements circuit cutting.  In this technique, a handful of gates and/or wires are cut, resulting in smaller circuits that are better suited for execution on hardware.  The result of the original circuit can then be reconstructed; however, the trade-off is that the overall number of shots must be increased by a factor exponential in the number of cuts.