nxswriter 3.16.0__tar.gz → 3.17.0__tar.gz

{nxswriter-3.16.0 → nxswriter-3.17.0}/.ci/debian10_py2/Dockerfile

@@ -1,11 +1,14 @@
 FROM debian:buster
 
-MAINTAINER DESY, Jan Kotanski <jankotan@gmail.com>
+# MAINTAINER DESY, Jan Kotanski <jankotan@gmail.com>
 
 ENV DEBIAN_FRONTEND=noninteractive
 
+# switch to the german archive mirror
+RUN sed -i 's|http://deb.debian.org|http://archive.debian.org|g' /etc/apt/sources.list
+RUN sed -i 's|http://security.debian.org|http://archive.debian.org|g' /etc/apt/sources.list
 # add the HDRI repository
-RUN /bin/bash -c 'echo "deb http://ftp.de.debian.org/debian buster main" > /etc/apt/sources.list.d/debian9de.list'
+# RUN /bin/bash -c 'echo "deb http://ftp.de.debian.org/debian buster main" > /etc/apt/sources.list.d/debian9de.list'
 RUN apt-get -qq update && apt-get -qq install -y libterm-readline-gnu-perl software-properties-common coreutils gnupg2 procps apt-utils curl apt-transport-https gnupg2 ca-certificates wget
 RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
 RUN curl -s http://repos.pni-hdri.de/debian_repo.pub.gpg  | gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/debian-hdri-repo.gpg --import

{nxswriter-3.16.0 → nxswriter-3.17.0}/.ci/debian10_py3/Dockerfile

@@ -1,11 +1,14 @@
 FROM debian:buster
 
-MAINTAINER DESY, Jan Kotanski <jankotan@gmail.com>
+# MAINTAINER DESY, Jan Kotanski <jankotan@gmail.com>
 
 ENV DEBIAN_FRONTEND=noninteractive
 
+# switch to the german archive mirror
+RUN sed -i 's|http://deb.debian.org|http://archive.debian.org|g' /etc/apt/sources.list
+RUN sed -i 's|http://security.debian.org|http://archive.debian.org|g' /etc/apt/sources.list
 # add the HDRI repository
-RUN /bin/bash -c 'echo "deb http://ftp.de.debian.org/debian buster main" > /etc/apt/sources.list.d/debian_de.list'
+# RUN /bin/bash -c 'echo "deb http://ftp.de.debian.org/debian buster main" > /etc/apt/sources.list.d/debian_de.list'
 RUN apt-get -qq update && apt-get -qq install apt-utils dialog -y
 RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
 RUN apt-get -qq update && apt-get -qq install -y libterm-readline-gnu-perl software-properties-common coreutils gnupg2 procps curl apt-transport-https gnupg2 ca-certificates wget

{nxswriter-3.16.0 → nxswriter-3.17.0}/.ci/debian11_py3/Dockerfile

@@ -1,6 +1,6 @@
 FROM debian:bullseye
 
-MAINTAINER DESY, Jan Kotanski <jankotan@gmail.com>
+# MAINTAINER DESY, Jan Kotanski <jankotan@gmail.com>
 
 ENV DEBIAN_FRONTEND=noninteractive
 

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

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # restart mysqldb
-if [ "$1" = "debian11" ] || [ "$1" = "debian12" ] || [ "$1" = "ubuntu24.10" ] || [ "$1" = "ubuntu25.04" ] || [ "$1" = "ubuntu24.04" ]; then
+if [ "$1" = "debian11" ] || [ "$1" = "debian12" ] || [ "$1" = "debian12tg10" ] || [ "$1" = "debian13" ] || [ "$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
@@ -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" = "ubuntu25.04" ] || [ "$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" ] || [ "$1" = "debian12tg10" ] || [ "$1" = "debian13" ] ; 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.16.0 → nxswriter-3.17.0}/.github/workflows/tests.yml

@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        os: [debian12, debian11, debian10, ubuntu25.04, ubuntu24.04, ubuntu22.04]
+        os: [debian13, debian12tg10, debian12, debian11, ubuntu25.04, ubuntu24.04, ubuntu22.04]
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
@@ -49,31 +49,3 @@ jobs:
       - name: Stop the docker
         run: docker container stop ndts
 
-  python2_tests:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        os: [debian10]
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
-      - name: Update bash files
-        run: |
-          chmod +x .ci/run.sh
-          chmod +x .ci/install.sh
-      - name: Build the docker
-        env:
-          OSYS: ${{ matrix.os }}
-        run: docker build -t ndts .ci/${OSYS}_py2
-      - name: Run the docker
-        run: docker run  --name  ndts -d -it -v `pwd`:/home/tango  ndts
-      - name: install tango and nxswriter
-        env:
-          OSYS: ${{ matrix.os }}
-        run: .ci/install.sh ${OSYS} 2
-      - name: run tests
-        env:
-          OSYS: ${{ matrix.os }}
-        run: .ci/run.sh  ${OSYS} 2
-      - name: Stop the docker
-        run: docker container stop ndts

{nxswriter-3.16.0 → nxswriter-3.17.0}/ChangeLog

@@ -1,3 +1,8 @@
+2025-10-13 Jan Kotanski <jankotan@gmail.com>
+	* move the virtual map list to h5rediswriter (#188)
+	* recommends nxstools 4.28.1
+	* tagged as 3.17.0
+
 2025-03-28 Jan Kotanski <jankotan@gmail.com>
 	* add support for DATA_ARRAY v4 (#182)
 	* tagged as 3.16.0

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nxswriter
-Version: 3.16.0
+Version: 3.17.0
 Summary: Nexus Data writer implemented as a Tango Server
 Home-page: https://github.com/nexdatas/nxsdatawriter
 Author: Jan Kotanski, Eugen Wintersberger , Halil Pasic
@@ -91,7 +91,7 @@ Extract sources and run
 Debian packages
 """""""""""""""
 
-Debian `bookworm`, `bullseye`, `buster`  or Ubuntu `plucky`,  `noble`, `jammy`  packages can be found in the HDRI repository.
+Debian `trixie`, `bookworm`, `bullseye`  or Ubuntu `plucky`,  `noble`, `jammy`  packages can be found in the HDRI repository.
 
 To install the debian packages, add the PGP repository key
 
@@ -106,7 +106,7 @@ and then download the corresponding source list
 .. code-block:: console
 
 	  $ cd /etc/apt/sources.list.d
-	  $ wget http://repos.pni-hdri.de/bookworm-pni-hdri.list
+	  $ wget http://repos.pni-hdri.de/trixie-pni-hdri.list
 
 To install tango server
 

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

@@ -64,7 +64,7 @@ Extract sources and run
 Debian packages
 """""""""""""""
 
-Debian `bookworm`, `bullseye`, `buster`  or Ubuntu `plucky`,  `noble`, `jammy`  packages can be found in the HDRI repository.
+Debian `trixie`, `bookworm`, `bullseye`  or Ubuntu `plucky`,  `noble`, `jammy`  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/bookworm-pni-hdri.list
+	  $ wget http://repos.pni-hdri.de/trixie-pni-hdri.list
 
 To install tango server
 

{nxswriter-3.16.0 → nxswriter-3.17.0}/nxswriter/EVirtualField.py

@@ -343,14 +343,15 @@ class EVirtualDataMap(Element):
                 if dt and isinstance(dt, dict):
                     dh = DataHolder(streams=self._streams, **dt)
                     val = dh.cast("string")
-                    self.last.appendVmap(val, self.__vmap)
+                    self.last.appendVmap(val, self.__vmap,
+                                         self.strategy)
 
         except Exception:
             info = sys.exc_info()
             import traceback
-            message = self.setMessage(
-                str(info[1].__str__()) + "\n " + (" ").join(
-                    traceback.format_tb(sys.exc_info()[2])))
+            message = ("Datasource not found: " +
+                       str(info[1].__str__()) + "\n " + (" ").join(
+                           traceback.format_tb(sys.exc_info()[2])))
             # message = self.setMessage(  sys.exc_info()[1].__str__()  )
             del info
             #: notification of error in the run method (defined in base class)
@@ -404,6 +405,9 @@ class EVirtualField(FElementWithAttr):
         self.__shape = []
         #: (:obj:`list` <:obj:`dict` >) vmap list
         self.__vmaps = []
+        #: (:class:`H5CppVirtualFieldLayout`) or
+        #:   (:class:`H5PYVirtualFieldLayout`) virtual field layout
+        self.__vfl = None
 
     def setRank(self, rank):
         """ sets dimension rank
@@ -498,7 +502,10 @@ class EVirtualField(FElementWithAttr):
             lval = val.split("\n")
             for el in lval:
                 if el.strip():
-                    self.__vmaps.append({"target": el.strip()})
+                    if self.__vfl is not None:
+                        self.__vfl.append_vmap({"target": el.strip()})
+                    else:
+                        self.__vmaps.append({"target": el.strip()})
         return self.strategy, self.trigger
 
     def store(self, xml=None, globalJSON=None):
@@ -517,39 +524,14 @@ class EVirtualField(FElementWithAttr):
         self.__dtype, self.__name = self.__typeAndName()
         # shape
         self.__shape = self.__getShape()
+        self.__vfl = FileWriter.virtual_field_layout(
+            self.__shape, self.__dtype)
+        for vmap in self.__vmaps:
+            self.__vfl.append_vmap(vmap)
+        self.__vmaps = []
         return self.__setStrategy(self.__name)
 
-    def __cureKeys(self, key):
-        tkey = []
-        if isinstance(key, list):
-            try:
-                sk = list(set([len(ky) for ky in key]))
-            except Exception:
-                sk = []
-            if len(sk) == 1 and sk[0] == 4:
-                offset = []
-                block = []
-                count = []
-                stride = []
-                for ky in key:
-                    off, bl, cnt, std = ky
-                    offset.append(off)
-                    block.append(bl)
-                    count.append(cnt)
-                    stride.append(std)
-                return FileWriter.FTHyperslab(offset, block, count, stride)
-            for ky in key:
-                if isinstance(ky, list) and len(ky) > 0 and len(ky) < 4:
-                    tkey.append(slice(*ky))
-                else:
-                    if ky is None:
-                        ky = slice(None)
-                    tkey.append(ky)
-
-            return tuple(tkey)
-        return key
-
-    def appendVmap(self, values, base=None):
+    def appendVmap(self, values, base=None, strategy=None):
         """ append virtual map items
 
         :param values: a list of map items to append
@@ -588,94 +570,20 @@ class EVirtualField(FElementWithAttr):
                 fval.update(vl)
             else:
                 fval.update({"target": vl.strip()})
-            self.__vmaps.append(fval)
-        return len(self.__vmaps)
-
-    def __findShape(self, key, eshape=None, unlimited=True):
-        if isinstance(key, FileWriter.FTHyperslab):
-            if not unlimited:
-                count = [(ct if ct != FileWriter.writer.unlimited() else 1)
-                         for ct in key.count]
-
-                block = [(ct if ct != FileWriter.writer.unlimited() else 1)
-                         for ct in key.block]
+            if self.__vfl is not None:
+                self.__vfl.append_vmap(fval, strategy)
             else:
-                count = key.count
-                block = key.block
-            eshape = [bl * count[hi] for hi, bl in enumerate(block)]
-        if isinstance(key, tuple):
-            eshape = []
-            for ky in key:
-                if not unlimited and ky.stop == FileWriter.writer.unlimited():
-                    eshape.append(1)
-                elif isinstance(ky, slice) and ky.stop > 0:
-                    start = ky.start if ky.start is not None else 0
-                    step = ky.step if ky.step is not None else 1
-                    eshape.append((ky.stop - start) // step)
-                else:
-                    eshape.append(1)
-        return eshape
+                self.__vmaps.append(fval)
+        if self.__vfl is not None:
+            return len(self.__vfl)
+        return len(self.__vmaps)
 
     def __createVDS(self):
         """ create the virtual field object
         """
-        vlf = FileWriter.virtual_field_layout(
-            self.__shape, self.__dtype)
-        counter = 0
-        for vmap in self.__vmaps:
-            fieldpath = ""
-            filename = ""
-            edtype = vmap["dtype"] \
-                if "dtype" in vmap else self.__dtype
-            key = vmap["key"] if "key" in vmap else counter
-            key = self.__cureKeys(key)
-            if "shape" in vmap:
-                eshape = vmap["shape"]
-            elif isinstance(key, int):
-                eshape = list(self.__shape)
-                eshape[0] = 1
-            else:
-                eshape = [0] * len(self.__shape)
-            fieldpath = vmap["fieldpath"] \
-                if "fieldpath" in vmap else "/data"
-            filename = vmap["filename"] if "filename" in vmap else None
-            if "target" in vmap:
-                target = vmap["target"]
-                if target.startswith("h5file:/"):
-                    target = target[8:]
-                if "::" in target:
-                    filename, fieldpath = target.split("::")
-                elif ":/" in target:
-                    filename, fieldpath = target.split(":/")
-                else:
-                    fieldpath = target
-            obj = self._lastObject()
-            while filename is None:
-                par = obj.parent
-                if par is None:
-                    break
-                if hasattr(par, "root") and hasattr(par, "name"):
-                    filename = par.name
-                    break
-                else:
-                    obj = par
-            sourceshape = vmap["sourceshape"] \
-                if "sourceshape" in vmap else None
-            sourcekey = vmap["sourcekey"] \
-                if "sourcekey" in vmap else None
-            sourcekey = self.__cureKeys(sourcekey)
-            if not any(eshape):
-                eshape = self.__findShape(key, eshape, unlimited=False)
-            ef = FileWriter.target_field_view(
-                filename, fieldpath, eshape, edtype)
-            if eshape:
-                counter += eshape[0]
-            else:
-                counter += 1
-            # print("KEY", key, sourcekey, sourceshape, eshape)
-            vlf.add(key, ef, sourcekey, sourceshape)
+        self.__vfl.process_target_field_views(self._lastObject())
         self.h5Object = self._lastObject().create_virtual_field(
-            self.__name, vlf)
+            self.__name, self.__vfl)
 
     def run(self):
         """ runner
@@ -693,15 +601,16 @@ class EVirtualField(FElementWithAttr):
             # print("SHaPE", self.__shape)
             # print("TYPE", self.__dtype)
             # print("NAME", self.__name)
-            if self.__vmaps and self.__shape and self.__dtype and self.__name:
+            if self.__vfl is not None and len(self.__vfl) and self.__shape \
+                    and self.__dtype and self.__name:
                 self.__createVDS()
                 self.__setAttributes()
         except Exception:
             info = sys.exc_info()
             import traceback
-            message = self.setMessage(
-                str(info[1].__str__()) + "\n " + (" ").join(
-                    traceback.format_tb(sys.exc_info()[2])))
+            message = ("Datasource not found: " +
+                       str(info[1].__str__()) + "\n " + (" ").join(
+                           traceback.format_tb(sys.exc_info()[2])))
             # message = self.setMessage(  sys.exc_info()[1].__str__()  )
             del info
             #: notification of error in the run method (defined in base class)

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

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nxswriter
-Version: 3.16.0
+Version: 3.17.0
 Summary: Nexus Data writer implemented as a Tango Server
 Home-page: https://github.com/nexdatas/nxsdatawriter
 Author: Jan Kotanski, Eugen Wintersberger , Halil Pasic
@@ -91,7 +91,7 @@ Extract sources and run
 Debian packages
 """""""""""""""
 
-Debian `bookworm`, `bullseye`, `buster`  or Ubuntu `plucky`,  `noble`, `jammy`  packages can be found in the HDRI repository.
+Debian `trixie`, `bookworm`, `bullseye`  or Ubuntu `plucky`,  `noble`, `jammy`  packages can be found in the HDRI repository.
 
 To install the debian packages, add the PGP repository key
 
@@ -106,7 +106,7 @@ and then download the corresponding source list
 .. code-block:: console
 
 	  $ cd /etc/apt/sources.list.d
-	  $ wget http://repos.pni-hdri.de/bookworm-pni-hdri.list
+	  $ wget http://repos.pni-hdri.de/trixie-pni-hdri.list
 
 To install tango server
 

{nxswriter-3.16.0 → nxswriter-3.17.0}/nxswriter.egg-info/requires.txt

@@ -1,4 +1,4 @@
 lxml
 numpy>1.6.0
-nxstools>=3.50.0
+nxstools>=4.28.1
 pytz

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

@@ -78,7 +78,7 @@ install_requires = [
     'lxml',
     'numpy>1.6.0',
     # 'fabio',
-    'nxstools>=3.50.0',
+    'nxstools>=4.28.1',
     # 'h5py',
     # 'pymysqldb',
     # 'psycopg2-binary'