Merge branch 'main' into fake-backends

.azure/lint-linux.yml

@@ -26,7 +26,6 @@ jobs:
             -c constraints.txt \
             -r requirements.txt \
             -r requirements-dev.txt \
-            ./qiskit_pkg \
             -e .
           # Build and install both qiskit and qiskit-terra so that any optionals
           # depending on `qiskit` will resolve correctly.
@@ -38,7 +37,7 @@ jobs:
           set -e
           source test-job/bin/activate
           echo "Running black, any errors reported can be fixed with 'tox -eblack'"
-          black --check qiskit test tools examples setup.py qiskit_pkg
+          black --check qiskit test tools examples setup.py
           echo "Running rustfmt check, any errors reported can be fixed with 'cargo fmt'"
           cargo fmt --check
         displayName: "Formatting"
@@ -47,7 +46,7 @@ jobs:
           set -e
           source test-job/bin/activate
           echo "Running ruff"
-          ruff qiskit test tools examples setup.py qiskit_pkg/setup.py
+          ruff qiskit test tools examples setup.py
           echo "Running pylint"
           pylint -rn qiskit test tools
           echo "Running Cargo Clippy"

.azure/test-linux.yml

@@ -74,12 +74,11 @@ jobs:
             python -m pip install -U pip
             python -m pip install -U build
             python -m build --sdist .
-            python -m build --sdist qiskit_pkg
             python -m pip install -U \
               -c constraints.txt \
               -r requirements.txt \
               -r requirements-dev.txt \
-              dist/qiskit*.tar.gz
+              dist/qiskit-*.tar.gz
             # Build and install both qiskit and qiskit-terra so that any optionals
             # depending on `qiskit` will resolve correctly.
           displayName: "Install Terra from sdist"
@@ -92,7 +91,6 @@ jobs:
               -c constraints.txt \
               -r requirements.txt \
               -r requirements-dev.txt \
-              ./qiskit_pkg \
               -e .
             # Build and install both qiskit and qiskit-terra so that any optionals
             # depending on `qiskit` will resolve correctly.

.azure/test-macos.yml

@@ -43,7 +43,6 @@ jobs:
             -c constraints.txt \
             -r requirements.txt \
             -r requirements-dev.txt \
-            ./qiskit_pkg \
             -e .
             # Build and install both qiskit and qiskit-terra so that any optionals
             # depending on `qiskit` will resolve correctly.

.azure/test-windows.yml

@@ -42,7 +42,6 @@ jobs:
             -c constraints.txt \
             -r requirements.txt \
             -r requirements-dev.txt \
-            ./qiskit_pkg \
             -e .
           # Build and install both qiskit and qiskit-terra so that any optionals
           # depending on `qiskit` will resolve correctly.

.github/workflows/coverage.yml

@@ -42,7 +42,7 @@ jobs:
         run: python -m pip install -c constraints.txt --upgrade pip setuptools wheel
 
       - name: Build and install qiskit-terra
-        run: python -m pip install -c constraints.txt -e . ./qiskit_pkg
+        run: python -m pip install -c constraints.txt -e .
         env:
           CARGO_INCREMENTAL: 0
           RUSTFLAGS: "-Cinstrument-coverage"

.github/workflows/neko.yml

@@ -16,4 +16,6 @@ jobs:
       - uses: Qiskit/qiskit-neko@main
         with:
           test_selection: terra
-          repo_install_command: "pip install -c constraints.txt ."
+          # We have to forcibly uninstall any old version of qiskit or qiskit-terra during the
+          # changeover, because it's not possible to safely upgrade an existing installation to 1.0.
+          repo_install_command: "pip uninstall qiskit qiskit-terra && pip install -c constraints.txt ."

.github/workflows/slow.yml

@@ -19,7 +19,7 @@ jobs:
           python -m pip install -U pip setuptools wheel
           python -m pip install -U -r requirements.txt -c constraints.txt
           python -m pip install -U -r requirements-dev.txt -c constraints.txt
-          python -m pip install -c constraints.txt -e . ./qiskit_pkg
+          python -m pip install -c constraints.txt -e .
           python -m pip install "qiskit-aer" "z3-solver" "cplex" -c constraints.txt
         env:
           SETUPTOOLS_ENABLE_FEATURES: "legacy-editable"

.github/workflows/wheels.yml

@@ -21,7 +21,7 @@ jobs:
           python-version: '3.10'
       - uses: dtolnay/rust-toolchain@stable
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.13.0
+        uses: pypa/cibuildwheel@v2.16.2
       - uses: actions/upload-artifact@v3
         with:
           path: ./wheelhouse/*.whl
@@ -42,7 +42,7 @@ jobs:
           python-version: '3.10'
       - uses: dtolnay/rust-toolchain@stable
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.13.0
+        uses: pypa/cibuildwheel@v2.16.2
         env:
           CIBW_BEFORE_ALL: rustup target add aarch64-apple-darwin
           CIBW_ARCHS_MACOS: arm64 universal2
@@ -91,7 +91,7 @@ jobs:
         with:
           platforms: all
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.13.0
+        uses: pypa/cibuildwheel@v2.16.2
         env:
           CIBW_ARCHS_LINUX: s390x
           CIBW_TEST_SKIP: "cp*"
@@ -124,7 +124,7 @@ jobs:
         with:
           platforms: all
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.13.0
+        uses: pypa/cibuildwheel@v2.16.2
         env:
           CIBW_ARCHS_LINUX: ppc64le
           CIBW_TEST_SKIP: "cp*"
@@ -157,7 +157,7 @@ jobs:
         with:
           platforms: all
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.13.0
+        uses: pypa/cibuildwheel@v2.16.2
         env:
           CIBW_ARCHS_LINUX: aarch64
       - uses: actions/upload-artifact@v3
@@ -168,7 +168,7 @@ jobs:
         with:
           packages-dir: wheelhouse/
   sdist:
-    name: Build and publish terra sdist
+    name: Build and publish sdist
     runs-on: ${{ matrix.os }}
     needs: ["upload_shared_wheels"]
     environment: release
@@ -185,36 +185,8 @@ jobs:
         with:
           python-version: '3.10'
       - name: Install deps
-        run: pip install -U twine setuptools-rust wheel build
+        run: pip install -U build
       - name: Build sdist
         run: python -m build . --sdist
       - name: Publish package distributions to PyPI
         uses: pypa/gh-action-pypi-publish@release/v1
-  metapackage:
-    name: Build and publish terra sdist
-    runs-on: ${{ matrix.os }}
-    needs: ["sdist"]
-    environment: release
-    permissions:
-      id-token: write
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest]
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
-        name: Install Python
-        with:
-          python-version: '3.10'
-      - name: Install deps
-        run: pip install -U twine setuptools-rust wheel build
-      - name: Build packages
-        run: |
-          set -e
-          cd qiskit_pkg
-          python -m build .
-      - name: Publish package distributions to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          packages-dir: qiskit_pkg/dist

CONTRIBUTING.md

@@ -651,7 +651,7 @@ def test_method2(self):
    self.assertEqual(result, <expected>)
 ```
 
-`test_method1_deprecated` can be removed after `Obj.method1` is removed (following the [Qiskit Deprecation Policy](https://qiskit.org/documentation/contributing_to_qiskit.html#deprecation-policy)).
+`test_method1_deprecated` can be removed after `Obj.method1` is removed (following the [Qiskit Deprecation Policy](./DEPRECATION.md)).
 
 ## Using dependencies
 

azure-pipelines.yml

@@ -31,7 +31,7 @@ parameters:
   - name: "supportedPythonVersions"
     displayName: "All supported versions of Python"
     type: object
-    default: ["3.8", "3.9", "3.10", "3.11"]
+    default: ["3.8", "3.9", "3.10", "3.11", "3.12"]
 
   - name: "minimumPythonVersion"
     displayName: "Minimum supported version of Python"
@@ -41,7 +41,7 @@ parameters:
   - name: "maximumPythonVersion"
     displayName: "Maximum supported version of Python"
     type: string
-    default: "3.11"
+    default: "3.12"
 
   # These two versions of Python can be chosen somewhat arbitrarily, but we get
   # slightly better coverage per PR if they're neither the maximum nor minimum

constraints.txt

@@ -2,17 +2,7 @@
 # 4.0+. The pin can be removed after nbformat is updated.
 jsonschema==3.2.0
 
-# Numpy 1.25 deprecated some behaviours that we used, and caused the isometry
-# tests to flake. See https://github.com/Qiskit/qiskit-terra/issues/10305,
-# remove pin when resolving that.
-numpy<1.25
-
 # Scipy 1.11 seems to have caused an instability in the Weyl coordinates
 # eigensystem code for one of the test cases.  See
 # https://github.com/Qiskit/qiskit-terra/issues/10345 for current details.
-scipy<1.11
-
-# Aer 0.13 causes several randomised tests to begin failing, and some
-# `QuantumInstance` use of noise models to raise exceptions.  These need fixes
-# on Terra.
-qiskit-aer==0.12.2
+scipy<1.11; python_version<'3.12'

docs/api_redirects.txt

@@ -1,7 +1,3 @@
-qiskit.algorithms.AlgorithmError algorithms
-qiskit.algorithms.eval_observables algorithms
-qiskit.algorithms.estimate_observables algorithms
-
 qiskit.assembler.assemble_circuits assembler
 qiskit.assembler.assemble_schedules assembler
 qiskit.assembler.disassemble assembler
@@ -97,11 +93,6 @@ qiskit.converters.dagdependency_to_dag converters
 
 qiskit.dagcircuit.DAGCircuitError dagcircuit
 
-qiskit.opflow.commutator opflow
-qiskit.opflow.anti_commutator opflow
-qiskit.opflow.double_commutator opflow
-qiskit.opflow.OpflowError opflow
-
 qiskit.providers.QiskitBackendNotFoundError providers
 qiskit.providers.BackendPropertyError providers
 qiskit.providers.JobError providers

docs/apidoc/index.rst

@@ -44,17 +44,4 @@ API Reference
    transpiler_synthesis_plugins
    transpiler_builtin_plugins
    utils
-   utils_mitigation
    exceptions
-
-Deprecated Modules
-==================
-
-.. warning::
-
-   These modules are going to be removed in Qiskit 1.0. Consider pinning ``qiskit~=0.45`` in your dependencies if you need them.
-
-.. toctree::
-   :maxdepth: 1
-
-   opflow

docs/migration_guides/opflow_migration.rst

@@ -54,7 +54,7 @@ The functional equivalency can be roughly summarized as follows:
 
    * - Opflow Module
      - Alternative
-   * - Operators (:class:`~qiskit.opflow.OperatorBase`, :ref:`operator_globals`,
+   * - Operators (:class:`~qiskit.opflow.OperatorBase`, ``operator_globals``,
        :mod:`~qiskit.opflow.primitive_ops`, :mod:`~qiskit.opflow.list_ops`)
      - ``qiskit.quantum_info`` :ref:`Operators <quantum_info_operators>`
 
@@ -134,7 +134,7 @@ Operator Globals
 *Back to* `Contents`_
 
 Opflow provided shortcuts to define common single qubit states, operators, and non-parametrized gates in the
-:ref:`operator_globals` module.
+``operator_globals`` module.
 
 These were mainly used for didactic purposes or quick prototyping, and can easily be replaced by their corresponding
 :mod:`~qiskit.quantum_info` class: :class:`~qiskit.quantum_info.Pauli`, :class:`~qiskit.quantum_info.Clifford` or

qiskit/__init__.py

@@ -80,10 +80,6 @@
 from qiskit.compiler import transpile, assemble, schedule, sequence
 
 from .version import __version__
-from .version import QiskitVersion
-
-
-__qiskit_version__ = QiskitVersion()
 
 
 class AerWrapper:

qiskit/circuit/classical/expr/__init__.py

@@ -39,10 +39,11 @@
 
 These objects are mutable and should not be reused in a different location without a copy.
 
-The entry point from general circuit objects to the expression system is by wrapping the object
-in a :class:`Var` node and associating a :class:`~.types.Type` with it.
+The base for dynamic variables is the :class:`Var`, which can be either an arbitrarily typed runtime
+variable, or a wrapper around a :class:`.Clbit` or :class:`.ClassicalRegister`.
 
 .. autoclass:: Var
+    :members: var, name
 
 Similarly, literals used in comparison (such as integers) should be lifted to :class:`Value` nodes
 with associated types.
@@ -86,10 +87,18 @@
 The functions and methods described in this section are a more user-friendly way to build the
 expression tree, while staying close to the internal representation.  All these functions will
 automatically lift valid Python scalar values into corresponding :class:`Var` or :class:`Value`
-objects, and will resolve any required implicit casts on your behalf.
+objects, and will resolve any required implicit casts on your behalf.  If you want to directly use
+some scalar value as an :class:`Expr` node, you can manually :func:`lift` it yourself.
 
 .. autofunction:: lift
 
+Typically you should create memory-owning :class:`Var` instances by using the
+:meth:`.QuantumCircuit.add_var` method to declare them in some circuit context, since a
+:class:`.QuantumCircuit` will not accept an :class:`Expr` that contains variables that are not
+already declared in it, since it needs to know how to allocate the storage and how the variable will
+be initialized.  However, should you want to do this manually, you should use the low-level
+:meth:`Var.new` call to safely generate a named variable for usage.
+
 You can manually specify casts in cases where the cast is allowed in explicit form, but may be
 lossy (such as the cast of a higher precision :class:`~.types.Uint` to a lower precision one).