diff --git a/.ci/ubuntu26.10_py3/Dockerfile b/.ci/ubuntu26.10_py3/Dockerfile new file mode 100644 index 0000000..6d4330a --- /dev/null +++ b/.ci/ubuntu26.10_py3/Dockerfile @@ -0,0 +1,45 @@ +FROM ubuntu:26.10 + +# MAINTAINER DESY, Jan Kotanski + +RUN sed -i 's|http://archive|http://de.archive|g' /etc/apt/sources.list.d/ubuntu.sources +RUN apt-get update +RUN apt-get install -y base-passwd 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 gpg-agent + +RUN curl --retry 10 -v -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/stonking-pni-hdri.sources + +RUN apt-get -qq update && export DEBIAN_FRONTEND=noninteractive && apt-get -qq dist-upgrade +RUN apt-get -qq update && export DEBIAN_FRONTEND=noninteractive && apt-get -qq install -y python3-sphinx apt-utils net-tools +RUN apt-get -qq install -y python3-numpy libhdf5-dev libboost-regex-dev libboost-program-options-dev libboost-date-time-dev libblas-dev cython3 python3-setuptools libboost-python-dev python3-numpy-dev g++ python3-h5py +RUN apt-get -qq install -y hdf5-filter-plugin bitshuffle python3-pytest git cmake doxygen python3-sphinx libboost-all-dev python3-pip python3-pip-whl python3-build +RUN apt-get -qq install -y libpninexus3.6.0-dev libpninexus3.6.0 libh5cpp0.8.0-dev libh5cpp0.8.0 +RUN useradd -ms /bin/bash tango + +# # install latest h5cpp +# RUN mkdir -p /opt/h5cpp +# RUN mkdir -p /h5cpp-src +# RUN cd /h5cpp-src && git clone https://github.com/ess-dmsc/h5cpp && mkdir build +# RUN cd /h5cpp-src/build && cmake -DCMAKE_INSTALL_PREFIX=/opt/h5cpp -DCMAKE_BUILD_TYPE=Release -DH5CPP_CONAN=DISABLE -DH5CPP_DISABLE_TESTS=True -DH5CPP_WITH_BOOST=OFF ../h5cpp && make install -j4 +# ENV CPLUS_INCLUDE_PATH=/opt/h5cpp/include +# ENV LD_LIBRARY_PATH=/opt/h5cpp/lib +# ENV H5CPP=/opt/h5cpp/lib/cmake/h5cpp-0.6 +# ENV H5CPP_LOCAL_PATH=/opt/h5cpp +# ENV HDF5_HL_LOCAL_PATH=/usr/lib/x86_64-linux-gnu/hdf5/serial/ + +# # install latest linpninexus +# RUN mkdir -p /opt/libpninexus +# RUN mkdir -p /libpninexus-src +# RUN cd /libpninexus-src && git clone https://github.com/pni-libraries/libpninexus && mkdir build +# # RUN cd /libpninexus-src/build && cmake -Dh5cpp_DIR=$H5CPP -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/opt/h5cpp/ -DPNINEXUS_CONAN=DISABLE ../libpninexus && make -j4 && make install -j4 +# RUN cd /libpninexus-src/build && cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/opt/libpninexus/ -DPNINEXUS_CONAN=DISABLE ../libpninexus && make -j4 && make install -j4 +# ENV CPLUS_INCLUDE_PATH=$CPLUS_INCLUDE_PATH:/opt/libpninexus/include +# ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/libpninexus/lib +# ENV PNINEXUS_LOCAL_PATH=/opt/libpninexus + +ENV PKG_CONFIG_PATH=/home/tango/lib/pkgconfig +USER tango +WORKDIR /home/tango diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index b23ec15..4962c9b 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -71,7 +71,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - os: [debian13, debian12, ubuntu26.04, ubuntu24.04, ubuntu22.04] + os: [debian13, debian12, ubuntu26.10, ubuntu26.04, ubuntu24.04] steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v2 diff --git a/CHANGELOG.md b/CHANGELOG.md index d2af75a..fd122ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,8 @@ # ChangeLog -## 3.6.2 - 2026-10-15 -- add numpy to pyproject.toml file ([#248](https://github.com/pni-libraries/python-pninexus/pull/258) +## 3.X.Y - 2026-XX-YY +- add ububtu 26.10 tests ([#260](https://github.com/pni-libraries/python-pninexus/pull/260) +- add numpy to pyproject.toml file ([#258](https://github.com/pni-libraries/python-pninexus/pull/258) ## 3.6.1 - 2026-10-15 - add pyproject.toml file ([#247](https://github.com/pni-libraries/python-pninexus/pull/254) diff --git a/README.rst b/README.rst index 359a468..a306be6 100644 --- a/README.rst +++ b/README.rst @@ -78,8 +78,8 @@ For Python3 just replace python with python3 in the above instructions. Debian and Ubuntu packages ~~~~~~~~~~~~~~~~~~~~~~~~~~ -Debian ``trixie``, ``bookworm``, ``bullseye`` or Ubuntu ``resolute``, -``noble``, ``jammy`` packages can be found in the HDRI repository. +Debian ``trixie``, ``bookworm``, ``bullseye`` or Ubuntu ``stonking``, ``resolute``, +``noble`` packages can be found in the HDRI repository. To install the debian packages, add the PGP repository key diff --git a/doc/sphinx/installation.rst b/doc/sphinx/installation.rst index 83bcf25..6be83ec 100644 --- a/doc/sphinx/installation.rst +++ b/doc/sphinx/installation.rst @@ -79,7 +79,7 @@ and for Ubuntu (Noble) $ wget http://repos.pni-hdri.de/noble-pni-hdri.list -Similarly, proceed for Trixie, Bookworm, Bullseye, Resolute, Noble, Jammy. +Similarly, proceed for Trixie, Bookworm, Bullseye, Stonking Resolute, Noble. Once you have downloaded the file use .. code-block:: bash