Merge branch 'main' into opflow-migration-guide

.azure/docs-linux.yml

@@ -9,6 +9,7 @@ jobs:
 
     variables:
       PIP_CACHE_DIR: $(Pipeline.Workspace)/.pip
+      RUST_DEBUG: 1
 
     steps:
       - checkout: self
@@ -29,8 +30,6 @@ jobs:
       - bash: |
           tox -edocs
         displayName: 'Run Docs build'
-        env:
-          SETUPTOOLS_ENABLE_FEATURES: "legacy-editable"
 
       - task: ArchiveFiles@2
         inputs:

.azure/lint-linux.yml

@@ -21,10 +21,12 @@ jobs:
           python -m pip install --upgrade pip setuptools wheel virtualenv
           virtualenv test-job
           source test-job/bin/activate
-          pip install -U -r requirements.txt -r requirements-dev.txt -c constraints.txt
-          pip install -U -c constraints.txt -e .
-          pip install -U "qiskit-aer" -c constraints.txt
-          pip install -e .
+          pip install -U pip setuptools wheel
+          pip install -U \
+            -c constraints.txt \
+            -r requirements.txt \
+            -r requirements-dev.txt \
+            -e .
         displayName: 'Install dependencies'
         env:
           SETUPTOOLS_ENABLE_FEATURES: "legacy-editable"

.azure/test-linux.yml

@@ -60,27 +60,39 @@ jobs:
             # Use stable Rust, rather than MSRV, to spot-check that stable builds properly.
             rustup override set stable
             source test-job/bin/activate
-            pip install -U -r requirements.txt -r requirements-dev.txt -c constraints.txt
+            pip install -U pip setuptools wheel
             # Install setuptools-rust for building sdist
             pip install -U -c constraints.txt setuptools-rust
             python setup.py sdist
-            pip install -U -c constraints.txt dist/qiskit-terra*.tar.gz
+            pip install -U \
+              -c constraints.txt \
+              -r requirements.txt \
+              -r requirements-dev.txt \
+              dist/qiskit-terra*.tar.gz
           displayName: "Install Terra from sdist"
 
       - ${{ if eq(parameters.installFromSdist, false) }}:
         - bash: |
             set -e
             source test-job/bin/activate
-            pip install -U -r requirements.txt -r requirements-dev.txt -c constraints.txt
-            pip install -U -c constraints.txt -e .
+            pip install -U \
+              -c constraints.txt \
+              -r requirements.txt \
+              -r requirements-dev.txt \
+              -e .
           displayName: "Install Terra directly"
           env:
             SETUPTOOLS_ENABLE_FEATURES: "legacy-editable"
 
       - bash: |
           set -e
           source test-job/bin/activate
-          pip install -U "cplex;python_version < '3.11'" "qiskit-aer" "z3-solver" -c constraints.txt
+          pip install -U \
+            -c constraints.txt \
+            "cplex ; python_version < '3.11'" \
+            "qiskit-aer" \
+            "tweedledum ; python_version < '3.11'" \
+            "z3-solver"
           mkdir -p /tmp/terra-tests
           cp -r test /tmp/terra-tests/.
           cp .stestr.conf /tmp/terra-tests/.
@@ -162,8 +174,10 @@ jobs:
         - bash: |
             set -e
             virtualenv image_tests
-            image_tests/bin/pip install -U -r requirements.txt -c constraints.txt
-            image_tests/bin/pip install -U -c constraints.txt -e ".[visualization]"
+            image_tests/bin/pip install -U \
+              -c constraints.txt \
+              -r requirements.txt \
+              -e ".[visualization]"
             sudo apt-get update
             sudo apt-get install -y graphviz pandoc
             image_tests/bin/pip check

.azure/test-macos.yml

@@ -34,8 +34,12 @@ jobs:
           python -m pip install --upgrade pip setuptools wheel virtualenv
           virtualenv test-job
           source test-job/bin/activate
-          pip install -U -r requirements.txt -r requirements-dev.txt -c constraints.txt
-          pip install -U -c constraints.txt -e .
+          pip install -U pip setuptools wheel
+          pip install -U \
+            -c constraints.txt \
+            -r requirements.txt \
+            -r requirements-dev.txt \
+            -e .
           pip check
         displayName: 'Install dependencies'
         env:

.azure/test-windows.yml

@@ -33,9 +33,13 @@ jobs:
           python -m pip install --upgrade pip setuptools wheel virtualenv
           virtualenv test-job
           source test-job/Scripts/activate
-          pip install -r requirements.txt -r requirements-dev.txt -c constraints.txt
-          pip install -c constraints.txt -e .
-          pip install "z3-solver" -c constraints.txt
+          pip install -U pip setuptools wheel
+          pip install -U \
+            -c constraints.txt \
+            -r requirements.txt \
+            -r requirements-dev.txt \
+            "z3-solver" \
+            -e .
           pip check
         displayName: 'Install dependencies'
         env:

.azure/tutorials-linux.yml

@@ -21,10 +21,22 @@ jobs:
       - bash: |
           set -e
           git clone https://github.com/Qiskit/qiskit-tutorials --depth=1
-          python -m pip install --upgrade pip
-          pip install -U -r requirements.txt -r requirements-dev.txt -c constraints.txt
-          pip install -c constraints.txt -e .
-          pip install "qiskit-ibmq-provider" "qiskit-aer" "z3-solver" "networkx" "matplotlib>=3.3.0" sphinx nbsphinx sphinx_rtd_theme cvxpy -c constraints.txt
+          python -m pip install --upgrade pip setuptools wheel
+          pip install -U \
+            -c constraints.txt \
+            -r requirements.txt \
+            -r requirements-dev.txt \
+            "qiskit-ibmq-provider" \
+            "qiskit-aer" \
+            "z3-solver" \
+            "networkx" \
+            "matplotlib>=3.3.0" \
+            sphinx \
+            nbsphinx \
+            sphinx_rtd_theme \
+            "tweedledum ; python_version < '3.11'" \
+            cvxpy \
+            -e .
           sudo apt-get update
           sudo apt-get install -y graphviz pandoc
           pip check

.github/CODEOWNERS

@@ -9,23 +9,23 @@
 # The @Qiskit/terra-core team is the group who're responsible for the
 # entire qiskit-terra project and are empowered to approve merge code in any
 # part of the repository. Any member of the terra-core group should not be
-# listed in this file as it's redudant.
+# listed in this file as it's redundant.
 #
 # A PR can be merged when approved by at least one codeowner. For PRs that touch
 # more than one section with non-overlapping codeowners more than one codeowner
 # may be required to approve a PR.
 #
 # However, every contributor to Qiskit can (and should!) review open PRs. This
-# file is just about outlining responsiblity for maintainership and final
+# file is just about outlining responsibility for maintainership and final
 # review/merging of PRs in different subsections of the repository.
 
 # Global rule, unless specialized by a later one
 * @Qiskit/terra-core
 
 # Qiskit folders (also their corresponding tests)
-algorithms/           @Qiskit/terra-core @manoelmarques @woodsp-ibm @ElePT
-opflow/               @Qiskit/terra-core @manoelmarques @woodsp-ibm @ikkoham
-qiskit/utils/         @Qiskit/terra-core @manoelmarques @woodsp-ibm
+algorithms/           @Qiskit/terra-core @woodsp-ibm @ElePT
+opflow/               @Qiskit/terra-core @woodsp-ibm @ikkoham
+qiskit/utils/         @Qiskit/terra-core @woodsp-ibm
 providers/            @Qiskit/terra-core @jyu00
 quantum_info/         @Qiskit/terra-core @ikkoham
 qpy/                  @Qiskit/terra-core

.github/workflows/coverage.yml

@@ -30,6 +30,13 @@ jobs:
             cargo install grcov
             sudo apt-get install lcov
 
+      # This is needed to support any requirements, particularly in the `optionals` set,
+      # that might not have 'pyproject.toml' files specifying their build requirements.
+      # Modern pip (23.1+) can error out if it doesn't have `wheel` and we ask for one
+      # of these legacy packages.
+      - name: Ensure basic build requirements
+        run: pip install --upgrade pip setuptools wheel
+
       - name: Build and install qiskit-terra
         run: pip install -e .
         env:
@@ -45,8 +52,8 @@ jobs:
           stestr run
           # We set the --source-dir to '.' because we want all paths to appear relative to the repo
           # root (we need to combine them with the Python ones), but we only care about `grcov`
-          # keeping the `src/*` files; we don't care about coverage in dependencies.
-          grcov . --binary-path target/debug/ --source-dir . --output-type lcov --output-path rust.info --llvm --branch --parallel --keep-only 'src/*'
+          # keeping the `crates/*` files; we don't care about coverage in dependencies.
+          grcov . --binary-path target/debug/ --source-dir . --output-type lcov --output-path rust.info --llvm --branch --parallel --keep-only 'crates/*'
         env:
           QISKIT_TEST_CAPTURE_STREAMS: 1
           QISKIT_PARALLEL: FALSE

.github/workflows/randomized_tests.yml

@@ -15,6 +15,7 @@ jobs:
           python-version: '3.8'
       - name: Install dependencies
         run: |
+          pip install -U pip setuptools wheel
           pip install -U -r requirements.txt -c constraints.txt
           pip install -U -r requirements-dev.txt coveralls -c constraints.txt
           pip install -c constraints.txt -e .

.github/workflows/slow.yml

@@ -15,6 +15,7 @@ jobs:
           python-version: '3.10'
       - name: Install dependencies
         run: |
+          pip install -U pip setuptools wheel
           pip install -U -r requirements.txt -c constraints.txt
           pip install -U -r requirements-dev.txt -c constraints.txt
           pip install -c constraints.txt -e .

.mergify.yml

@@ -1,19 +1,5 @@
-queue_rules:
-  - name: automerge
-    conditions:
-      - check-success=Qiskit.qiskit-terra
-
+---
 pull_request_rules:
-  - name: automatic merge on CI success and review
-    conditions:
-      - check-success=Qiskit.qiskit-terra
-      - "#approved-reviews-by>=1"
-      - label=automerge
-      - label!=on hold
-    actions:
-      queue:
-        name: automerge
-        method: squash
   - name: backport
     conditions:
       - label=stable backport potential