iqm-exa-common 26.29.0__tar.gz → 26.31.0__tar.gz

{iqm_exa_common-26.29.0 → iqm_exa_common-26.31.0}/CHANGELOG.rst

@@ -2,6 +2,22 @@
 Changelog
 =========
 
+Version 26.31.0 (2025-08-13)
+============================
+
+Bug fixes
+---------
+
+- Catch deprecation warning for pkg resources.
+
+Version 26.30.0 (2025-08-11)
+============================
+
+Bug fixes
+---------
+
+- Fix SettingNode.merge producing wrong paths/names in certain programmatic usage.
+
 Version 26.29.0 (2025-07-24)
 ============================
 

{iqm_exa_common-26.29.0/src/iqm_exa_common.egg-info → iqm_exa_common-26.31.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: iqm-exa-common
-Version: 26.29.0
+Version: 26.31.0
 Summary: Framework for control and measurement of superconducting qubits: common library
 Author-email: IQM Finland Oy <info@meetiqm.com>
 License:                                  Apache License

{iqm_exa_common-26.29.0 → iqm_exa_common-26.31.0}/src/exa/common/data/setting_node.py

@@ -580,7 +580,8 @@ class SettingNode(BaseModel):
                 else:
                     new.settings[key] = item.model_copy()
         for key, item in first.subtrees.items():
-            item_copy = item.model_copy(update={"name": item.name.replace(f"{first.name}.", "")}, deep=deep_copy)
+            update = {"name": item.name.replace(f"{first.name}.", "")} if align_name else {}
+            item_copy = item.model_copy(update=update, deep=deep_copy)
             subs = new if align_name else new.subtrees
             if key in new.subtrees:
                 subs[key] = SettingNode.merge(item_copy, new[key])

{iqm_exa_common-26.29.0 → iqm_exa_common-26.31.0}/src/exa/common/helpers/software_version_helper.py

@@ -17,8 +17,11 @@ from importlib.metadata import distribution
 import os
 import platform
 import subprocess
+import warnings
 
-import pkg_resources  # type:ignore[import-untyped]
+with warnings.catch_warnings():
+    warnings.filterwarnings("ignore", category=DeprecationWarning)
+    import pkg_resources  # type:ignore[import-untyped]
 
 
 def _is_editable(pkg_name: str) -> bool:
@@ -69,7 +72,9 @@ def get_all_software_versions(reload_module: bool = False) -> dict[str, str]:
     # TODO use of pkg_resources is discouraged, replace it with importlib.metadata below.
     # https://setuptools.pypa.io/en/latest/pkg_resources.html
     if reload_module:
-        reload(pkg_resources)
+        with warnings.catch_warnings():
+            warnings.filterwarnings("ignore", category=DeprecationWarning)
+            reload(pkg_resources)
     for pkg in pkg_resources.working_set:
         value = pkg.parsed_version.base_version
         if _is_editable(pkg.project_name):

{iqm_exa_common-26.29.0 → iqm_exa_common-26.31.0/src/iqm_exa_common.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: iqm-exa-common
-Version: 26.29.0
+Version: 26.31.0
 Summary: Framework for control and measurement of superconducting qubits: common library
 Author-email: IQM Finland Oy <info@meetiqm.com>
 License:                                  Apache License

iqm_exa_common-26.31.0/version.txt

@@ -0,0 +1 @@
+26.31.0

iqm_exa_common-26.29.0/version.txt

@@ -1 +0,0 @@
-26.29.0