merge develop

.ci/install.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # restart mysqldb
-if [ "$1" = "debian11" ] || [ "$1" = "debian12" ] || [ "$1" = "ubuntu24.04" ]; then
+if [ "$1" = "debian11" ] || [ "$1" = "debian12" ] || [ "$1" = "ubuntu24.10" ] || [ "$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" ]; then
+if  [ "$1" = "ubuntu24.04" ] || [ "$1" = "ubuntu24.10" ]; 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" ]; then
+if  [ "$1" = "ubuntu24.04" ] || [ "$1" = "ubuntu24.10" ]; 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" = "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" = "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'

.ci/ubuntu24.10_py3/Dockerfile

@@ -0,0 +1,38 @@
+FROM ubuntu:24.10
+
+MAINTAINER DESY, Jan Kotanski <[email protected]>
+
+RUN apt-get -qq update && export DEBIAN_FRONTEND=noninteractive && apt-get install -y  curl gpg-agent mariadb-client python3-h5py python3-sphinx apt-utils debconf-utils net-tools  omniidl libomniorb4-dev libcos4-dev libzmq3-dev python3-setuptools libterm-readline-gnu-perl software-properties-common coreutils procps  apt-transport-https gnupg2 ca-certificates wget python3-h5py python3-sphinx apt-utils debconf-utils net-tools  omniidl libomniorb4-dev libcos4-dev libzmq3-dev python3-setuptools python3-lxml  liblog4j1.2-java python3-setuptools python3-pytest 
+# hdf5-plugin-bshuf hdf5-plugin-bz2 hdf5-plugin-lz4
+
+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
+RUN chmod 644 /etc/apt/trusted.gpg.d/debian-hdri-repo.gpg
+RUN cd /etc/apt/sources.list.d && wget http://repos.pni-hdri.de/oracular-pni-hdri.list \
+    && useradd -ms /bin/bash tango
+
+
+RUN apt-get -qq update && export DEBIAN_FRONTEND=noninteractive && apt-get install -y   python3-pninexus  bitshuffle-serial-links hdf5-filter-plugin-serial-links  liblog4j1.2-java python3-tz python3-setuptools  python3-h5py
+
+RUN  /bin/bash -c 'export DEBIAN_FRONTEND=noninteractive; debconf-set-selections <<< "mariadb-server mysql-server/root_password password rootpw"' \
+     && /bin/bash -c 'export DEBIAN_FRONTEND=noninteractive; debconf-set-selections <<< "mariadb-server mysql-server/root_password_again password rootpw"' \
+     && apt-get -qq update && apt-get -qq install -y mariadb-server python3-mysqldb  dialog \
+     &&  /bin/bash -c 'sleep 10'
+RUN /bin/bash -c 'export DEBIAN_FRONTEND=noninteractive; debconf-set-selections <<< "tango-db tango-db/db/app-user string tango"'  \
+     && /bin/bash -c 'export DEBIAN_FRONTEND=noninteractive; debconf-set-selections <<< "tango-db tango-db/mysql/app-pass	password rootpw"' \
+     && /bin/bash -c 'export DEBIAN_FRONTEND=noninteractive; debconf-set-selections <<< "tango-db tango-db/mysql/admin-pass password rootpw"' \
+     && /bin/bash -c 'export DEBIAN_FRONTEND=noninteractive; debconf-set-selections <<< "tango-db tango-db/password-confirm password rootpw"' \
+     && /bin/bash -c 'export DEBIAN_FRONTEND=noninteractive; debconf-set-selections <<< "tango-db tango-db/app-password-confirm password rootpw"' \
+     && /bin/bash -c 'export DEBIAN_FRONTEND=noninteractive; debconf-set-selections <<< "nxsconfigserver-db nxsconfigserver-db/mysql/app-pass password rootpw"' \
+     && /bin/bash -c 'export DEBIAN_FRONTEND=noninteractive; debconf-set-selections <<< "nxsconfigserver-db nxsconfigserver-db/mysql/admin-pass password rootpw"' \
+     && /bin/bash -c 'export DEBIAN_FRONTEND=noninteractive; debconf-set-selections <<< "nxsconfigserver-db nxsconfigserver-db/app-password-confirm password rootpw"' \
+     && /bin/bash -c 'export DEBIAN_FRONTEND=noninteractive; debconf-set-selections <<< "nxsconfigserver-db nxsconfigserver-db/db/app-user string tango"' \
+     && sed -i "s/\[mysql\]/\[mysqld\]\nsql_mode = NO_ZERO_IN_DATE,NO_ENGINE_SUBSTITUTION\ncharacter-set-collations = latin1=latin1_swedish_ci\ncharacter-set-server=latin1\n\[mysql\]/g" /etc/mysql/conf.d/mysql.cnf
+
+ENV PKG_CONFIG_PATH=/home/tango/lib/pkgconfig
+# ENV HDF5_PLUGIN_PATH=/usr/lib/x86_64-linux-gnu/hdf5/serial/plugins
+
+ENV MYSQL_HOST=localhost
+USER tango
+WORKDIR /home/tango
+

.github/workflows/tests.yml

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

README.rst

@@ -59,12 +59,12 @@ Extract sources and run
 
 .. code-block:: console
 
-	  $ python setup.py install
+	  $ python3 setup.py install
 
 Debian packages
 """""""""""""""
 
-Debian `bookworm`, `bullseye`, `buster`  or Ubuntu `lunar`, `jammy`, `focal`  packages can be found in the HDRI repository.
+Debian `bookworm`, `bullseye`, `buster`  or Ubuntu `oracular`,  `noble`, `jammy`  packages can be found in the HDRI repository.
 
 To install the debian packages, add the PGP repository key
 
@@ -145,7 +145,7 @@ To set up  NeXus Writer Server run
 
           $ nxsetup -x NXSDataWriter
 
-The *nxsetup* command comes from the **python-nxstools** package.
+The *nxsetup* command comes from the **python3-nxstools** package.
 
 -----------
 Client code

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" "Sep 27, 2024" "3.12" "NXSDataWriter"
+.TH "NXSWRITER" "1" "Nov 07, 2024" "3.12" "NXSDataWriter"
 .SH NAME
 nxswriter \- nxswriter Documentation
 .sp
@@ -72,14 +72,14 @@ Extract sources and run
 .sp
 .nf
 .ft C
-$ python setup.py install
+$ python3 setup.py install
 .ft P
 .fi
 .UNINDENT
 .UNINDENT
 .SS Debian packages
 .sp
-Debian \fIbookworm\fP, \fIbullseye\fP, \fIbuster\fP  or Ubuntu \fIlunar\fP, \fIjammy\fP, \fIfocal\fP  packages can be found in the HDRI repository.
+Debian \fIbookworm\fP, \fIbullseye\fP, \fIbuster\fP  or Ubuntu \fIoracular\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
@@ -208,7 +208,7 @@ $ nxsetup \-x NXSDataWriter
 .UNINDENT
 .UNINDENT
 .sp
-The \fInxsetup\fP command comes from the \fBpython\-nxstools\fP package.
+The \fInxsetup\fP command comes from the \fBpython3\-nxstools\fP package.
 .SH CLIENT CODE
 .sp
 In order to use Nexus Data Server one has to write a client code. Some simple client codes

test/ORACLESource_test.py

@@ -52,9 +52,9 @@
     ordb.close()
 except Exception:
     import pytest
-    if pytest.__version__ < "3.0.0":
-        pytest.skip()
-    else:
+    try:
+        pytest.skip(allow_module_level=True)
+    except Exception:
         pytestmark = pytest.mark.skip
 
 from nxswriter.DBaseSource import DBaseSource