Update upstream source from tag 'upstream/bullseye/4.18.1'

Update to upstream version '4.18.1'
with Debian dir 57a9ca730b79105d0e773ce6940450e206ca194f

ChangeLog

+2024-12-11 Jan Kotanski <jankotan@gmail.com>
+	* reset SciCatMeasurements if not dict (#734)
+	* tagged as v4.18.1
+
 2024-11-08 Jan Kotanski <jankotan@gmail.com>
 	* fix typo in h5rediswriter (#729)
 	* add `session` parameter for h5redis Writer property (#731)

PKG-INFO

 Metadata-Version: 2.1
 Name: nxstools
-Version: 4.18.0
+Version: 4.18.1
 Summary: Configuration tools for NeXDaTaS Tango Servers
 Home-page: http://github.com/nexdatas/nxstools
 Author: Jan Kotanski, Eugen Wintersberger , Halil Pasic

nxstools.egg-info/PKG-INFO

 Metadata-Version: 2.1
 Name: nxstools
-Version: 4.18.0
+Version: 4.18.1
 Summary: Configuration tools for NeXDaTaS Tango Servers
 Home-page: http://github.com/nexdatas/nxstools
 Author: Jan Kotanski, Eugen Wintersberger , Halil Pasic

nxstools/pyeval/scdataset.py

@@ -128,6 +128,7 @@ def append_scicat_dataset(macro, status_info=True, reingest=False):
                 sname = "%s:%s" % (sname, time.time())
 
         fdir = macro.getEnv('ScanDir')
+        fdir = os.path.abspath(fdir)
         snmode = get_env_var(macro, 'ScanNames', None)
         nometa = get_env_var(macro, 'ScanNamesNoMetadata', False)
         nogrouping = get_env_var(macro, 'ScanNamesNoGrouping', False)
@@ -146,6 +147,8 @@ def append_scicat_dataset(macro, status_info=True, reingest=False):
             commands = []
             try:
                 sm = dict(get_env_var(macro, 'SciCatMeasurements', {}))
+                if not isinstance(sm, dict):
+                    sm = {}
             except Exception:
                 sm = {}
 
@@ -190,6 +193,7 @@ def append_scicat_record(macro, sname, status_info=True):
     """
     # get beamtime id
     fdir = macro.getEnv('ScanDir')
+    fdir = os.path.abspath(fdir)
     if get_env_var(macro, 'ScanNames', None) is not None:
         fdir = os.path.dirname(os.path.abspath(fdir))
     bmtfpath = get_env_var(macro, "BeamtimeFilePath", "/gpfs/current")

nxstools/release.py

@@ -19,4 +19,4 @@
 """  NXS tools release version"""
 
 #: (:obj:`str`) package version
-__version__ = "4.18.0"
+__version__ = "4.18.1"