nxswriter 3.14.0__tar.gz → 3.15.0__tar.gz

{nxswriter-3.14.0 → nxswriter-3.15.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.15.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.15.0}/ChangeLog

@@ -1,5 +1,10 @@
 2025-03-28 Jan Kotanski <jankotan@gmail.com>
-	* add support for vds (#180)
+	* 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.15.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nxswriter
-Version: 3.14.0
+Version: 3.15.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.15.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.15.0}/man/nxswriter.1

@@ -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

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

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

{nxswriter-3.14.0 → nxswriter-3.15.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.15.0/nxswriter.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nxswriter
-Version: 3.14.0
+Version: 3.15.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.15.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.15.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"))):