Merge branch 'main' of github.com:Qiskit/qiskit into oxidize-qc-data-…

…perf

.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 }}

asv.conf.json

@@ -17,7 +17,7 @@
     "dvcs": "git",
     "environment_type": "virtualenv",
     "show_commit_url": "http://github.com/Qiskit/qiskit/commit/",
-    "pythons": ["3.8", "3.9", "3.10", "3.11"],
+    "pythons": ["3.8", "3.9", "3.10", "3.11", "3.12"],
     "benchmark_dir": "test/benchmarks",
     "env_dir": ".asv/env",
     "results_dir": ".asv/results"

azure-pipelines.yml

@@ -52,11 +52,6 @@ parameters:
     type: string
     default: "3.9"
 
-  - name: "tutorialsPythonVersion"
-    displayName: "Version of Python to use to run the tutorials job"
-    type: string
-    default: "3.8"
-
   # Sync with 'python-version' in '.github/workflows/docs_deploy.yml'.
   - name: "documentationPythonVersion"
     displayName: "Version of Python to use to build Sphinx documentation"
@@ -162,18 +157,13 @@ stages:
             testImages: true
 
     # The rest of the PR pipeline is to test the oldest and newest supported
-    # versions of Python, along with the integration tests (via the tutorials).
-    # It's very rare for a failure to be specific to an intermediate version of
+    # versions of Python. It's very rare for a failure to be specific to an intermediate version of
     # Python, so we just catch those in the cron-job pipeline to reduce the
     # amount of resources used.
-    - stage: "Tutorials_and_Tests"
+    - stage: "Tests"
       displayName: "Main tests"
       dependsOn: "Lint_Docs_Prelim_Tests"
       jobs:
-        - template: ".azure/tutorials-linux.yml"
-          parameters:
-            pythonVersion: ${{ parameters.tutorialsPythonVersion }}
-
         - template: ".azure/test-linux.yml"
           parameters:
             pythonVersion: ${{ parameters.maximumPythonVersion }}