diff --git a/ChangeLog b/ChangeLog index 51f56839ce83730a7a3dbdff8c9497f996dbd9fb..ad72884de298ea839fcb120a165fb1641de9ba93 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2024-01-12 Jan Kotanski <jankotan@gmail.com> + * fix condition for uniquelist type in group-map (#582) + * tagged as v3.60.1 + 2024-01-11 Jan Kotanski <jankotan@gmail.com> * add uniquelist type in group-map (#574) * tagged as v3.60.0 diff --git a/PKG-INFO b/PKG-INFO index fd6bf1a4c221f5c38695fa6590e5dc4e5cf1eb00..8bf91f3016b29fe002461cc910814df605074b80 100644 --- a/PKG-INFO +++ b/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 1.2 Name: nxstools -Version: 3.60.0 +Version: 3.60.1 Summary: Configuration tools for NeXDaTaS Tango Servers Home-page: http://github.com/nexdatas/nxstools Author: Jan Kotanski, Eugen Wintersberger , Halil Pasic diff --git a/nxstools.egg-info/PKG-INFO b/nxstools.egg-info/PKG-INFO index fd6bf1a4c221f5c38695fa6590e5dc4e5cf1eb00..8bf91f3016b29fe002461cc910814df605074b80 100644 --- a/nxstools.egg-info/PKG-INFO +++ b/nxstools.egg-info/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 1.2 Name: nxstools -Version: 3.60.0 +Version: 3.60.1 Summary: Configuration tools for NeXDaTaS Tango Servers Home-page: http://github.com/nexdatas/nxstools Author: Jan Kotanski, Eugen Wintersberger , Halil Pasic diff --git a/nxstools/nxsfileinfo.py b/nxstools/nxsfileinfo.py index 8320288d549045a8bcee56cd614547d9e6598e07..b5d3c371f862d801d8a39a88e39dc7d1d0b24034 100644 --- a/nxstools/nxsfileinfo.py +++ b/nxstools/nxsfileinfo.py @@ -2051,7 +2051,8 @@ class GroupMetadata(Runner): parent[key] = [] elif tgtype in cls.uniquelisttype and \ len(tg) > 0 and \ - cls._list_depth(tg) <= cls._list_depth(md): + cls._list_depth(tg) <= cls._list_depth(md) \ + and md != parent[key]: parent[key] = [tg] if tgtype not in cls.uniquelisttype or \ @@ -2072,7 +2073,8 @@ class GroupMetadata(Runner): tg["value"] = [] elif tgtype in cls.uniquelisttype and \ len(tg["value"]) > 0 and \ - cls._list_depth(tg["value"]) <= cls._list_depth(md): + cls._list_depth(tg["value"]) <= cls._list_depth(md) \ + and md != tg["value"]: parent[key]["value"] = [tg["value"]] tg = parent[key] diff --git a/nxstools/release.py b/nxstools/release.py index d52dff2d1dd2e8e74b100c7f97be890c87d29de7..a67f07e7800147d3a77599ac44a5ff3f64be153e 100644 --- a/nxstools/release.py +++ b/nxstools/release.py @@ -19,4 +19,4 @@ """ NXS tools release version""" #: (:obj:`str`) package version -__version__ = "3.60.0" +__version__ = "3.60.1" diff --git a/test/NXSFileInfo_test.py b/test/NXSFileInfo_test.py index f569e63d2ad9e867ad0dcf9bcb0259750bfb6a90..ec38d401a0e2a23391caa31b0233842ddee28395 100644 --- a/test/NXSFileInfo_test.py +++ b/test/NXSFileInfo_test.py @@ -12936,13 +12936,11 @@ For more help: ] ], "long_static_vector": [ - [ 0, 1, 0, 2, 3 - ] ], "dynamic_vector": [ [ @@ -12974,13 +12972,11 @@ For more help: "pressure_uniquelist": { "unit": "mbar", "value": [ - [ 999.0, 999.1, 999.2, 999.0, 998.9 - ] ] }, "pressure_list": { @@ -13246,13 +13242,11 @@ For more help: ] ], "long_static_vector": [ - [ 0, 1, 0, 2, 3 - ] ], "dynamic_vector": [[1.1, 3.4], [1.2, 4.4]], "pressure": {