sardana-nxsrecorder 3.20.0__tar.gz → 3.21.1__tar.gz

{sardana-nxsrecorder-3.20.0 → sardana-nxsrecorder-3.21.1}/ChangeLog

@@ -1,3 +1,12 @@
+2024-05-23 Jan Kotanski <jankotan@gmail.com>
+	* replace deprecated tz.localize() with datetime.replace() (#111)
+	* tagged as 3.21.1
+
+2024-05-22 Jan Kotanski <jankotan@gmail.com>
+	* improve support for creating measurement files in appendentry mode (#108)
+	* change entryname in the appendentry mode to '%s_%05i' (#108)
+	* tagged as 3.21.0
+
 2024-05-22 Jan Kotanski <jankotan@gmail.com>
 	* add support for creating measurement files (#105)
 	* tagged as 3.20.0

{sardana-nxsrecorder-3.20.0/sardana_nxsrecorder.egg-info → sardana-nxsrecorder-3.21.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sardana-nxsrecorder
-Version: 3.20.0
+Version: 3.21.1
 Summary: NeXus Sardana Scan Recorder
 Home-page: https://github.com/nexdatas/sardana-nxs-filerecorder/
 Author: Jan Kotanski
@@ -12,7 +12,6 @@ Classifier: Intended Audience :: Science/Research
 Classifier: Topic :: Scientific/Engineering :: Physics
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
-Classifier: Programming Language :: Python :: 2.7
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.4
 Classifier: Programming Language :: Python :: 3.5
@@ -22,6 +21,7 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 
 Welcome to sardananxsrecorder's documentation!
 ==============================================

{sardana-nxsrecorder-3.20.0 → sardana-nxsrecorder-3.21.1/sardana_nxsrecorder.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sardana-nxsrecorder
-Version: 3.20.0
+Version: 3.21.1
 Summary: NeXus Sardana Scan Recorder
 Home-page: https://github.com/nexdatas/sardana-nxs-filerecorder/
 Author: Jan Kotanski
@@ -12,7 +12,6 @@ Classifier: Intended Audience :: Science/Research
 Classifier: Topic :: Scientific/Engineering :: Physics
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
-Classifier: Programming Language :: Python :: 2.7
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.4
 Classifier: Programming Language :: Python :: 3.5
@@ -22,6 +21,7 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 
 Welcome to sardananxsrecorder's documentation!
 ==============================================

{sardana-nxsrecorder-3.20.0 → sardana-nxsrecorder-3.21.1}/sardananxsrecorder/__init__.py

@@ -20,4 +20,4 @@
 """ Sardana Scan Recorders """
 
 #: package version
-__version__ = "3.20.0"
+__version__ = "3.21.1"

{sardana-nxsrecorder-3.20.0 → sardana-nxsrecorder-3.21.1}/sardananxsrecorder/nxsrecorder.py

@@ -22,6 +22,7 @@
 
 import os
 import re
+import sys
 
 import numpy
 import json
@@ -961,7 +962,7 @@ class NXS_FileRecorder(BaseFileRecorder):
             appendentry = not self.__setFileName(
                 self.__base_filename, not appendentry)
             envRec = self.recordlist.getEnviron()
-            self.__vars["vars"]["serialno"] = envRec["serialno"] \
+            self.__vars["vars"]["serialno"] = ("_%05i" % envRec["serialno"]) \
                 if appendentry else ""
             self.__vars["vars"]["scan_id"] = envRec["serialno"]
             self.__vars["vars"]["scan_title"] = envRec["title"]
@@ -1129,7 +1130,10 @@ class NXS_FileRecorder(BaseFileRecorder):
             tz = pytz.timezone(self.__timezone)
 
         fmt = '%Y-%m-%dT%H:%M:%S.%f%z'
-        starttime = tz.localize(mtime)
+        if sys.version_info > (3, 6):
+            starttime = mtime.replace(tzinfo=tz)
+        else:
+            starttime = tz.localize(mtime)
         return str(starttime.strftime(fmt))
 
     def _endRecordList(self, recordlist):
@@ -1233,8 +1237,8 @@ class NXS_FileRecorder(BaseFileRecorder):
             scanname, _ = os.path.splitext(bfname)
 
         if appendentry is True:
-            sid = self.__getEnvVar("ScanID", 0)
-            sname = "%s::/%s%i;%s_%05i" % (
+            sid = self.__vars["vars"]["scan_id"]
+            sname = "%s::/%s_%05i;%s_%05i" % (
                 scanname, entryname, sid, scanname, sid)
 
         # auto grouping
@@ -1290,6 +1294,10 @@ class NXS_FileRecorder(BaseFileRecorder):
         variables = self.__getConfVar("ConfigVariables", None, True)
         if isinstance(variables, dict) and "entryname" in variables:
             entryname = variables["entryname"]
+        if appendentry is True:
+            sid = self.__vars["vars"]["scan_id"]
+            entryname = entryname + ("_%05i" % sid)
+            sname = sname + ("_%05i" % sid)
 
         mntname = scanname
         if fdir in sm.keys() and sm[fdir]:
@@ -1304,7 +1312,7 @@ class NXS_FileRecorder(BaseFileRecorder):
                 fl = h5writer.open_file(mntfile, readonly=False)
             rt = fl.root()
             if sname not in rt.names():
-                h5writer.link("%s:/%s" % (self.filename, entryname), rt, sname)
+                h5writer.link("%s:/%s" % (fname, entryname), rt, sname)
                 self.debug("Link  '%s' in '%s' created " % (sname, mntname))
             rt.close()
             fl.close()

{sardana-nxsrecorder-3.20.0 → sardana-nxsrecorder-3.21.1}/setup.py

@@ -50,7 +50,7 @@ install_requires = [
     'numpy>1.6.0',
     # 'pytango',
     # 'nxswriter',
-    # 'nxstools',
+    # 'nxstools',  # >4.1.0
     # 'nxsconfigserver',
     # 'sardana',
     # 'taurus',
@@ -80,7 +80,6 @@ SETUPDATA = dict(
         'Topic :: Scientific/Engineering :: Physics',
         'Topic :: Software Development :: Libraries :: Python Modules',
         'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
@@ -90,6 +89,7 @@ SETUPDATA = dict(
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: 3.11',
+        'Programming Language :: Python :: 3.12',
     ],
     install_requires=install_requires,
     zip_safe=False,