Merge branch 'main' into z_cal2

quantumlib · Sep 19, 2024 · 8c244e7 · 8c244e7
2 parents 07ba30a + 2fdee79
commit 8c244e7
Show file tree

Hide file tree

Showing 4 changed files with 68 additions and 77 deletions.
diff --git a/cirq-rigetti/cirq_rigetti/aspen_device.py b/cirq-rigetti/cirq_rigetti/aspen_device.py
@@ -66,7 +66,7 @@ def __init__(self, isa: Union[InstructionSetArchitecture, Dict[str, Any]]) -> No
         else:
             self.isa = InstructionSetArchitecture.from_raw(json.dumps(isa))
 
-        if self.isa.architecture.family != Family.Aspen:
+        if not Family.is_aspen(self.isa.architecture.family):
             raise UnsupportedRigettiQCSQuantumProcessor(
                 'this integration currently only supports Aspen devices, '
                 f'but client provided a {self.isa.architecture.family} device'

diff --git a/cirq-rigetti/cirq_rigetti/aspen_device_test.py b/cirq-rigetti/cirq_rigetti/aspen_device_test.py
@@ -253,10 +253,10 @@ def test_rigetti_qcs_aspen_device_repr(qcs_aspen8_isa: InstructionSetArchitectur
 def test_rigetti_qcs_aspen_device_family_validation(qcs_aspen8_isa: InstructionSetArchitecture):
     """test RigettiQCSAspenDevice validates architecture family on initialization"""
     non_aspen_isa = InstructionSetArchitecture.from_raw(qcs_aspen8_isa.json())
-    non_aspen_isa.architecture.family = Family.NONE
+    non_aspen_isa.architecture.family = Family.new_none()
 
-    assert (
-        non_aspen_isa.architecture.family == Family.Aspen
+    assert Family.is_aspen(
+        non_aspen_isa.architecture.family
     ), 'ISA family is read-only and should still be Aspen'
 
 

diff --git a/cirq-rigetti/requirements.txt b/cirq-rigetti/requirements.txt
@@ -1 +1,4 @@
 pyquil>=4.11.0,<5.0.0
+
+# TODO - remove once pyquil requires qcs-sdk-python >= 0.20.1
+qcs-sdk-python>=0.20.1