Add matrix tests for Qiskit

Author: idavis

.ado/ci.yml

@@ -60,18 +60,24 @@ jobs:
       displayName: Set Python version
 
     - script: |
-        pip install pytest pytest-azurepipelines pytest-cov pytest-xdist
-      displayName: Install pytest dependencies
+        python -m pip install --upgrade pip
+        pip install pytest pytest-azurepipelines pytest-cov pytest-xdist tox
+      displayName: Install test dependencies
 
     - script: |
         pip freeze
       displayName: List installed packages
     
     - script: |
         cd $(Build.SourcesDirectory)/azure-quantum
-        pip install .[qiskit,cirq,qsharp,dev]
-        pytest --numprocesses $(PYTEST_MAX_PARALLEL_TESTS) --cov-report term --cov=azure.quantum --junitxml test-output-azure-quantum.xml $(Build.SourcesDirectory)/azure-quantum
+        pip install .[cirq,qsharp,dev]
+        pytest --numprocesses $(PYTEST_MAX_PARALLEL_TESTS) --cov-report term --cov=azure.quantum --junitxml test-output-azure-quantum.xml --ignore tests/unit/test_qiskit.py
       displayName: Run azure-quantum unit tests
+
+    - script: |
+        cd $(Build.SourcesDirectory)/azure-quantum
+        tox -e py311-qiskit1,py311-qiskit2
+      displayName: Run Qiskit matrix tests
     
     - task: PublishTestResults@2
       displayName: 'Publish tests results (python)'

.ado/publish.yml

@@ -110,19 +110,25 @@ extends:
           displayName: Set Python version
 
         - script: |
-            pip install pytest pytest-azurepipelines pytest-cov pytest-xdist
-          displayName: Install pytest dependencies
+            python -m pip install --upgrade pip
+            pip install pytest pytest-azurepipelines pytest-cov pytest-xdist tox
+          displayName: Install test dependencies
 
         - script: |
             pip freeze
           displayName: List installed packages
 
         - script: |
             cd $(Build.SourcesDirectory)/azure-quantum
-            pip install .[qiskit,cirq,qsharp,dev]
-            pytest --numprocesses $(PYTEST_MAX_PARALLEL_TESTS) --cov-report term --cov=azure.quantum --junitxml test-output-azure-quantum.xml $(Build.SourcesDirectory)/azure-quantum
+            pip install .[cirq,qsharp,dev]
+            pytest --numprocesses $(PYTEST_MAX_PARALLEL_TESTS) --cov-report term --cov=azure.quantum --junitxml test-output-azure-quantum.xml --ignore tests/unit/test_qiskit.py $(Build.SourcesDirectory)/azure-quantum
           displayName: Run Unit-tests
 
+        - script: |
+            cd $(Build.SourcesDirectory)/azure-quantum
+            tox -e py311-qiskit1,py311-qiskit2
+          displayName: Run Qiskit matrix tests
+
         - task: PublishTestResults@2
           displayName: 'Publish test results (python)'
           condition: succeededOrFailed()

.gitignore

@@ -391,7 +391,6 @@ coverage.xml
 htmlcov/
 
 # Other
-*.ini
 dist/
 temp/
 .[v]env/

azure-quantum/requirements-dev.txt

@@ -3,3 +3,4 @@ pytest-xdist>=3.8.0,<4.0
 vcrpy>=4.3.1 # fixes https://github.com/kevin1024/vcrpy/issues/688
 azure-devtools>=1.2.0,<2.0
 graphviz>=0.20.1
+tox>=4.32.0

azure-quantum/requirements-qiskit.txt

@@ -1,3 +1,3 @@
-qsharp[qiskit]>=1.9.0,<2.0
+qsharp[qiskit]>=1.22.0,<2.0
 Markdown>=3.4.1,<4.0
 python-markdown-math>=0.8.0,<1.0

azure-quantum/tests/README.md

@@ -133,6 +133,17 @@ Example:
 pytest -k test_job_refresh
 ```
 
+### Qiskit multi-version matrix
+
+To replay the recorded Qiskit tests against both supported majors, run the tox environments from the `azure-quantum` directory using `tox -e py{310,311,312,313}-qiskit{1,2}`, for example:
+
+```bash
+tox -e py311-qiskit1
+tox -e py311-qiskit2
+```
+
+Each command provisions an isolated virtual environment with the correct Qiskit version and executes `tests/unit/test_qiskit.py`.
+
 ## E2E Live Test Pipeline
 
 We have a private E2E test pipeline that run all the tests against

azure-quantum/tox.ini

@@ -0,0 +1,17 @@
+[tox]
+envlist = py{310,311,312,313}-qiskit{1,2}
+skipsdist = true
+
+[testenv]
+basepython =
+    py310: python3.10
+    py311: python3.11
+    py312: python3.12
+    py313: python3.13
+allowlist_externals = pytest
+deps =
+    qiskit1: qiskit<2
+    qiskit2: qiskit>=2,<3
+    -e .[qiskit]
+    -r requirements-dev.txt
+commands = pytest --junitxml test-qiskit-{envname}.xml tests/unit/test_qiskit.py