From b1c6976befb58d5f62103e7db82712068a77dee6 Mon Sep 17 00:00:00 2001 From: Bill Ticehurst Date: Fri, 12 Jun 2026 21:44:16 -0700 Subject: [PATCH 1/5] Fix cryptography --- source/qdk_package/test_requirements.txt | 2 ++ source/qdk_package/tests-integration/test_requirements.txt | 2 ++ 2 files changed, 4 insertions(+) diff --git a/source/qdk_package/test_requirements.txt b/source/qdk_package/test_requirements.txt index dd5d13a093..eefd013266 100644 --- a/source/qdk_package/test_requirements.txt +++ b/source/qdk_package/test_requirements.txt @@ -2,4 +2,6 @@ pytest expecttest==0.3.0 pyqir>=0.12.5,<0.13 cirq==1.6.1; platform_system != 'Windows' or platform_machine == 'AMD64' +cryptography==48.0.1 +# cryptography 49 and later dropped intel mac support. Unfix the version when we drop Intel mac support. pandas>=2.1 diff --git a/source/qdk_package/tests-integration/test_requirements.txt b/source/qdk_package/tests-integration/test_requirements.txt index f7ae43f63a..f8dfbea6ba 100644 --- a/source/qdk_package/tests-integration/test_requirements.txt +++ b/source/qdk_package/tests-integration/test_requirements.txt @@ -6,4 +6,6 @@ qiskit_qasm3_import==0.6.0 expecttest==0.3.0 numpy>=1.26.4 cirq-core>=1.6.1,<1.7 +cryptography==48.0.1 +# cryptography 49 and later dropped intel mac support. Unfix the version when we drop Intel mac support. # Qiskit distributions are installed per test run by build.py. From 758bc9d8431cb33b3122ca7d09016906e05edae4 Mon Sep 17 00:00:00 2001 From: Bill Ticehurst Date: Fri, 12 Jun 2026 21:50:46 -0700 Subject: [PATCH 2/5] Install cryptography before cirq --- source/qdk_package/test_requirements.txt | 4 ++-- source/qdk_package/tests-integration/test_requirements.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/qdk_package/test_requirements.txt b/source/qdk_package/test_requirements.txt index eefd013266..71b17c5d49 100644 --- a/source/qdk_package/test_requirements.txt +++ b/source/qdk_package/test_requirements.txt @@ -1,7 +1,7 @@ +cryptography==48.0.1 +# cryptography 49 and later dropped intel mac support. Unfix the version when we drop Intel mac support. pytest expecttest==0.3.0 pyqir>=0.12.5,<0.13 cirq==1.6.1; platform_system != 'Windows' or platform_machine == 'AMD64' -cryptography==48.0.1 -# cryptography 49 and later dropped intel mac support. Unfix the version when we drop Intel mac support. pandas>=2.1 diff --git a/source/qdk_package/tests-integration/test_requirements.txt b/source/qdk_package/tests-integration/test_requirements.txt index f8dfbea6ba..5b88ccb8ca 100644 --- a/source/qdk_package/tests-integration/test_requirements.txt +++ b/source/qdk_package/tests-integration/test_requirements.txt @@ -1,4 +1,6 @@ pytest==9.0.3 +cryptography==48.0.1 +# cryptography 49 and later dropped intel mac support. Unfix the version when we drop Intel mac support. qirrunner==0.9.0 pyqir>=0.12.5,<0.13 qiskit-aer==0.17.2 @@ -6,6 +8,4 @@ qiskit_qasm3_import==0.6.0 expecttest==0.3.0 numpy>=1.26.4 cirq-core>=1.6.1,<1.7 -cryptography==48.0.1 -# cryptography 49 and later dropped intel mac support. Unfix the version when we drop Intel mac support. # Qiskit distributions are installed per test run by build.py. From 2f955b1d45e31f728157dded622d0ea6b56ac0da Mon Sep 17 00:00:00 2001 From: Bill Ticehurst Date: Fri, 12 Jun 2026 22:52:23 -0700 Subject: [PATCH 3/5] Skip cryptography on WoA64 --- source/qdk_package/test_requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/qdk_package/test_requirements.txt b/source/qdk_package/test_requirements.txt index 71b17c5d49..f3938e2c28 100644 --- a/source/qdk_package/test_requirements.txt +++ b/source/qdk_package/test_requirements.txt @@ -1,7 +1,7 @@ -cryptography==48.0.1 -# cryptography 49 and later dropped intel mac support. Unfix the version when we drop Intel mac support. pytest expecttest==0.3.0 pyqir>=0.12.5,<0.13 +# cryptography 49 and later dropped intel mac support. Unfix the version when we drop Intel mac support. +cryptography==48.0.1; platform_system != 'Windows' or platform_machine == 'AMD64' cirq==1.6.1; platform_system != 'Windows' or platform_machine == 'AMD64' pandas>=2.1 From 0334846fb82256302574ffbf6bb61f4e84721eaa Mon Sep 17 00:00:00 2001 From: Bill Ticehurst Date: Sat, 13 Jun 2026 09:59:32 -0700 Subject: [PATCH 4/5] Fix Qiskit version for intel mac --- build.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/build.py b/build.py index 8edf636f23..84670ead6d 100755 --- a/build.py +++ b/build.py @@ -169,14 +169,19 @@ def step_end(): vscode_src = os.path.join(qdk_src_dir, "vscode") jupyterlab_src = os.path.join(qdk_src_dir, "jupyterlab") +# Qiskit stopped providing binary wheels for Mac on Intel starting with version 2.4.2. Remove this bifurcation when we drop Intel Mac support +is_intel_mac = platform.system() == "Darwin" and platform.machine() == "x86_64" + QISKIT_VERSION_MATRIX = [ { "label": "qiskit>=1.3.0,<2.0.0", "requirements": ["qiskit>=1.3.0,<2.0.0"], }, { - "label": "qiskit>=2.0.0,<3.0.0", - "requirements": ["qiskit>=2.0.0,<3.0.0"], + "label": "qiskit>=2.0.0,<3.0.0" if not is_intel_mac else "qiskit==2.4.1", + "requirements": ( + ["qiskit>=2.0.0,<3.0.0"] if not is_intel_mac else ["qiskit==2.4.1"] + ), }, ] From 828c8c301e692e772d521106f40d441a6dae8df7 Mon Sep 17 00:00:00 2001 From: Bill Ticehurst Date: Sat, 13 Jun 2026 10:29:55 -0700 Subject: [PATCH 5/5] Fix qiskit version for integration tests --- source/qdk_package/tests-integration/test_requirements.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/source/qdk_package/tests-integration/test_requirements.txt b/source/qdk_package/tests-integration/test_requirements.txt index 5b88ccb8ca..5c776d0add 100644 --- a/source/qdk_package/tests-integration/test_requirements.txt +++ b/source/qdk_package/tests-integration/test_requirements.txt @@ -3,6 +3,9 @@ cryptography==48.0.1 # cryptography 49 and later dropped intel mac support. Unfix the version when we drop Intel mac support. qirrunner==0.9.0 pyqir>=0.12.5,<0.13 +# Qiskit Aer will pull in Qiskit, and for Intel Mac we want to ensure Qiskit 2.4.1 is used, which is the last version with wheels for that platform. +# Remove the qiskit requirement when we drop Intel Mac support, as it will be pulled in by qiskit-aer. +qiskit<=2.4.1; platform_system == "Darwin" and platform_machine == "x86_64" qiskit-aer==0.17.2 qiskit_qasm3_import==0.6.0 expecttest==0.3.0