Merge branch 'main' into new-fake-backends

mtreinish · Feb 29, 2024 · cd106c7 · cd106c7
2 parents e4e64b4 + e151d69
commit cd106c7
Show file tree

Hide file tree

Showing 29 changed files with 2,655 additions and 2,530 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -23,11 +23,11 @@ jobs:
     name: Run code quality checks
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Set up Python 3.9
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: 3.9
       - name: Install dependencies
@@ -45,11 +45,11 @@ jobs:
     name: Build documentation
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Set up Python 3.9
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: 3.9
       - name: Install dependencies
@@ -69,7 +69,7 @@ jobs:
       - name: Build documentation
         run: tox -edocs
       - name: Upload documentation
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: html_docs
           path: docs/_build/html
@@ -88,11 +88,11 @@ jobs:
       STREAM_LOG: True
       QISKIT_IN_PARALLEL: True
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
@@ -102,12 +102,12 @@ jobs:
       - name: Run unit tests
         run: make unit-test-coverage
       - name: Report coverage to coveralls.io
-        uses: coverallsapp/github-action@1.1.3
+        uses: coverallsapp/github-action@v2
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           flag-name: unit-tests_python${{ matrix.python-version }}-${{ matrix.os }}
           parallel: true
-          path-to-lcov: coverage.lcov
+          file: coverage.lcov
   integration-tests:
     if: github.event_name == 'push' && github.repository_owner == 'Qiskit'
     # only kick-off resource intensive integration tests if unit tests and all basic checks succeeded
@@ -130,11 +130,11 @@ jobs:
       STREAM_LOG: True
       QISKIT_IN_PARALLEL: True
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
@@ -150,7 +150,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Notify coveralls.io that all parallel tests have finished
-        uses: coverallsapp/github-action@1.1.3
+        uses: coverallsapp/github-action@v2
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           parallel-finished: true
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -27,15 +27,15 @@ jobs:
       matrix:
         python-version: [3.9]
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install deps
         run: pip install -U pip setuptools build
       - name: Build sdist
         run: python3 -m build
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           path: ./dist/*
       - name: Deploy to Pypi

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -10,11 +10,11 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: '3.9.12'
     - name: Install dependencies
@@ -25,7 +25,7 @@ jobs:
     - name: Build docs
       run: tox -e docs
     - name: Upload artifact
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: html_docs
         path: docs/_build/html
diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
@@ -37,11 +37,11 @@ jobs:
       STREAM_LOG: True
       QISKIT_IN_PARALLEL: True
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies

diff --git a/.github/workflows/integration-tests-qiskit-main.yml b/.github/workflows/integration-tests-qiskit-main.yml
@@ -37,11 +37,11 @@ jobs:
       STREAM_LOG: True
       QISKIT_IN_PARALLEL: True
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies

diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -37,11 +37,11 @@ jobs:
       STREAM_LOG: True
       QISKIT_IN_PARALLEL: True
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies

diff --git a/.github/workflows/q-ctrl-tests.yml b/.github/workflows/q-ctrl-tests.yml
@@ -37,11 +37,11 @@ jobs:
       STREAM_LOG: True
       QISKIT_IN_PARALLEL: True
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies

diff --git a/.github/workflows/unit-tests-terra-main.yml b/.github/workflows/unit-tests-terra-main.yml
@@ -25,11 +25,11 @@ jobs:
       STREAM_LOG: True
       QISKIT_IN_PARALLEL: True
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Set up Python 3.9
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: 3.9
       - name: Install dependencies

diff --git a/.gitignore b/.gitignore
@@ -109,4 +109,4 @@ Qconfig.py
 /docs/stubs/
 
 # Pycharm
-.idea
+.idea
diff --git a/docs/index.rst b/docs/index.rst
@@ -28,11 +28,11 @@ Next steps
     Get started with Estimator <tutorials/how-to-getting-started-with-estimator>
     Get started with Sampler <tutorials/how-to-getting-started-with-sampler>
     Get started with error suppression and error mitigation <tutorials/Error-Suppression-and-Error-Mitigation>
-    CHSH with Estimator <tutorials/chsh_with_estimator>
-    VQE with Estimator <tutorials/vqe_with_estimator>
-    Grover with Sampler <tutorials/grover_with_sampler>
-    QAOA with Primitives <tutorials/qaoa_with_primitives>
-    Submit user-transpiled circuits using primitives <tutorials/user-transpiled-circuits>
+    CHSH with Estimator <tutorials/chsh_inequality/chsh_with_estimator>
+    VQE with Estimator <tutorials/variational_quantum_eigensolver/vqe_with_estimator>
+    Grover with Sampler <tutorials/grovers_algorithm/grover_with_sampler>
+    QAOA with Primitives <tutorials/quantum_approximate_optimization_algorithm/qaoa_with_primitives>
+    Submit user-transpiled circuits using primitives <tutorials/submitting_transpiled_circuits/user-transpiled-circuits>
     All tutorials <tutorials>
 
 

diff --git a/docs/tutorials.rst b/docs/tutorials.rst
@@ -11,18 +11,18 @@ Estimator
 
    tutorials/how-to-getting-started-with-estimator
    tutorials/Error-Suppression-and-Error-Mitigation
-   tutorials/chsh_with_estimator
-   tutorials/vqe_with_estimator
+   tutorials/chsh_inequality/chsh_with_estimator
+   tutorials/variational_quantum_eigensolver/vqe_with_estimator
 
 Sampler
 =================================
 
 .. nbgallery::
 
    tutorials/how-to-getting-started-with-sampler
-   tutorials/grover_with_sampler
-   tutorials/user-transpiled-circuits
-   tutorials/qaoa_with_primitives
+   tutorials/grovers_algorithm/grover_with_sampler
+   tutorials/submitting_transpiled_circuits/user-transpiled-circuits
+   tutorials/quantum_approximate_optimization_algorithm/qaoa_with_primitives
 
 
 .. Hiding - Indices and tables
-Original file line number
+Diff line change
@@ Expand Up / @@ -109,4 +109,4 @@ Qconfig.py @@
     /docs/stubs/
     # Pycharm
-    .idea
+    .idea