iqm-pulse 9.20.0__tar.gz → 9.21.0__tar.gz

{iqm_pulse-9.20.0 → iqm_pulse-9.21.0}/CHANGELOG.rst

@@ -2,6 +2,14 @@
 Changelog
 =========
 
+Version 9.21.0 (2025-07-10)
+===========================
+
+Bug fixes
+---------
+
+- Fix instructions with same field names being treated as equal in building the playlist
+
 Version 9.20.0 (2025-07-09)
 ===========================
 

{iqm_pulse-9.20.0/src/iqm_pulse.egg-info → iqm_pulse-9.21.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: iqm-pulse
-Version: 9.20.0
+Version: 9.21.0
 Summary: A Python-based project for providing interface and implementations for control pulses.
 Author-email: IQM Finland Oy <info@meetiqm.com>
 License:                                  Apache License

{iqm_pulse-9.20.0 → iqm_pulse-9.21.0}/src/iqm/pulse/builder.py

@@ -1311,7 +1311,7 @@ class ScheduleBuilder:
         }
 
         pl = Playlist()
-        mapped_instructions: dict[str, dict[int, Any]] = {}
+        mapped_instructions: dict[str, dict[int | Instruction, Any]] = {}
 
         def _append_to_schedule(sc_schedule: SC_Schedule, channel_name: str, instr: Instruction) -> None:
             """Append ``instr`` to ``sc_schedule`` into the channel``channel_name``."""
@@ -1320,10 +1320,12 @@ class ScheduleBuilder:
                 # 2 dataclasses can have the same hash if their fields are identical. We must
                 # distinguish between different Waveform classes which may have identical fields,
                 # so we use the instruction itself as a key, so that the class is checked too.
-                instr_id = hash(instr)
+                instr_id = instr  # type: ignore[attr-defined]
+                is_mapped = instr_id in mapped_instructions.setdefault(channel_name, {})
             except TypeError:
                 instr_id = instr.id  # type: ignore[attr-defined]
-            if instr_id not in mapped_instructions.setdefault(channel_name, {}):
+                is_mapped = instr_id in mapped_instructions.setdefault(channel_name, {})
+            if not is_mapped:
                 mapped = _map_instruction(instr)
                 idx = pl.channel_descriptions[channel_name].add_instruction(mapped)
                 sc_schedule.instructions.setdefault(channel_name, []).append(idx)

{iqm_pulse-9.20.0 → iqm_pulse-9.21.0/src/iqm_pulse.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: iqm-pulse
-Version: 9.20.0
+Version: 9.21.0
 Summary: A Python-based project for providing interface and implementations for control pulses.
 Author-email: IQM Finland Oy <info@meetiqm.com>
 License:                                  Apache License

iqm_pulse-9.21.0/version.txt

@@ -0,0 +1 @@
+9.21.0

iqm_pulse-9.20.0/version.txt

@@ -1 +0,0 @@
-9.20.0