nxswriter 3.14.0__tar.gz → 3.16.0__tar.gz

{nxswriter-3.14.0 → nxswriter-3.16.0}/.ci/install.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # restart mysqldb
-if [ "$1" = "debian11" ] || [ "$1" = "debian12" ] || [ "$1" = "ubuntu24.10" ] || [ "$1" = "ubuntu24.04" ]; then
+if [ "$1" = "debian11" ] || [ "$1" = "debian12" ] || [ "$1" = "ubuntu24.10" ] || [ "$1" = "ubuntu25.04" ] || [ "$1" = "ubuntu24.04" ]; then
     docker exec --user root ndts service mariadb restart
 else
     # workaround for a bug in debian9, i.e. starting mysql hangs
@@ -17,7 +17,7 @@ fi
 
 echo "install tango-common"
 docker exec  --user root ndts /bin/bash -c 'apt-get -qq update; export DEBIAN_FRONTEND=noninteractive; apt-get -qq install -y tango-common; sleep 10'
-if  [ "$1" = "ubuntu24.04" ] || [ "$1" = "ubuntu24.10" ]; then
+if  [ "$1" = "ubuntu24.04" ] || [ "$1" = "ubuntu24.10" ] || [ "$1" = "ubuntu25.04" ]; then
     # docker exec  --user tango ndts /bin/bash -c '/usr/lib/tango/DataBaseds 2 -ORBendPoint giop:tcp::10000  &'
     docker exec  --user root ndts /bin/bash -c 'echo -e "[client]\nuser=root\npassword=rootpw" > /root/.my.cnf'
     docker exec  --user root ndts /bin/bash -c 'echo -e "[client]\nuser=tango\nhost=localhost\npassword=rootpw" > /var/lib/tango/.my.cnf'
@@ -33,7 +33,7 @@ fi
 echo "install tango-db"
 docker exec  --user root ndts /bin/bash -c 'apt-get -qq update; export DEBIAN_FRONTEND=noninteractive; apt-get -qq install -y tango-db; sleep 10'
 if [ "$?" -ne "0" ]; then exit 255; fi
-if  [ "$1" = "ubuntu24.04" ] || [ "$1" = "ubuntu24.10" ]; then
+if  [ "$1" = "ubuntu24.04" ] || [ "$1" = "ubuntu24.10" ] || [ "$1" = "ubuntu25.04" ]; then
     docker exec  --user tango ndts /usr/bin/mysql -e 'create database tango'
     docker exec  --user tango ndts /bin/bash -c '/usr/bin/mysql tango < /usr/share/dbconfig-common/data/tango-db/install/mysql'
 fi
@@ -54,7 +54,7 @@ if [ "$2" = "2" ]; then
     docker exec  --user root ndts /bin/sh -c 'apt-get -qq update; apt-get -qq install -y   python-pytango nxsconfigserver-db python-nxstools'
 else
     echo "install python3-pytango"
-    if [ "$1" = "ubuntu20.04" ] || [ "$1" = "ubuntu20.10" ] || [ "$1" = "ubuntu21.04" ] || [ "$1" = "ubuntu24.04" ] || [ "$1" = "ubuntu24.10" ] || [ "$1" = "ubuntu23.10" ] || [ "$1" = "ubuntu22.04" ] || [ "$1" = "debian11" ] || [ "$1" = "debian12" ]; then
+    if [ "$1" = "ubuntu20.04" ] || [ "$1" = "ubuntu20.10" ] || [ "$1" = "ubuntu21.04" ] || [ "$1" = "ubuntu24.04" ] || [ "$1" = "ubuntu24.10" ] || [ "$1" = "ubuntu25.04" ] || [ "$1" = "ubuntu23.10" ] || [ "$1" = "ubuntu22.04" ] || [ "$1" = "debian11" ] || [ "$1" = "debian12" ]; then
 	docker exec  --user root ndts /bin/sh -c 'apt-get -qq update; apt-get -qq install -y   python3-tango nxsconfigserver-db python3-nxstools'
     else
 	docker exec  --user root ndts /bin/sh -c 'apt-get -qq update; apt-get -qq install -y   python3-pytango nxsconfigserver-db python3-nxstools'

{nxswriter-3.14.0 → nxswriter-3.16.0}/.github/workflows/tests.yml

@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        os: [debian12, debian11, debian10, ubuntu24.10, ubuntu24.04, ubuntu22.04]
+        os: [debian12, debian11, debian10, ubuntu25.04, ubuntu24.04, ubuntu22.04]
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2

{nxswriter-3.14.0 → nxswriter-3.16.0}/ChangeLog

@@ -1,5 +1,14 @@
 2025-03-28 Jan Kotanski <jankotan@gmail.com>
-	* add support for vds (#180)
+	* add support for DATA_ARRAY v4 (#182)
+	* tagged as 3.16.0
+
+2025-03-28 Jan Kotanski <jankotan@gmail.com>
+	* make fixes for numpy2  (#179)
+	* recommends nxstools 4.23.0
+	* tagged as 3.15.0
+
+2025-03-28 Jan Kotanski <jankotan@gmail.com>
+	* add support for vds (#176)
 	* recommends nxstools 4.22.1
 	* tagged as 3.14.0
 

{nxswriter-3.14.0/nxswriter.egg-info → nxswriter-3.16.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nxswriter
-Version: 3.14.0
+Version: 3.16.0
 Summary: Nexus Data writer implemented as a Tango Server
 Home-page: https://github.com/nexdatas/nxsdatawriter
 Author: Jan Kotanski, Eugen Wintersberger , Halil Pasic
@@ -23,6 +23,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 
 Welcome to NXSDataWriter's documentation!
 =========================================
@@ -90,7 +91,7 @@ Extract sources and run
 Debian packages
 """""""""""""""
 
-Debian `bookworm`, `bullseye`, `buster`  or Ubuntu `oracular`,  `noble`, `jammy`  packages can be found in the HDRI repository.
+Debian `bookworm`, `bullseye`, `buster`  or Ubuntu `plucky`,  `noble`, `jammy`  packages can be found in the HDRI repository.
 
 To install the debian packages, add the PGP repository key
 

{nxswriter-3.14.0 → nxswriter-3.16.0}/README.rst

@@ -64,7 +64,7 @@ Extract sources and run
 Debian packages
 """""""""""""""
 
-Debian `bookworm`, `bullseye`, `buster`  or Ubuntu `oracular`,  `noble`, `jammy`  packages can be found in the HDRI repository.
+Debian `bookworm`, `bullseye`, `buster`  or Ubuntu `plucky`,  `noble`, `jammy`  packages can be found in the HDRI repository.
 
 To install the debian packages, add the PGP repository key
 

{nxswriter-3.14.0 → nxswriter-3.16.0}/man/nxswriter.1

@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "NXSWRITER" "1" "Jan 13, 2025" "3.13" "NXSDataWriter"
+.TH "NXSWRITER" "1" "Jun 04, 2025" "3.16" "NXSDataWriter"
 .SH NAME
 nxswriter \- nxswriter Documentation
 .sp
@@ -79,7 +79,7 @@ $ python3 setup.py install
 .UNINDENT
 .SS Debian packages
 .sp
-Debian \fIbookworm\fP, \fIbullseye\fP, \fIbuster\fP  or Ubuntu \fIoracular\fP,  \fInoble\fP, \fIjammy\fP  packages can be found in the HDRI repository.
+Debian \fIbookworm\fP, \fIbullseye\fP, \fIbuster\fP  or Ubuntu \fIplucky\fP,  \fInoble\fP, \fIjammy\fP  packages can be found in the HDRI repository.
 .sp
 To install the debian packages, add the PGP repository key
 .INDENT 0.0
@@ -1250,6 +1250,31 @@ During its thread run it fetches the data from the source
 .UNINDENT
 .INDENT 7.0
 .TP
+.B setLength(index, value)
+sets lengths dict element
+.INDENT 7.0
+.TP
+.B Parameters
+.INDENT 7.0
+.IP \(bu 2
+\fBindex\fP (\fI\%int\fP) \-\- length index
+.IP \(bu 2
+\fBvalue\fP (\fI\%int\fP or \fI\%str\fP) \-\- length value
+.UNINDENT
+.UNINDENT
+.UNINDENT
+.INDENT 7.0
+.TP
+.B setRank(rank)
+sets dimension rank
+.INDENT 7.0
+.TP
+.B Parameters
+\fBindex\fP (\fBsrc\fP) \-\- dimension rank
+.UNINDENT
+.UNINDENT
+.INDENT 7.0
+.TP
 .B store(xml=None, globalJSON=None)
 stores the tag content
 .INDENT 7.0
@@ -1370,6 +1395,31 @@ During its thread run it fetches the data from the source
 .UNINDENT
 .INDENT 7.0
 .TP
+.B setLength(index, value)
+sets lengths dict element
+.INDENT 7.0
+.TP
+.B Parameters
+.INDENT 7.0
+.IP \(bu 2
+\fBindex\fP (\fI\%int\fP) \-\- length index
+.IP \(bu 2
+\fBvalue\fP (\fI\%int\fP or \fI\%str\fP) \-\- length value
+.UNINDENT
+.UNINDENT
+.UNINDENT
+.INDENT 7.0
+.TP
+.B setRank(rank)
+sets dimension rank
+.INDENT 7.0
+.TP
+.B Parameters
+\fBindex\fP (\fBsrc\fP) \-\- dimension rank
+.UNINDENT
+.UNINDENT
+.INDENT 7.0
+.TP
 .B shuffle
 (\fI\%bool\fP) compression shuffle
 .UNINDENT
@@ -2145,6 +2195,119 @@ constructor
 .UNINDENT
 .INDENT 0.0
 .TP
+.B class  nxswriter.H5Elements.ESelection(attrs, last, streams=None)
+Bases: \fI\%Element\fP
+.sp
+selection tag element
+.sp
+constructor
+.INDENT 7.0
+.TP
+.B Parameters
+.INDENT 7.0
+.IP \(bu 2
+\fBattrs\fP (\fI\%dict\fP <\fI\%str\fP, \fI\%str\fP>) \-\- dictionary of the tag attributes
+.IP \(bu 2
+\fBlast\fP (\fI\%nxswriter.Element.Element\fP) \-\- the last element from the stack
+.IP \(bu 2
+\fBstreams\fP (\fBStreamSet\fP or \fI\%tango.LatestDeviceImpl\fP) \-\- tango\-like steamset class
+.UNINDENT
+.UNINDENT
+.UNINDENT
+.INDENT 0.0
+.TP
+.B class  nxswriter.H5Elements.ESlab(attrs, last, streams=None)
+Bases: \fI\%Element\fP
+.sp
+slab tag element
+.sp
+constructor
+.INDENT 7.0
+.TP
+.B Parameters
+.INDENT 7.0
+.IP \(bu 2
+\fBattrs\fP (\fI\%dict\fP <\fI\%str\fP, \fI\%str\fP>) \-\- dictionary of the tag attributes
+.IP \(bu 2
+\fBlast\fP (\fI\%nxswriter.Element.Element\fP) \-\- the last element from the stack
+.IP \(bu 2
+\fBstreams\fP (\fBStreamSet\fP or \fI\%tango.LatestDeviceImpl\fP) \-\- tango\-like steamset class
+.UNINDENT
+.UNINDENT
+.INDENT 7.0
+.TP
+.B content
+(\fI\%list\fP <\fI\%str\fP>) tag content
+.UNINDENT
+.INDENT 7.0
+.TP
+.B source
+(\fI\%nxswriter.DataSources.DataSource\fP) data source
+.UNINDENT
+.INDENT 7.0
+.TP
+.B store(xml=None, globalJSON=None)
+stores the tag content
+.INDENT 7.0
+.TP
+.B Parameters
+.INDENT 7.0
+.IP \(bu 2
+\fBxml\fP \-\- xml setting
+.IP \(bu 2
+\fBglobalJSON\fP (:     \fI\%dict\fP <\fI\%str\fP, \fI\%dict\fP <\fI\%str\fP, any>>) \-\- global JSON string
+.UNINDENT
+.UNINDENT
+.UNINDENT
+.UNINDENT
+.INDENT 0.0
+.TP
+.B class  nxswriter.H5Elements.ESlice(attrs, last, streams=None)
+Bases: \fI\%Element\fP
+.sp
+slice tag element
+.sp
+constructor
+.INDENT 7.0
+.TP
+.B Parameters
+.INDENT 7.0
+.IP \(bu 2
+\fBattrs\fP (\fI\%dict\fP <\fI\%str\fP, \fI\%str\fP>) \-\- dictionary of the tag attributes
+.IP \(bu 2
+\fBlast\fP (\fI\%nxswriter.Element.Element\fP) \-\- the last element from the stack
+.IP \(bu 2
+\fBstreams\fP (\fBStreamSet\fP or \fI\%tango.LatestDeviceImpl\fP) \-\- tango\-like steamset class
+.UNINDENT
+.UNINDENT
+.INDENT 7.0
+.TP
+.B content
+(\fI\%list\fP <\fI\%str\fP>) tag content
+.UNINDENT
+.INDENT 7.0
+.TP
+.B source
+(\fI\%nxswriter.DataSources.DataSource\fP) data source
+.UNINDENT
+.INDENT 7.0
+.TP
+.B store(xml=None, globalJSON=None)
+stores the tag content
+.INDENT 7.0
+.TP
+.B Parameters
+.INDENT 7.0
+.IP \(bu 2
+\fBxml\fP \-\- xml setting
+.IP \(bu 2
+\fBglobalJSON\fP (:     \fI\%dict\fP <\fI\%str\fP, \fI\%dict\fP <\fI\%str\fP, any>>) \-\- global JSON string
+.UNINDENT
+.UNINDENT
+.UNINDENT
+.UNINDENT
+.INDENT 0.0
+.TP
 .B class  nxswriter.H5Elements.ESymbol(attrs, last, streams=None)
 Bases: \fI\%Element\fP
 .sp

{nxswriter-3.14.0 → nxswriter-3.16.0}/nxswriter/DecoderPool.py

@@ -175,8 +175,10 @@ class DATAARRAYdecoder(object):
         self.__value = None
         #: ([:obj:`str`, :obj:`str`]) header and image data
         self.__data = None
-        #: (:obj:`str`) struct header format
-        self.__headerFormat = '<IHHIIHHHHHHHHIIIIIIII'
+        #: (:obj:`str`) struct header format ver < 4
+        self.__headerFormat123 = '<IHHIIHHHHHHHHIIIIIIII'
+        #: (:obj:`str`) struct header format ver >=4
+        self.__headerFormat = '<IHHIIHHHHHHHHIIIIIIQQII'
         #: (:obj:`dict` <:obj:`str`, :obj:`any` > ) header data
         self.__header = {}
         #: (:obj:`dict` <:obj:`int`, :obj:`str` > ) format modes
@@ -200,7 +202,7 @@ class DATAARRAYdecoder(object):
         """
         self.__data = data
         self.format = data[0]
-        self._loadHeader(data[1][:struct.calcsize(self.__headerFormat)])
+        self._loadHeader(data[1])
         self.__value = None
 
     def _loadHeader(self, headerData):
@@ -209,7 +211,15 @@ class DATAARRAYdecoder(object):
         :param headerData: buffer with header data
         :type headerData: :obj:`str`
         """
-        hdr = struct.unpack(self.__headerFormat, headerData)
+        try:
+            hData = headerData[:struct.calcsize(self.__headerFormat)]
+            hdr = struct.unpack(self.__headerFormat, hData)
+            if hdr[1] < 4:
+                hData = headerData[:struct.calcsize(self.__headerFormat123)]
+                hdr = struct.unpack(self.__headerFormat123, hData)
+        except Exception:
+            hData = headerData[:struct.calcsize(self.__headerFormat123)]
+            hdr = struct.unpack(self.__headerFormat123, hData)
         self.__header = {}
         self.__header['magic'] = hdr[0]
         self.__header['headerVersion'] = hdr[1]
@@ -261,7 +271,12 @@ class DATAARRAYdecoder(object):
         if not self.__header or not self.__data:
             return
         if self.__value is None:
-            image = self.__data[1][struct.calcsize(self.__headerFormat):]
+            if 'headerVersion' in self.__header and \
+               self.__header['headerVersion'] >= 4:
+                image = self.__data[1][struct.calcsize(self.__headerFormat):]
+            else:
+                image = self.__data[1][
+                    struct.calcsize(self.__headerFormat123):]
             dformat = self.__formatID[self.__header['imageMode']]
             fSize = struct.calcsize(dformat)
             self.__value = numpy.array(

{nxswriter-3.14.0 → nxswriter-3.16.0}/nxswriter/Release.py

@@ -21,4 +21,4 @@
 
 
 #: package version
-__version__ = "3.14.0"
+__version__ = "3.16.0"

{nxswriter-3.14.0 → nxswriter-3.16.0}/nxswriter/Types.py

@@ -27,6 +27,18 @@ if sys.version_info > (3,):
     long = int
 
 
+try:
+    _npver = numpy.version.version.split(".")
+    NPMAJOR = int(_npver[0])
+    if NPMAJOR > 1:
+        npstring = numpy.bytes_
+    else:
+        npstring = numpy.string_
+except Exception:
+    NPMAJOR = 1
+    npstring = numpy.string_
+
+
 def nptype(dtype):
     """ converts to numpy types
 
@@ -159,7 +171,7 @@ class NTP(object):
             except IndexError:
                 if hasattr(array, "shape") and len(array.shape) == 0:
                     rank = 0
-                    if type(array) in [numpy.string_, numpy.str_]:
+                    if type(array) in [npstring, numpy.str_]:
                         pythonDType = "str"
                     elif hasattr(array, "dtype"):
                         pythonDType = str(array.dtype)
@@ -170,7 +182,7 @@ class NTP(object):
                     shape.append(len(array))
 
         else:
-            if type(array) in [numpy.string_, numpy.str_]:
+            if type(array) in [npstring, numpy.str_]:
                 pythonDType = "str"
             elif hasattr(array, "dtype"):
                 pythonDType = str(array.dtype)

{nxswriter-3.14.0 → nxswriter-3.16.0/nxswriter.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nxswriter
-Version: 3.14.0
+Version: 3.16.0
 Summary: Nexus Data writer implemented as a Tango Server
 Home-page: https://github.com/nexdatas/nxsdatawriter
 Author: Jan Kotanski, Eugen Wintersberger , Halil Pasic
@@ -23,6 +23,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 
 Welcome to NXSDataWriter's documentation!
 =========================================
@@ -90,7 +91,7 @@ Extract sources and run
 Debian packages
 """""""""""""""
 
-Debian `bookworm`, `bullseye`, `buster`  or Ubuntu `oracular`,  `noble`, `jammy`  packages can be found in the HDRI repository.
+Debian `bookworm`, `bullseye`, `buster`  or Ubuntu `plucky`,  `noble`, `jammy`  packages can be found in the HDRI repository.
 
 To install the debian packages, add the PGP repository key
 

{nxswriter-3.14.0 → nxswriter-3.16.0}/setup.py

@@ -121,6 +121,7 @@ SETUPDATA = dict(
         'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: 3.11',
         'Programming Language :: Python :: 3.12',
+        'Programming Language :: Python :: 3.13',
     ],
     install_requires=install_requires,
     scripts=['NXSDataWriter', 'nxsfromxml'],

{nxswriter-3.14.0 → nxswriter-3.16.0}/test/Checkers.py

@@ -37,6 +37,18 @@ else:
     bytes = str
 
 
+try:
+    _npver = numpy.version.version.split(".")
+    NPMAJOR = int(_npver[0])
+    if NPMAJOR > 1:
+        npstring = numpy.bytes_
+    else:
+        npstring = numpy.string_
+except Exception:
+    NPMAJOR = 1
+    npstring = numpy.string_
+
+
 # checks for scalar attributes
 class Checker(object):
 
@@ -237,7 +249,7 @@ class Checker(object):
                     self._tc.assertEqual(values, value)
             else:
                 self._tc.assertEqual(values, value)
-        if not isinstance(cnt[...], numpy.string_) and \
+        if not isinstance(cnt[...], npstring) and \
            self._isNumeric(cnt[...]) and \
            not (isinstance(cnt[...], numpy.ndarray) and
                 (str(cnt[...].dtype).startswith("|S"))):