From c0a838977b6aa0b34620a4a855c08f8343f28637 Mon Sep 17 00:00:00 2001
From: Jan Kotanski <jankotan@gmail.com>
Date: Fri, 12 Jan 2024 08:04:28 +0100
Subject: [PATCH] New upstream version 3.60.1
---
ChangeLog | 4 ++++
PKG-INFO | 2 +-
nxstools.egg-info/PKG-INFO | 2 +-
nxstools/nxsfileinfo.py | 6 ++++--
nxstools/release.py | 2 +-
test/NXSFileInfo_test.py | 6 ------
6 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 51f56839..ad72884d 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 fd6bf1a4..8bf91f30 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 fd6bf1a4..8bf91f30 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 8320288d..b5d3c371 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 d52dff2d..a67f07e7 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 f569e63d..ec38d401 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": {
--
GitLab