Merge remote-tracking branch 'upstream/feature/pulse-ir' into Instruc…

…tionReworkNewOption
TsafrirA · Jan 21, 2024 · 2a73eb4 · 2a73eb4
2 parents a1192ac + 4aeb4c4
commit 2a73eb4
Show file tree

Hide file tree

Showing 673 changed files with 14,058 additions and 79,578 deletions.
diff --git a/.azure/lint-linux.yml b/.azure/lint-linux.yml
diff --git a/.azure/docs-linux.yml → .azure/lint_docs_qpy-linux.yml b/.azure/docs-linux.yml → .azure/lint_docs_qpy-linux.yml
@@ -4,7 +4,8 @@ parameters:
     displayName: "Version of Python to use"
 
 jobs:
-  - job: 'Docs'
+  - job: 'Lint_Docs_QPY'
+    displayName: 'Lint, documentation and QPY'
     pool: {vmImage: 'ubuntu-latest'}
 
     variables:
@@ -20,14 +21,13 @@ jobs:
         displayName: 'Use Python ${{ parameters.pythonVersion }}'
 
       - bash: tools/install_ubuntu_docs_dependencies.sh
-        displayName: 'Install dependencies'
+        displayName: 'Install docs dependencies'
 
-      - bash: |
-          set -e
-          tox -e docs
-          # Clean up Sphinx detritus.
-          rm -rf docs/_build/html/{.doctrees,.buildinfo}
-        displayName: 'Run Docs build'
+      - bash: tox run -e docs,lint
+        displayName: 'Lint and docs'
+
+      - bash: rm -rf docs/_build/html/{.doctrees,.buildinfo}
+        displayName: 'Clean up docs detritus'
 
       - task: ArchiveFiles@2
         inputs:
@@ -43,3 +43,24 @@ jobs:
           artifactName: 'html_docs'
           Parallel: true
           ParallelCount: 8
+
+      - task: Cache@2
+        inputs:
+          key: 'qpy | test/qpy_compat/test_qpy.py | "$(Build.BuildNumber)"'
+          restoreKeys: |
+            qpy | test/qpy_compat/test_qpy.py
+          path: qpy_files
+        displayName: Cache old QPY files
+
+      - bash: |
+          set -e
+          # Reuse the docs environment to avoid needing to rebuild another
+          # version of Qiskit.
+          source .tox/docs/bin/activate
+          mv qpy_files/* test/qpy_compat || :
+          pushd test/qpy_compat
+          ./run_tests.sh
+          popd
+          mkdir qpy_files || :
+          mv test/qpy_compat/qpy_* qpy_files/.
+        displayName: 'Run QPY backwards compat tests'
diff --git a/.azure/test-linux.yml b/.azure/test-linux.yml
@@ -6,9 +6,6 @@ parameters:
   - name: "testRust"
     type: boolean
 
-  - name: "testQPY"
-    type: boolean
-
   - name: "testImages"
     type: boolean
 
@@ -74,12 +71,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 +88,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.
@@ -168,24 +163,6 @@ jobs:
         displayName: 'Publish images on test failure'
         condition: failed()
 
-      - ${{ if eq(parameters.testQPY, true) }}:
-        - task: Cache@2
-          inputs:
-            key: 'qpy | test/qpy_compat/test_qpy.py | "$(Build.BuildNumber)"'
-            restoreKeys: |
-              qpy | test/qpy_compat/test_qpy.py
-            path: qpy_files
-          displayName: cache old qpy
-        - bash: |
-            set -e
-            mv qpy_files/* test/qpy_compat || :
-            pushd test/qpy_compat
-            ./run_tests.sh
-            popd
-            mkdir qpy_files || :
-            mv test/qpy_compat/qpy_* qpy_files/.
-          displayName: 'Run QPY backwards compat tests'
-
       - ${{ if eq(parameters.testImages, true) }}:
         - bash: |
             set -e

diff --git a/.azure/test-macos.yml b/.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.

diff --git a/.azure/test-windows.yml b/.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.

diff --git a/.azure/tutorials-linux.yml b/.azure/tutorials-linux.yml
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -23,17 +23,14 @@
 * @Qiskit/terra-core
 
 # Qiskit folders (also their corresponding tests)
-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
 pulse/                @Qiskit/terra-core @eggerdj @wshanks
 synthesis/            @Qiskit/terra-core @alexanderivrii @ShellyGarion
 scheduler/            @Qiskit/terra-core @eggerdj @wshanks
 visualization/        @Qiskit/terra-core @nonhermitian
-primitives/           @Qiskit/terra-core @ikkoham @t-imamichi
+primitives/           @Qiskit/terra-core @Qiskit/qiskit-primitives
 # Override the release notes directories to have _no_ code owners, so any review
 # from somebody with write access is acceptable.
 /releasenotes/notes
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,5 @@
+blank_issues_enabled: true
+contact_links:
+  - name: Non-API docs issues
+    url: https://github.com/Qiskit/documentation/issues/new/choose
+    about: Open an issue about documentation in the Start, Build, Transpile, Verify, Run, or Migration guides sections of docs.quantum.ibm.com (non-API documentation)
diff --git a/.github/workflows/coverage.yml b/.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"

diff --git a/.github/workflows/docs_deploy.yml b/.github/workflows/docs_deploy.yml
@@ -16,10 +16,6 @@ on:
         description: "Push to qiskit.org?"
         required: false
         type: boolean
-      do_translatables:
-        description: "Push translatable strings?"
-        required: false
-        type: boolean
 
 jobs:
   build:
@@ -53,33 +49,8 @@ jobs:
       - name: Install dependencies
         run: tools/install_ubuntu_docs_dependencies.sh
 
-      # This is just to have tox create the environment, so we can use it to execute the tutorials.
-      # We want to re-use it later for the build, hence 'tox run --notest' instead of 'tox devenv'.
-      - name: Prepare Python environment
-        run: tox run -e docs --notest
-
-      # The reason to use the custom script rather than letting 'nbsphinx' do its thing normally
-      # within the Sphinx build is so that the execution process is the same as in the test CI.
-      - name: Execute tutorials in place
-        run: .tox/docs/bin/python tools/execute_tutorials.py docs/tutorials
-        env:
-          QISKIT_CELL_TIMEOUT: "300"
-
       - name: Build documentation
-        # We can skip re-installing the package, since we just did it a couple of steps ago.
-        run: tox run -e docs --skip-pkg-install
-        env:
-          QISKIT_ENABLE_ANALYTICS: "true"
-          # We've already built them.
-          QISKIT_DOCS_BUILD_TUTORIALS: "never"
-          DOCS_PROD_BUILD: "true"
-
-      - name: Build translatable strings
-        run: tox run -e gettext
-        env:
-          # We've already built them.
-          QISKIT_DOCS_BUILD_TUTORIALS: "never"
-          DOCS_PROD_BUILD: "true"
+        run: tox run -e docs
 
       - name: Store built documentation artifact
         uses: actions/upload-artifact@v3
@@ -91,13 +62,6 @@ jobs:
             !**/.buildinfo
           if-no-files-found: error
 
-      - name: Store translatable strings artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: qiskit-translatables
-          path: ./docs/locale/en/*
-          if-no-files-found: error
-
   deploy:
     if: github.event_name != 'workflow_dispatch' || inputs.do_deployment
     name: Deploy to qiskit.org
@@ -198,26 +162,3 @@ jobs:
           JOINED_PREFIXES: ${{ steps.choose.outputs.joined_prefixes }}
           RCLONE_KEY: ${{ secrets.ENCRYPTED_RCLONE_KEY}}
           RCLONE_IV: ${{ secrets.ENCRYPTED_RCLONE_IV }}
-
-  deploy_translatables:
-    if: (github.event_name == 'workflow_dispatch' && inputs.do_translatables) || (github.event_name == 'push' && github.ref_type == 'tag' && github.ref_name == needs.build.outputs.latest_tag)
-    name: Push translatable strings
-    needs: [build]
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          path: 'qiskit'
-
-      - uses: actions/download-artifact@v3
-        with:
-          name: qiskit-translatables
-          path: 'deploy'
-
-      - name: Deploy translations
-        id: ssh_key
-        run: qiskit/tools/deploy_translatable_strings.sh "${{ github.workspace }}/deploy"
-        env:
-          encrypted_deploy_po_branch_key: ${{ secrets.ENCRYPTED_DEPLOY_PO_BRANCH_KEY }}
-          encrypted_deploy_po_branch_iv: ${{ secrets.ENCRYPTED_DEPLOY_PO_BRANCH_IV }}
diff --git a/.github/workflows/neko.yml b/.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 ."
diff --git a/.github/workflows/randomized_tests.yml b/.github/workflows/randomized_tests.yml
@@ -17,13 +17,13 @@ jobs:
       - name: Install dependencies
         run: |
           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 coveralls -c constraints.txt
-          python -m pip install -c constraints.txt -e .
-          python -m pip install "qiskit-ibmq-provider" -c constraints.txt
-          python -m pip install "qiskit-aer"
-        env:
-          SETUPTOOLS_ENABLE_FEATURES: "legacy-editable"
+          python -m pip install -U \
+            -c constraints.txt \
+            -r requirements.txt \
+            -r requirements-dev.txt \
+            coveralls \
+            qiskit-aer \
+            -e .
       - name: Run randomized tests
         run: make test_randomized
         env:

diff --git a/.github/workflows/slow.yml b/.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"