iqm-exa-common 26.29.0__py3-none-any.whl → 26.31.0__py3-none-any.whl

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])

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.dist-info → iqm_exa_common-26.31.0.dist-info}/METADATA

@@ -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.dist-info → iqm_exa_common-26.31.0.dist-info}/RECORD

@@ -27,7 +27,7 @@ exa/common/control/sweep/option/sweep_options.py,sha256=BhKB7RHP0VXJ9iUQKVzeQOM4
 exa/common/data/__init__.py,sha256=F5SRe5QHBTjef4XJVQ63kO5Oxc_AiZnPbV560i7La0Y,644
 exa/common/data/base_model.py,sha256=U508YCtvZabBGnKe1fqUimunmwGulOTM6DOKTUqnYp8,1835
 exa/common/data/parameter.py,sha256=AQxeTvItMjOvT2QUvhKCn9aK5ibrfaN8LI_Oc68ZzII,24420
-exa/common/data/setting_node.py,sha256=yZU8lltzK5qV4L5Xte3AOcG85Tgdg-3mrxCiTpwbW7Q,44548
+exa/common/data/setting_node.py,sha256=KlmxesAnxRMc26sq1hUWVTMYpwlvjH_z9WeSa9KAWtc,44598
 exa/common/data/settingnode_v2.html.jinja2,sha256=mo-rlLLmU-Xxf6znJAisispAZK8sbV-2C13byKAtj_Q,3166
 exa/common/data/value.py,sha256=mtMws5UPGx1pCADK6Q2Tx4BwCXznvVRSNQRfcQ3NMmY,1853
 exa/common/errors/__init__.py,sha256=ArMBdpmx1EUenBpzrSNG63kmUf7PM0gCqSYnaCnL9Qk,597
@@ -38,7 +38,7 @@ exa/common/helpers/data_helper.py,sha256=-AP0vwrf7WgyumLsicDtNP2VP5rhG4_oiOZgG4a
 exa/common/helpers/deprecation.py,sha256=nY8484iun63JOBfBeh49Q6VD5xZ4_gT9fjPmH1RAXoI,397
 exa/common/helpers/json_helper.py,sha256=LoTrL6FREML1o0X3Zznf1baI4kn0kh03NE1nqBHgYss,2699
 exa/common/helpers/numpy_helper.py,sha256=KKKyZ_fD0O1gn7_InEQROYnX3WGMA6C1qHh8KzzjtUI,1062
-exa/common/helpers/software_version_helper.py,sha256=BUozde38-7X_NVh0lRY8VR2fvTEPLTz3nyEwSopEJEU,5174
+exa/common/helpers/software_version_helper.py,sha256=wAX7EK1w3N72e8mjKoBRbLZ6r79Jg9xdtQGdYPvmWGA,5412
 exa/common/helpers/yaml_helper.py,sha256=wLy-7Nyit597FoWBemduUilYP2VCk_aDDT8y62i3ox8,1626
 exa/common/logger/__init__.py,sha256=1bIsGxHzfujXlkgtcAnWToKMkw3dpU5PEd_7LE_NpgQ,686
 exa/common/logger/logger.py,sha256=0aSjkx4pXy_CCKtspOnFgwMmhZVFAZUlopQ6HUjBMko,5689
@@ -51,8 +51,8 @@ exa/common/qcm_data/qcm_data_client.py,sha256=Rze6yQd0xUeH6eUMv3wduYbiDCTP3C4WEC
 exa/common/sweep/__init__.py,sha256=uEKk5AtzSgSnf8Y0geRPwUpqXIBIXpeCxsN64sX7F1o,591
 exa/common/sweep/database_serialization.py,sha256=NUu1umxRQZpKtRmw1vNDsSbnofqbHvKFg_xQ2mdhY6k,7469
 exa/common/sweep/util.py,sha256=-QE2AaH-WDkYAVH5-Z-30leLgY0x4efmby4kc1JTCgY,3732
-iqm_exa_common-26.29.0.dist-info/LICENSE.txt,sha256=R6Q7eUrLyoCQgWYorQ8WJmVmWKYU3dxA3jYUp0wwQAw,11332
-iqm_exa_common-26.29.0.dist-info/METADATA,sha256=usD7yjsnYmS1lxcxRozoJPTyLrEXw3cHFD0sGwxzAQw,14742
-iqm_exa_common-26.29.0.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
-iqm_exa_common-26.29.0.dist-info/top_level.txt,sha256=Clphg2toaZ3_jSFRPhjMNEmLurkMNMc4lkK2EFYsSlM,4
-iqm_exa_common-26.29.0.dist-info/RECORD,,
+iqm_exa_common-26.31.0.dist-info/LICENSE.txt,sha256=R6Q7eUrLyoCQgWYorQ8WJmVmWKYU3dxA3jYUp0wwQAw,11332
+iqm_exa_common-26.31.0.dist-info/METADATA,sha256=UVI0BdsLMYoM4ZbKtPfmaR4l2VKqlEcwRqvE2XrL5rI,14742
+iqm_exa_common-26.31.0.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
+iqm_exa_common-26.31.0.dist-info/top_level.txt,sha256=Clphg2toaZ3_jSFRPhjMNEmLurkMNMc4lkK2EFYsSlM,4
+iqm_exa_common-26.31.0.dist-info/RECORD,,