fix: The DefMeasureCalibration instructions property returns `pyQui…

…l` `AbstractInstrction`s instead of `quil` `Instruction`s (#1799)

fix: The DefMeasureCalibration class returns `pyQuil` `AbstractInstrutcion`s instead of `quil` `Instruction`s

pyquil/quilbase.py

@@ -2843,6 +2843,15 @@ def instrs(self) -> list[AbstractInstruction]:
     def instrs(self, instrs: list[AbstractInstruction]) -> None:
         quil_rs.MeasureCalibrationDefinition.instructions.__set__(self, _convert_to_rs_instructions(instrs))  # type: ignore[attr-defined] # noqa
 
+    @property  # type: ignore[override]
+    def instructions(self) -> list[AbstractInstruction]:
+        """The instructions in the calibration."""
+        return self.instrs
+
+    @instructions.setter
+    def instructions(self, instructions: list[AbstractInstruction]) -> None:
+        self.instrs = instructions
+
     def out(self) -> str:
         """Return the instruction as a valid Quil string."""
         return super().to_quil()

test/unit/test_quilbase.py

@@ -473,8 +473,21 @@ def test_memory_reference(self, measure_calibration: DefMeasureCalibration, memo
 
     def test_instrs(self, measure_calibration: DefMeasureCalibration, instrs: List[AbstractInstruction]):
         assert measure_calibration.instrs == instrs
-        measure_calibration.instrs = [Gate("SomeGate", [], [Qubit(0)], [])]
-        assert measure_calibration.instrs == [Gate("SomeGate", [], [Qubit(0)], [])]
+        measure_calibration.instrs = [Gate("SomeGate", [], [Qubit(0)], []), Fence([0])]
+        assert isinstance(measure_calibration.instrs[0], Gate)
+        assert not isinstance(measure_calibration.instrs[0], Fence)
+        assert isinstance(measure_calibration.instrs[1], Fence)
+        assert not isinstance(measure_calibration.instrs[1], Gate)
+        assert measure_calibration.instrs == [Gate("SomeGate", [], [Qubit(0)], []), Fence([0])]
+
+    def test_instructions(self, measure_calibration: DefMeasureCalibration, instrs: List[AbstractInstruction]):
+        assert measure_calibration.instructions == instrs
+        measure_calibration.instrs = [Gate("SomeGate", [], [Qubit(0)], []), Fence([0])]
+        assert isinstance(measure_calibration.instrs[0], Gate)
+        assert not isinstance(measure_calibration.instrs[0], Fence)
+        assert isinstance(measure_calibration.instrs[1], Fence)
+        assert not isinstance(measure_calibration.instrs[1], Gate)
+        assert measure_calibration.instrs == [Gate("SomeGate", [], [Qubit(0)], []), Fence([0])]
 
     def test_copy(self, measure_calibration: DefMeasureCalibration):
         assert isinstance(copy.copy(measure_calibration), DefMeasureCalibration)