Fast forward experimental-0.2 to latest main branch

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

.github/workflows/ci.yml

@@ -33,8 +33,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install -e .
-          pip install -c constraints.txt -r requirements-dev.txt
+          pip install -c constraints.txt -r requirements-dev.txt -e .
       - name: Run black
         run: make style
       - name: Run lint
@@ -99,8 +98,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install -e .
-          pip install -c constraints.txt -r requirements-dev.txt
+          pip install -c constraints.txt -r requirements-dev.txt -e .
       - name: Run unit tests
         run: make unit-test-coverage
       - name: Report coverage to coveralls.io
@@ -142,8 +140,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install -e .
-          pip install -c constraints.txt -r requirements-dev.txt
+          pip install -c constraints.txt -r requirements-dev.txt -e .
       - name: Run integration tests
         run: make integration-test
   tests-finished:

.github/workflows/docs.yml

@@ -1,5 +1,5 @@
 ---
-name: Docs Publish
+name: Docs Upload
 on:
   push:
     tags:
@@ -22,32 +22,10 @@ jobs:
         python -m pip install --upgrade pip
         pip install -U virtualenv setuptools wheel tox
         sudo apt-get install -y graphviz pandoc
-    - name: Build and publish
-      env:
-        encrypted_rclone_key: ${{ secrets.encrypted_rclone_key }}
-        encrypted_rclone_iv: ${{ secrets.encrypted_rclone_iv }}
-      run: |
-        tools/deploy_documentation.sh
-  deploy-translatable-strings:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
-    - name: Set up Python
-      uses: actions/setup-python@v2
+    - name: Build docs
+      run: tox -e docs
+    - name: Upload artifact
+      uses: actions/upload-artifact@v2
       with:
-        python-version: '3.9.12'
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install jupyter sphinx_rtd_theme qiskit-terra[visualization] 'torchvision<0.10.0' tox
-        sudo apt-get install -y graphviz pandoc
-    - name: Build and publish
-      env:
-        encrypted_deploy_po_branch_key: ${{ secrets.encrypted_deploy_po_branch_key }}
-        encrypted_deploy_po_branch_iv: ${{ secrets.encrypted_deploy_po_branch_iv }}
-        QISKIT_PARALLEL: False
-        QISKIT_DOCS_BUILD_TUTORIALS: 'always'
-      run: |
-        tools/deploy_translatable_strings.sh
+        name: html_docs
+        path: docs/_build/html

.github/workflows/e2e-tests.yml

@@ -47,7 +47,6 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install -e .
-          pip install -c constraints.txt -r requirements-dev.txt
+          pip install -c constraints.txt -r requirements-dev.txt -e .
       - name: Run e2e tests
-        run: make e2e-test
+        run: make e2e-test

.github/workflows/integration-tests.yml

@@ -47,7 +47,6 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install -e .
-          pip install -c constraints.txt -r requirements-dev.txt
+          pip install -c constraints.txt -r requirements-dev.txt -e .
       - name: Run integration tests
         run: make integration-test

.github/workflows/q-ctrl-tests.yml

@@ -0,0 +1,52 @@
+# This code is part of Qiskit.
+#
+# (C) Copyright IBM 2023.
+#
+# This code is licensed under the Apache License, Version 2.0. You may
+# obtain a copy of this license in the LICENSE.txt file in the root directory
+# of this source tree or at http://www.apache.org/licenses/LICENSE-2.0.
+#
+# Any modifications or derivative works of this code must retain this
+# copyright notice, and modified files need to carry a notice indicating
+# that they have been altered from the originals.
+
+name: Q-CTRL Tests
+on:
+  push:
+      tags:
+        - "*"
+  workflow_dispatch:
+jobs:
+  integration-tests:
+    name: Run integration tests - ${{ matrix.environment }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      # avoid cancellation of in-progress jobs if any matrix job fails
+      fail-fast: false
+      matrix:
+        python-version: [ 3.9 ]
+        os: [ "ubuntu-latest" ]
+        environment: [ "ibm-cloud-staging" ]
+    environment: ${{ matrix.environment }}
+    env:
+      QISKIT_IBM_TOKEN: ${{ secrets.QISKIT_IBM_TOKEN_QCTRL }}
+      QISKIT_IBM_URL: ${{ secrets.QISKIT_IBM_URL }}
+      QISKIT_IBM_INSTANCE: ${{ secrets.QISKIT_IBM_INSTANCE_QCTRL }}
+      CHANNEL_STRATEGY: q-ctrl
+      LOG_LEVEL: DEBUG
+      STREAM_LOG: True
+      QISKIT_IN_PARALLEL: True
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -c constraints.txt -r requirements-dev.txt -e .
+      - name: Run q-ctrl tests
+        run: python -m unittest test/qctrl/test_qctrl.py

.github/workflows/unit-tests-terra-main.yml

@@ -18,7 +18,7 @@ on:
 jobs:
   unit-tests-latest-qiskit-terra:
     if: github.repository_owner == 'Qiskit'
-    name: Run unit tests with latest code of qiskit-terra
+    name: Run unit tests with latest code of Qiskit
     runs-on: "ubuntu-latest"
     env:
       LOG_LEVEL: DEBUG
@@ -35,10 +35,10 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install -e .
-          pip install -c constraints.txt -r requirements-dev.txt
-          pip install -U git+https://github.com/Qiskit/qiskit-terra.git
+          # Installing the complete environment should happen in one `pip install` step,
+          # or pip will generally allow broken combinations of packages to be installed.
+          pip install -c constraints.txt -r requirements-dev.txt -e . git+https://github.com/Qiskit/qiskit.git
       - name: Run tests
         # running unit tests against latest (non-released) code of qiskit-terra gives a basic level
         # of confidence that the integration between qiskit-ibm-runtime and qiskit-terra works
-        run: make unit-test
+        run: make unit-test

CONTRIBUTING.md

@@ -4,7 +4,7 @@ Contributing
 First read the overall project contributing guidelines. These are all
 included in the qiskit documentation:
 
-https://qiskit.org/documentation/contributing_to_qiskit.html
+https://github.com/Qiskit/qiskit/blob/main/CONTRIBUTING.md
 
 
 ## Contributing to qiskit-ibm-runtime
@@ -13,6 +13,10 @@ https://qiskit.org/documentation/contributing_to_qiskit.html
 In addition to the general guidelines there are specific details for
 contributing to qiskit-ibm-runtime, these are documented below.
 
+### Open an issue
+
+* For documentation issues relating to pages in the Start, Build, Transpile, Verify, Run, and Migration guides sections of https://docs.quantum.ibm.com, please open an issue in the [Qiskit/documentation repo](https://github.com/Qiskit/documentation/issues/new/choose) rather than the Qiskit/qiskit-ibm-runtime repo. In other words, any page that DOES NOT have `/api/` in the url should be addressed in the Qiskit/documentation repo. (Exception: the Migration guide urls contain `/api/` but are managed in the Qiskit/documentation repo.)
+* For issues relating to API reference pages (any page that contains /api/ in the url), please open an issue in the repo specific to that API reference.
 
 ### Pull request checklist
 

MANIFEST.in

@@ -1,3 +1,4 @@
 include LICENSE.txt README.md
 include qiskit_ibm_runtime/VERSION.txt
+recursive-include qiskit_ibm_runtime/fake_provider/backends *.json
 recursive-include test *.py

README.md

@@ -108,7 +108,7 @@ All quantum applications and algorithms level are fundamentally built using thre
 2. Define the observable or the classical register to be measured.
 4. Execute the quantum circuits by using a primitive (Estimator or Sampler).
 
-**Primitives** are base-level functions that serve as building blocks for many quantum algorithms and applications. The [primitive interfaces](https://qiskit.org/documentation/apidoc/primitives.html) are defined in Qiskit.
+**Primitives** are base-level functions that serve as building blocks for many quantum algorithms and applications. The [primitive interfaces](https://docs.quantum.ibm.com/api/qiskit/primitives) are defined in Qiskit.
 
 The IBM Runtime service offers these primitives with additional features, such as built-in error suppression and mitigation.
 
@@ -319,7 +319,7 @@ By participating, you are expected to uphold to this code.
 
 We use [GitHub issues] for tracking requests and bugs. Please use our [slack]
 for discussion and simple questions. To join our Slack community use the
-invite link at [Qiskit.org]. For questions that are more suited for a forum we
+invite link at [ibm.com/quantum/qiskit]. For questions that are more suited for a forum we
 use the `Qiskit` tag in [Stack Exchange].
 
 ## License
@@ -334,7 +334,7 @@ use the `Qiskit` tag in [Stack Exchange].
 [code of conduct]: https://github.com/Qiskit/qiskit-ibm-runtime/blob/main/CODE_OF_CONDUCT.md
 [GitHub issues]: https://github.com/Qiskit/qiskit-ibm-runtime/issues
 [slack]: https://qiskit.slack.com
-[Qiskit.org]: https://qiskit.org
+[ibm.com/quantum/qiskit]: https://www.ibm.com/quantum/qiskit
 [Stack Exchange]: https://quantumcomputing.stackexchange.com/questions/tagged/qiskit
 [many people]: https://github.com/Qiskit/qiskit-ibm-runtime/graphs/contributors
 [BibTeX file]: https://github.com/Qiskit/qiskit/blob/master/Qiskit.bib