nxswriter 3.8.1__tar.gz → 3.9.0__tar.gz

{nxswriter-3.8.1 → nxswriter-3.9.0}/.ci/install.sh

@@ -1,12 +1,12 @@
 #!/usr/bin/env bash
 
 # restart mysqldb
-if [ "$1" = "debian11" ]; then
+if [ "$1" = "debian11" ] || [ "$1" = "debian12" ]; then
     docker exec --user root ndts service mariadb restart
 else
     # workaround for a bug in debian9, i.e. starting mysql hangs
     docker exec --user root ndts service mysql stop
-    if [ "$1" = "ubuntu20.04" ] || [ "$1" = "ubuntu20.10" ] || [ "$1" = "ubuntu21.04" ] || [ "$1" = "ubuntu22.04" ]; then
+    if [ "$1" = "ubuntu20.04" ] || [ "$1" = "ubuntu20.10" ] || [ "$1" = "ubuntu21.04" ] || [ "$1" = "ubuntu22.04" ] || [ "$1" = "ubuntu23.04" ]; then
 	# docker exec --user root ndts /bin/bash -c 'mkdir -p /var/lib/mysql'
 	# docker exec --user root ndts /bin/bash -c 'chown mysql:mysql /var/lib/mysql'
 	docker exec --user root ndts /bin/bash -c 'usermod -d /var/lib/mysql/ mysql'
@@ -23,7 +23,7 @@ if [ "$?" != "0" ]; then exit 255; fi
 docker exec --user root ndts /bin/bash -c 'export DEBIAN_FRONTEND=noninteractive; apt-get -qq update; apt-get -qq install -y   tango-db tango-common; sleep 10'
 if [ "$?" != "0" ]; then exit 255; fi
 
-if [ "$1" = "ubuntu20.04" ] || [ "$1" = "ubuntu20.10" ] || [ "$1" = "ubuntu21.04" ] || [ "$1" = "ubuntu21.10" ] || [ "$1" = "ubuntu22.04" ]; then
+if [ "$1" = "ubuntu20.04" ] || [ "$1" = "ubuntu20.10" ] || [ "$1" = "ubuntu21.04" ] || [ "$1" = "ubuntu21.10" ] || [ "$1" = "ubuntu22.04" ] || [ "$1" = "ubuntu23.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=tango\nhost=127.0.0.1\npassword=rootpw" > /var/lib/tango/.my.cnf'
     docker exec  --user root ndts /bin/bash -c 'echo -e "[client]\nuser=root\npassword=rootpw" > /root/.my.cnf'
@@ -43,7 +43,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" = "ubuntu22.04" ] || [ "$1" = "debian11" ]; then
+    if [ "$1" = "ubuntu20.04" ] || [ "$1" = "ubuntu20.10" ] || [ "$1" = "ubuntu21.04" ] || [ "$1" = "ubuntu23.04" ] || [ "$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.9.0/.ci/run.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+if [ "$2" = "2" ]; then
+    echo "run python-nxswriter tests"
+    docker exec ndts python test
+else
+    echo "run python3-nxswriter tests"
+    docker exec ndts python3 -m pytest
+fi    
+if [ "$?" != "0" ]; then exit 255; fi

{nxswriter-3.8.1 → nxswriter-3.9.0}/.github/workflows/tests.yml

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

{nxswriter-3.8.1 → nxswriter-3.9.0}/ChangeLog

@@ -1,3 +1,11 @@
+2023-10-11 Jan Kotanski <jankotan@gmail.com>
+	* add support for a filter tag (#154)
+	* tagged as 3.9.0
+
+2023-05-24 Jan Kotanski <jankotan@gmail.com>
+	* add support for ':/' in the link target (#147)
+	* tagged as 3.8.2
+
 2023-03-07 Jan Kotanski <jankotan@gmail.com>
 	* add timestamps to stderr and stdout logs (#142)
 	* tagged as 3.8.1

{nxswriter-3.8.1 → nxswriter-3.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: nxswriter
-Version: 3.8.1
+Version: 3.9.0
 Summary: Nexus Data writer implemented as a Tango Server
 Home-page: https://github.com/nexdatas/nxsdatawriter
 Author: Jan Kotanski, Eugen Wintersberger , Halil Pasic
@@ -72,7 +72,7 @@ Description: Welcome to NXSDataWriter's documentation!
         Debian packages
         """""""""""""""
         
-        Debian `bullseye`, `buster`, `stretch`  or Ubuntu `focal`, `bionic` packages can be found in the HDRI repository.
+        Debian `bookworm`, `bullseye`, `buster`  or Ubuntu `lunar`, `jammy`, `focal`  packages can be found in the HDRI repository.
         
         To install the debian packages, add the PGP repository key
         
@@ -87,7 +87,7 @@ Description: Welcome to NXSDataWriter's documentation!
         .. code-block:: console
         
         	  $ cd /etc/apt/sources.list.d
-        	  $ wget http://repos.pni-hdri.de/bullseye-pni-hdri.list
+        	  $ wget http://repos.pni-hdri.de/bookworm-pni-hdri.list
         
         To install tango server
         

{nxswriter-3.8.1 → nxswriter-3.9.0}/README.rst

@@ -64,7 +64,7 @@ Extract sources and run
 Debian packages
 """""""""""""""
 
-Debian `bullseye`, `buster`, `stretch`  or Ubuntu `focal`, `bionic` packages can be found in the HDRI repository.
+Debian `bookworm`, `bullseye`, `buster`  or Ubuntu `lunar`, `jammy`, `focal`  packages can be found in the HDRI repository.
 
 To install the debian packages, add the PGP repository key
 
@@ -79,7 +79,7 @@ and then download the corresponding source list
 .. code-block:: console
 
 	  $ cd /etc/apt/sources.list.d
-	  $ wget http://repos.pni-hdri.de/bullseye-pni-hdri.list
+	  $ wget http://repos.pni-hdri.de/bookworm-pni-hdri.list
 
 To install tango server
 

{nxswriter-3.8.1 → nxswriter-3.9.0}/man/nxswriter.1

@@ -79,7 +79,7 @@ $ python setup.py install
 .UNINDENT
 .SS Debian packages
 .sp
-Debian \fIbullseye\fP, \fIbuster\fP, \fIstretch\fP  or Ubuntu \fIfocal\fP, \fIbionic\fP packages can be found in the HDRI repository.
+Debian \fIbookworm\fP,  \fIbullseye\fP, \fIbuster\fP  or Ubuntu \fIlunar\fP,  \fIjammy\fP, \fIfocal\fP packages can be found in the HDRI repository.
 .sp
 To install the debian packages, add the PGP repository key
 .INDENT 0.0
@@ -102,7 +102,7 @@ and then download the corresponding source list
 .nf
 .ft C
 $ cd /etc/apt/sources.list.d
-$ wget http://repos.pni\-hdri.de/bullseye\-pni\-hdri.list
+$ wget http://repos.pni\-hdri.de/bookworm\-pni\-hdri.list
 .ft P
 .fi
 .UNINDENT

{nxswriter-3.8.1 → nxswriter-3.9.0}/nxswriter/EAttribute.py

@@ -164,14 +164,11 @@ class EAttribute(FElement):
         nptype = self.h5Object.dtype
         value = ''
 
-        if nptype != "string":
+        if nptype == "bool":
+            value = False
+        elif nptype != "string":
             try:
-                # workaround for bug #5618 in numpy for 1.8 < ver < 1.9.2
-                #
-                if nptype == 'uint64':
-                    value = numpy.iinfo(getattr(numpy, 'int64')).max
-                else:
-                    value = numpy.iinfo(getattr(numpy, nptype)).max
+                value = numpy.iinfo(getattr(numpy, nptype)).max
             except Exception:
                 try:
                     try:

{nxswriter-3.8.1 → nxswriter-3.9.0}/nxswriter/EField.py

@@ -56,6 +56,11 @@ class EField(FElementWithAttr):
         #: (:obj:`dict` <:obj:`str`, :obj:`str`>) \
         #:        shape of the field, i.e. {index: length}
         self.lengths = {}
+        #: (:obj:`dict` <:obj:`int`, \
+        #:        (:obj:`int`, :obj:`str`, :obj:`str`, :obj:`str`) >) \
+        #:        index filter lists, i.e. \
+        #:        {index: (filter_id, name, id, cd_values, availability)}
+        self.filters = {}
         #: (:obj:`bool`) True if field is stored in STEP mode
         self.__extraD = False
         #: (:obj:`str`) strategy, i.e. INIT, STEP, FINAL, POSTRUN
@@ -158,12 +163,41 @@ class EField(FElementWithAttr):
         datafilter = None
         # create Filter
 
-        if self.compression:
+        datafilters = []
+        if (self.compression and self.rate) or self.shuffle:
             datafilter = FileWriter.data_filter(self._lastObject())
-            datafilter.rate = self.rate
-            datafilter.shuffle = self.shuffle
-            datafilter.options = tuple(self.compression_opts)
-            datafilter.filterid = self.compression
+            if (self.compression and self.rate):
+                datafilter.rate = self.rate
+                datafilter.options = tuple(self.compression_opts)
+                datafilter.shuffle = self.shuffle
+                datafilter.filterid = self.compression
+            if self.shuffle:
+                datafilter.shuffle = self.shuffle
+            datafilters.append(datafilter)
+        if self.filters:
+            mindex = max(self.filters.keys())
+            for ind in range(mindex):
+                if ind in self.filters:
+                    (filter_id, fname, cd_values, availability) = \
+                        self.filters[ind]
+                    datafilter = FileWriter.data_filter(self._lastObject())
+
+                    datafilter.name = fname
+                    datafilter.filterid = filter_id
+                    datafilter.availability = availability
+                    try:
+                        if cd_values:
+                            options = [int(vl) for vl in cd_values.split(",")]
+                            datafilter.options = tuple(options)
+                    except Exception:
+                        if self._streams:
+                            self._streams.error(
+                                "EField::__createObject() - "
+                                "Wrong filter cd_values ",
+                                std=False)
+
+                            raise Exception("Wrong filter cd_values")
+                    datafilters.append(datafilter)
 
         if sys.version_info < (3,):
             name = name.encode()
@@ -193,9 +227,9 @@ class EField(FElementWithAttr):
                         mshape = [1]
                     else:
                         mshape = [0]
-                    if datafilter:
+                    if datafilters:
                         f = self._lastObject().create_field(
-                            name, dtype, mshape, [1], datafilter)
+                            name, dtype, mshape, [1], datafilters)
                     else:
                         f = self._lastObject().create_field(
                             name, dtype, mshape, [1])
@@ -605,12 +639,7 @@ class EField(FElementWithAttr):
             value = False
         elif nptype != "string":
             try:
-                # workaround for bug #5618 in numpy for 1.8 < ver < 1.9.2
-                #
-                if nptype == 'uint64':
-                    value = numpy.iinfo(getattr(numpy, 'int64')).max
-                else:
-                    value = numpy.iinfo(getattr(numpy, nptype)).max
+                value = numpy.iinfo(getattr(numpy, nptype)).max
             except Exception:
                 try:
                     try:

{nxswriter-3.8.1 → nxswriter-3.9.0}/nxswriter/ELink.py

@@ -165,7 +165,7 @@ class ELink(FElement):
             else:
                 target = ("".join(self.content)).strip().encode()
         if target is not None:
-            if '://' not in str(target) \
+            if ':/' not in str(target) \
                and self.__groupTypes is not None and \
                self.__groupTypes() is not None:
                 if sys.version_info > (3,):

{nxswriter-3.8.1 → nxswriter-3.9.0}/nxswriter/EStrategy.py

@@ -76,9 +76,9 @@ class EStrategy(Element):
                         self.last.rate = 0
                     if self.last.rate > 9:
                         self.last.rate = 9
-                if "shuffle" in attrs.keys() and hasattr(self.last, "shuffle"):
-                    self.last.shuffle = False \
-                        if attrs["shuffle"].upper() == "FALSE" else True
+            if "shuffle" in attrs.keys() and hasattr(self.last, "shuffle"):
+                self.last.shuffle = False \
+                    if attrs["shuffle"].upper() == "FALSE" else True
 
     def store(self, xml=None, globalJSON=None):
         """ stores the tag content

{nxswriter-3.8.1 → nxswriter-3.9.0}/nxswriter/H5Elements.py

@@ -171,3 +171,49 @@ class EDim(Element):
                 if dh:
                     self._beforeLast().lengths[self.__index] = str(
                         dh.cast("string"))
+
+
+class EFilter(Element):
+
+    """ filter tag element
+    """
+
+    def __init__(self, attrs, last, streams=None):
+        """ constructor
+
+        :param attrs: dictionary of the tag attributes
+        :type attrs: :obj:`dict` <:obj:`str`, :obj:`str`>
+        :param last: the last element from the stack
+        :type last: :class:`nxswriter.Element.Element`
+        :param streams: tango-like steamset class
+        :type streams: :class:`StreamSet` or :class:`tango.Device_4Impl`
+        """
+        Element.__init__(self, "filter", attrs, last, streams=streams)
+        index = 0
+        try:
+            if ("index" in attrs.keys()):
+                index = int(attrs["index"])
+        except Exception:
+            pass
+        try:
+            filter_id = int(attrs["id"])
+        except Exception:
+            filter_id = 0
+        try:
+            name = attrs["name"]
+        except Exception:
+            name = ""
+        try:
+            cd_values = attrs["cd_values"]
+        except Exception:
+            cd_values = ""
+        try:
+            availability = attrs["availability"]
+        except Exception:
+            availability = ""
+
+        if filter_id or name:
+            self._beforeLast().filters[index] = (
+                filter_id, name, cd_values, availability)
+        #: (:obj:`int`) index attribute
+        self.__index = index

{nxswriter-3.8.1 → nxswriter-3.9.0}/nxswriter/NexusXMLHandler.py

@@ -32,7 +32,7 @@ from .EAttribute import EAttribute
 from .EStrategy import EStrategy
 from .ELink import ELink
 from .H5Elements import (
-    EDoc, ESymbol, EDimensions, EDim, EFile)
+    EDoc, ESymbol, EDimensions, EDim, EFile, EFilter)
 from .DataSourceFactory import DataSourceFactory
 from .ThreadPool import ThreadPool
 from .InnerXMLParser import InnerXMLHandler
@@ -121,7 +121,7 @@ class NexusXMLHandler(sax.ContentHandler):
             'symbols': Element, 'symbol': ESymbol,
             'dimensions': EDimensions, 'dim': EDim,
             'enumeration': Element, 'item': Element,
-            'strategy': EStrategy
+            'strategy': EStrategy, 'filter': EFilter
         }
 
         #: (:obj:`list` <:obj:`dict` <:obj:`str`, :obj:`str` > >) \

{nxswriter-3.8.1 → nxswriter-3.9.0}/nxswriter/Release.py

@@ -21,4 +21,4 @@
 
 
 #: package version
-__version__ = "3.8.1"
+__version__ = "3.9.0"

{nxswriter-3.8.1 → nxswriter-3.9.0}/nxswriter.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: nxswriter
-Version: 3.8.1
+Version: 3.9.0
 Summary: Nexus Data writer implemented as a Tango Server
 Home-page: https://github.com/nexdatas/nxsdatawriter
 Author: Jan Kotanski, Eugen Wintersberger , Halil Pasic
@@ -72,7 +72,7 @@ Description: Welcome to NXSDataWriter's documentation!
         Debian packages
         """""""""""""""
         
-        Debian `bullseye`, `buster`, `stretch`  or Ubuntu `focal`, `bionic` packages can be found in the HDRI repository.
+        Debian `bookworm`, `bullseye`, `buster`  or Ubuntu `lunar`, `jammy`, `focal`  packages can be found in the HDRI repository.
         
         To install the debian packages, add the PGP repository key
         
@@ -87,7 +87,7 @@ Description: Welcome to NXSDataWriter's documentation!
         .. code-block:: console
         
         	  $ cd /etc/apt/sources.list.d
-        	  $ wget http://repos.pni-hdri.de/bullseye-pni-hdri.list
+        	  $ wget http://repos.pni-hdri.de/bookworm-pni-hdri.list
         
         To install tango server
         

{nxswriter-3.8.1 → nxswriter-3.9.0}/nxswriter.egg-info/requires.txt

@@ -1,6 +1,4 @@
-fabio
-h5py
 lxml
 numpy>1.6.0
-nxstools
+nxstools>=3.50.0
 pytz

{nxswriter-3.8.1 → nxswriter-3.9.0}/setup.py

@@ -74,12 +74,12 @@ class TestCommand(Command):
 
 #: required python packages
 install_requires = [
-    'h5py',
     'pytz',
-    'numpy>1.6.0',
     'lxml',
-    'fabio',
-    'nxstools',  # '>=3.30.0'
+    'numpy>1.6.0',
+    # 'fabio',
+    'nxstools>=3.50.0',
+    # 'h5py',
     # 'pymysqldb',
     # 'psycopg2-binary'
     # 'psycopg2'

{nxswriter-3.8.1 → nxswriter-3.9.0}/test/Checkers.py

@@ -419,7 +419,7 @@ class Checker(object):
             #            if self._isNumeric(cnt[i]):
             if self._isNumeric(cv):
                 if nxtype == "NX_BOOLEAN":
-                    #    print "BOOL: ", values[i] ,cnt[i]
+                    # print( "BOOL: ", values[i] ,cnt[i])
                     self._tc.assertEqual(
                         Types.Converters.toBool(values[i]), cnt[i])
                 else:

{nxswriter-3.8.1 → nxswriter-3.9.0}/test/ClientFieldTagWriterH5Cpp_test.py

@@ -319,7 +319,7 @@ class ClientFieldTagWriterH5CppTest(unittest.TestCase):
         self._sc.checkScalarField(
             det, "ucounter64_canfail", "uint64", "NX_UINT64",
             [self._counter[i] if not i % 2 else
-             numpy.iinfo(getattr(numpy, 'int64')).max
+             numpy.iinfo(getattr(numpy, 'uint64')).max
              for i in range(len(self._counter))],
             attrs={
                 "type": "NX_UINT64", "units": "m", "nexdatas_source": None,
@@ -1736,14 +1736,14 @@ class ClientFieldTagWriterH5CppTest(unittest.TestCase):
 
         self._sc.checkSpectrumAttribute(
             det, "spectrum_uint64_canfail", "uint64",
-            [numpy.iinfo(getattr(numpy, 'int64')).max] * 1024)
+            [numpy.iinfo(getattr(numpy, 'uint64')).max] * 1024)
         self._sc.checkSpectrumAttribute(
             det, "spectrum_bool_canfail", "bool",
             [False] * 8)
 
         self._sc.checkSpectrumAttribute(
             field, "final_spectrum_uint64_canfail", "uint64",
-            [numpy.iinfo(getattr(numpy, 'int64')).max] * 256)
+            [numpy.iinfo(getattr(numpy, 'uint64')).max] * 256)
         self._sc.checkSpectrumAttribute(
             field, "init_spectrum_bool_canfail", "bool",
             [False] * 8)
@@ -2020,7 +2020,7 @@ class ClientFieldTagWriterH5CppTest(unittest.TestCase):
 
         self._sc.checkSingleImageField(
             det, "final_pco_uint_canfail", "uint64", "NX_UINT",
-            [[numpy.iinfo(getattr(numpy, 'int64')).max for el in rpco]
+            [[numpy.iinfo(getattr(numpy, 'uint64')).max for el in rpco]
              for rpco in self._pco1[0]],
             attrs={"type": "NX_UINT", "units": "", "nexdatas_source": None,
                    "nexdatas_strategy": "FINAL", "nexdatas_canfail": "FAILED",
@@ -2826,7 +2826,7 @@ canfail="true"/>
 
         self._sc.checkImageAttribute(
             field, "image_uint64_canfail", "uint64",
-            [[numpy.iinfo(getattr(numpy, 'int64')).max] *
+            [[numpy.iinfo(getattr(numpy, 'uint64')).max] *
              len(self._pco1[0][0])] * len(self._pco1[0]))
         self._sc.checkImageAttribute(
             field, "image_bool_canfail", "bool",

{nxswriter-3.8.1 → nxswriter-3.9.0}/test/ClientFieldTagWriterH5PY_test.py

@@ -311,7 +311,7 @@ class ClientFieldTagWriterH5PYTest(unittest.TestCase):
         self._sc.checkScalarField(
             det, "ucounter64_canfail", "uint64", "NX_UINT64",
             [self._counter[i] if not i % 2 else
-             numpy.iinfo(getattr(numpy, 'int64')).max
+             numpy.iinfo(getattr(numpy, 'uint64')).max
              for i in range(len(self._counter))],
             attrs={
                 "type": "NX_UINT64", "units": "m", "nexdatas_source": None,
@@ -1714,13 +1714,13 @@ class ClientFieldTagWriterH5PYTest(unittest.TestCase):
 
         self._sc.checkSpectrumAttribute(
             det, "spectrum_uint64_canfail", "uint64",
-            [numpy.iinfo(getattr(numpy, 'int64')).max] * 1024)
+            [numpy.iinfo(getattr(numpy, 'uint64')).max] * 1024)
         self._sc.checkSpectrumAttribute(det, "spectrum_bool_canfail", "bool",
                                         [False] * 8)
 
         self._sc.checkSpectrumAttribute(
             field, "final_spectrum_uint64_canfail", "uint64",
-            [numpy.iinfo(getattr(numpy, 'int64')).max] * 256)
+            [numpy.iinfo(getattr(numpy, 'uint64')).max] * 256)
         self._sc.checkSpectrumAttribute(
             field, "init_spectrum_bool_canfail", "bool",
             [False] * 8)
@@ -1996,7 +1996,7 @@ class ClientFieldTagWriterH5PYTest(unittest.TestCase):
 
         self._sc.checkSingleImageField(
             det, "final_pco_uint_canfail", "uint64", "NX_UINT",
-            [[numpy.iinfo(getattr(numpy, 'int64')).max for el in rpco]
+            [[numpy.iinfo(getattr(numpy, 'uint64')).max for el in rpco]
              for rpco in self._pco1[0]],
             attrs={"type": "NX_UINT", "units": "", "nexdatas_source": None,
                    "nexdatas_strategy": "FINAL",
@@ -2800,7 +2800,7 @@ class ClientFieldTagWriterH5PYTest(unittest.TestCase):
 
         self._sc.checkImageAttribute(
             field, "image_uint64_canfail", "uint64",
-            [[numpy.iinfo(getattr(numpy, 'int64')).max] *
+            [[numpy.iinfo(getattr(numpy, 'uint64')).max] *
              len(self._pco1[0][0])] * len(self._pco1[0]))
         self._sc.checkImageAttribute(
             field, "image_bool_canfail", "bool",

{nxswriter-3.8.1 → nxswriter-3.9.0}/test/DBFieldTagWriterH5Cpp_test.py

@@ -737,7 +737,7 @@ class DBFieldTagWriterH5CppTest(unittest.TestCase):
                    "nexdatas_canfail_error": None})
         self._sc.checkScalarField(
             det, "pid_scalar_uint", "uint64", "NX_UINT", [
-                numpy.iinfo(getattr(numpy, 'int64')).max] * 3,
+                numpy.iinfo(getattr(numpy, 'uint64')).max] * 3,
             attrs={"type": "NX_UINT", "units": "m", "nexdatas_source": None,
                    "nexdatas_strategy": "STEP", "nexdatas_canfail": "FAILED",
                    "nexdatas_canfail_error": None})
@@ -2418,7 +2418,7 @@ class DBFieldTagWriterH5CppTest(unittest.TestCase):
         self._sc.checkImageField(
             det, "pid_image_uint", "uint64", "NX_UINT",
             [[[numpy.iinfo(
-                getattr(numpy, 'int64')).max]]] * 3,
+                getattr(numpy, 'uint64')).max]]] * 3,
             attrs={
                 "type": "NX_UINT", "units": "", "nexdatas_source": None,
                 "nexdatas_strategy": "STEP", "nexdatas_canfail": "FAILED",

{nxswriter-3.8.1 → nxswriter-3.9.0}/test/DBFieldTagWriterH5PY_test.py

@@ -738,7 +738,7 @@ $mycnf/>
                    "nexdatas_canfail_error": None})
         self._sc.checkScalarField(
             det, "pid_scalar_uint", "uint64", "NX_UINT", [
-                numpy.iinfo(getattr(numpy, 'int64')).max] * 3,
+                numpy.iinfo(getattr(numpy, 'uint64')).max] * 3,
             attrs={"type": "NX_UINT", "units": "m", "nexdatas_source": None,
                    "nexdatas_strategy": "STEP", "nexdatas_canfail": "FAILED",
                    "nexdatas_canfail_error": None})
@@ -2424,7 +2424,7 @@ $mycnf/>
 
         self._sc.checkImageField(
             det, "pid_image_uint", "uint64", "NX_UINT",
-            [[[numpy.iinfo(getattr(numpy, 'int64')).max]]] * 3,
+            [[[numpy.iinfo(getattr(numpy, 'uint64')).max]]] * 3,
             attrs={
                 "type": "NX_UINT", "units": "", "nexdatas_source": None,
                 "nexdatas_strategy": "STEP", "nexdatas_canfail": "FAILED",

{nxswriter-3.8.1 → nxswriter-3.9.0}/test/DataHolder_test.py

@@ -145,7 +145,7 @@ class DataHolderTest(unittest.TestCase):
             "ScalarLong64": ["int64", "DevLong64", 234],
             "ScalarULong64": ["uint64", "DevULong64", 23],
             "ScalarFloat": ["float32", "DevFloat", 12.234, 1e-5],
-            "ScalarDouble": ["float64", "DevDouble", -2.456673e+02, 1e-14],
+            "ScalarDouble": ["float64", "DevDouble", -2.456673e+01, 1e-14],
             "ScalarString": ["string", "DevString", "MyTrue"],
             # "State":[ "string", "DevState", tango._tango.DevState.ON],
         }
@@ -388,8 +388,8 @@ class DataHolderTest(unittest.TestCase):
         }
 
         arrs["i"] = {
-            "ScalarShort": ["int16", "DevShort", -123],
-            "ScalarLong": ["int64", "DevLong", -124],
+            "ScalarShort": ["int16", "DevShort", 123],
+            "ScalarLong": ["int64", "DevLong", 124],
             "ScalarLong64": ["int64", "DevLong64", 234],
         }
 
@@ -402,7 +402,7 @@ class DataHolderTest(unittest.TestCase):
 
         arrs["f"] = {
             "ScalarFloat": ["float32", "DevFloat", 12.234, 1e-5],
-            "ScalarDouble": ["float64", "DevDouble", -2.456673e+02, 1e-14],
+            "ScalarDouble": ["float64", "DevDouble", 2.456673e+02, 1e-14],
         }
 
         arrs["s"] = {
@@ -547,13 +547,13 @@ class DataHolderTest(unittest.TestCase):
         }
 
         arrs["i"] = {
-            "SpectrumShort": ["int16", "DevShort", -13, [1, 0]],
-            "SpectrumLong": ["int64", "DevLong", -14, [1, 0]],
-            "SpectrumLong64": ["int64", "DevLong64", -24, [1, 0]],
+            "SpectrumShort": ["int16", "DevShort", 3, [1, 0]],
+            "SpectrumLong": ["int64", "DevLong", 4, [1, 0]],
+            "SpectrumLong64": ["int64", "DevLong64", 4, [1, 0]],
         }
 
         arrs["u"] = {
-            "SpectrumUChar": ["uint8", "DevUChar", 23, [1, 0]],
+            "SpectrumUChar": ["uint8", "DevUChar", 3, [1, 0]],
             "SpectrumULong": ["uint64", "DevULong", 2, [1, 0]],
             "SpectrumUShort": ["uint16", "DevUShort", 1, [1, 0]],
             "SpectrumULong64": ["uint64", "DevULong64", 3, [1, 0]],
@@ -561,7 +561,7 @@ class DataHolderTest(unittest.TestCase):
 
         arrs["f"] = {
             "SpectrumFloat": ["float32", "DevFloat", 12.234, [1, 0], 1e-5],
-            "SpectrumDouble": ["float64", "DevDouble", -2.456673e+02, [1, 0],
+            "SpectrumDouble": ["float64", "DevDouble", 2.156673e+01, [1, 0],
                                1e-14],
         }
 
@@ -596,7 +596,7 @@ class DataHolderTest(unittest.TestCase):
                     mlen = [
                         self.__rnd.randint(1, 10), self.__rnd.randint(0, 3)]
                     arr[k][2] = [
-                        arr[k][2] * self.__rnd.randint(1, 3)
+                        arr[k][2] * self.__rnd.randint(1, 2)
                         for c in range(mlen[0])]
                 else:
                     mlen = [self.__rnd.randint(1, 10)]
@@ -654,13 +654,13 @@ class DataHolderTest(unittest.TestCase):
         }
 
         arrs["i"] = {
-            "SpectrumShort": ["int16", "DevShort", -13, [1, 0]],
-            "SpectrumLong": ["int64", "DevLong", -14, [1, 0]],
-            "SpectrumLong64": ["int64", "DevLong64", -24, [1, 0]],
+            "SpectrumShort": ["int16", "DevShort", 3, [1, 0]],
+            "SpectrumLong": ["int64", "DevLong", 4, [1, 0]],
+            "SpectrumLong64": ["int64", "DevLong64", 5, [1, 0]],
         }
 
         arrs["u"] = {
-            "SpectrumUChar": ["uint8", "DevUChar", 23, [1, 0]],
+            "SpectrumUChar": ["uint8", "DevUChar", 7, [1, 0]],
             "SpectrumULong": ["uint64", "DevULong", 2, [1, 0]],
             "SpectrumUShort": ["uint16", "DevUShort", 1, [1, 0]],
             "SpectrumULong64": ["uint64", "DevULong64", 3, [1, 0]],
@@ -668,7 +668,7 @@ class DataHolderTest(unittest.TestCase):
 
         arrs["f"] = {
             "SpectrumFloat": ["float32", "DevFloat", 12.234, [1, 0], 1e-5],
-            "SpectrumDouble": ["float64", "DevDouble", -2.456673e+02, [1, 0],
+            "SpectrumDouble": ["float64", "DevDouble", 2.456673e+01, [1, 0],
                                1e-14],
         }
 
@@ -703,7 +703,7 @@ class DataHolderTest(unittest.TestCase):
                 mlen = [self.__rnd.randint(1, 10), self.__rnd.randint(
                     1, 10), self.__rnd.randint(0, 3)]
                 if arr[k][1] != "DevBoolean":
-                    arr[k][2] = [[arr[k][2] * self.__rnd.randint(0, 3)
+                    arr[k][2] = [[arr[k][2] * self.__rnd.randint(0, 2)
                                   for r in range(mlen[1])]
                                  for c in range(mlen[0])]
                 else: