Merge branch 'main' into controlflow/stochastic_swap

ewinston · Sep 3, 2022 · cd9c5cf · cd9c5cf
2 parents ca4f477 + aca01eb
commit cd9c5cf
Show file tree

Hide file tree

Showing 212 changed files with 9,902 additions and 1,637 deletions.
diff --git a/.azure/docs-linux.yml b/.azure/docs-linux.yml
@@ -30,8 +30,8 @@ jobs:
 
       - bash: |
           set -e
-          python -m pip install --upgrade pip 'setuptools<64.0.0' wheel -c constraints.txt
-          pip install -U tox -c constraints.txt
+          python -m pip install --upgrade pip setuptools wheel
+          pip install -U tox
           sudo apt-get update
           sudo apt-get install -y graphviz
         displayName: 'Install dependencies'

diff --git a/.azure/lint-linux.yml b/.azure/lint-linux.yml
@@ -28,13 +28,13 @@ jobs:
 
       - bash: |
           set -e
-          python -m pip install --upgrade pip 'setuptools<64.0.0' wheel virtualenv -c constraints.txt
+          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
-          python setup.py build_ext --inplace
+          pip install -e .
         displayName: 'Install dependencies'
         env:
           SETUPTOOLS_ENABLE_FEATURES: "legacy-editable"

diff --git a/.azure/test-linux.yml b/.azure/test-linux.yml
@@ -62,7 +62,7 @@ jobs:
 
       - bash: |
           set -e
-          python -m pip install --upgrade pip 'setuptools<64.0.0' wheel virtualenv -c constraints.txt
+          python -m pip install --upgrade pip setuptools wheel virtualenv
           virtualenv test-job
         displayName: "Prepare venv"
 
@@ -71,6 +71,8 @@ jobs:
             set -e
             source test-job/bin/activate
             pip install -U -r requirements.txt -r requirements-dev.txt -c constraints.txt
+            # 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
           displayName: "Install Terra from sdist"
@@ -85,7 +87,6 @@ jobs:
           env:
             SETUPTOOLS_ENABLE_FEATURES: "legacy-editable"
 
-
       - bash: |
           set -e
           source test-job/bin/activate
@@ -111,6 +112,7 @@ jobs:
           popd
         env:
           QISKIT_PARALLEL: FALSE
+          RUST_BACKTRACE: 1
         displayName: 'Run tests'
 
       - bash: |

diff --git a/.azure/test-macos.yml b/.azure/test-macos.yml
@@ -6,7 +6,7 @@ parameters:
 jobs:
   - job: "MacOS_Tests_Python${{ replace(parameters.pythonVersion, '.', '') }}"
     displayName: "Test macOS Python ${{ parameters.pythonVersion }}"
-    pool: {vmImage: 'macOS-10.15'}
+    pool: {vmImage: 'macOS-11'}
 
     variables:
       QISKIT_SUPPRESS_PACKAGING_WARNINGS: Y
@@ -41,12 +41,11 @@ jobs:
 
       - bash: |
           set -e
-          python -m pip install --upgrade pip 'setuptools<64.0.0' wheel virtualenv -c constraints.txt
+          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 .
-          python setup.py build_ext --inplace
           pip check
         displayName: 'Install dependencies'
         env:
@@ -61,6 +60,7 @@ jobs:
           python ./tools/verify_parallel_map.py
         env:
           QISKIT_PARALLEL: FALSE
+          RUST_BACKTRACE: 1
         displayName: "Run tests"
 
       - bash: |

diff --git a/.azure/test-windows.yml b/.azure/test-windows.yml
@@ -30,13 +30,12 @@ jobs:
 
       - bash: |
           set -e
-          python -m pip install --upgrade pip 'setuptools<64.0.0' wheel virtualenv -c constraints.txt
+          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
-          python setup.py build_ext --inplace
           pip check
         displayName: 'Install dependencies'
         env:
@@ -54,6 +53,7 @@ jobs:
           LANG: 'C.UTF-8'
           PYTHONIOENCODING: 'utf-8:backslashreplace'
           QISKIT_PARALLEL: FALSE
+          RUST_BACKTRACE: 1
         displayName: 'Run tests'
 
       - bash: |

diff --git a/.azure/tutorials-linux.yml b/.azure/tutorials-linux.yml
@@ -34,7 +34,6 @@ jobs:
           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" "qiskit-ignis" "matplotlib>=3.3.0" sphinx nbsphinx sphinx_rtd_theme cvxpy -c constraints.txt
-          python setup.py build_ext --inplace
           sudo apt-get update
           sudo apt-get install -y graphviz pandoc
           pip check

diff --git a/.github/workflows/randomized_tests.yml b/.github/workflows/randomized_tests.yml
@@ -24,6 +24,8 @@ jobs:
           SETUPTOOLS_ENABLE_FEATURES: "legacy-editable"
       - name: Run randomized tests
         run: make test_randomized
+        env:
+          RUST_BACKTRACE: 1
       - name: Create comment on failed test run
         if: ${{ failure() }}
         uses: peter-evans/create-or-update-comment@v1