Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ci/debian11_py3/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RUN chmod 644 /etc/apt/trusted.gpg.d/debian-hdri-repo.gpg
RUN add-apt-repository "deb http://repos.pni-hdri.de/apt/debian bullseye main" -y
# RUN apt-get -qq update && apt-get -qq -y dist-upgrade
RUN apt-get -qq update && apt-get -qq install -y python3-sphinx apt-utils net-tools
RUN apt-get install -y libpninexus3.3.0-dev libpninexus3.3.0 libh5cpp0.7.1-dev libh5cpp0.7.1 python3-numpy libhdf5-dev libboost-regex-dev libboost-program-options-dev libboost-system-dev libboost-date-time-dev libboost-filesystem-dev libblas-dev libatlas-base-dev cython3 python3-setuptools libboost-python-dev python3-numpy-abi9 g++ python3-h5py hdf5-plugin-bshuf hdf5-plugin-bz2 hdf5-plugin-lz4 git python3-pytest cmake doxygen python3-sphinx libboost-all-dev
RUN apt-get install -y libpninexus3.4.0-dev libpninexus3.4.0 libh5cpp0.8.0-dev libh5cpp0.8.0 python3-numpy libhdf5-dev libboost-regex-dev libboost-program-options-dev libboost-system-dev libboost-date-time-dev libboost-filesystem-dev libblas-dev libatlas-base-dev cython3 python3-setuptools libboost-python-dev python3-numpy-abi9 g++ python3-h5py hdf5-plugin-bshuf hdf5-plugin-bz2 hdf5-plugin-lz4 git python3-pytest cmake doxygen python3-sphinx libboost-all-dev
RUN useradd -ms /bin/bash tango
RUN apt-get -qq install -y adduser
RUN /bin/bash -c 'sleep 10'
Expand Down
2 changes: 1 addition & 1 deletion .ci/debian12_py3/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ 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/bookworm-pni-hdri.list
RUN apt-get -qq update && apt-get -qq -y dist-upgrade
RUN apt-get -qq update && apt-get -qq install -y python3-sphinx apt-utils net-tools
RUN apt-get install -y libpninexus3.3.0-dev libpninexus3.3.0 libh5cpp0.7.1-dev libh5cpp0.7.1 python3-numpy libhdf5-dev libboost-regex-dev libboost-program-options-dev libboost-system-dev libboost-date-time-dev libboost-filesystem-dev libblas-dev libatlas-base-dev cython3 python3-setuptools libboost-python-dev python3-numpy-abi9 g++ python3-h5py git python3-pytest cmake doxygen python3-sphinx libboost-all-dev hdf5-filter-plugin hdf5-plugin-bshuf
RUN apt-get install -y libpninexus3.4.0-dev libpninexus3.4.0 libh5cpp0.8.0-dev libh5cpp0.8.0 python3-numpy libhdf5-dev libboost-regex-dev libboost-program-options-dev libboost-system-dev libboost-date-time-dev libboost-filesystem-dev libblas-dev libatlas-base-dev cython3 python3-setuptools libboost-python-dev python3-numpy-abi9 g++ python3-h5py git python3-pytest cmake doxygen python3-sphinx libboost-all-dev hdf5-filter-plugin hdf5-plugin-bshuf
# hdf5-plugin-bz2 hdf5-plugin-lz4

RUN useradd -ms /bin/bash tango
Expand Down
2 changes: 1 addition & 1 deletion .ci/debian13_py3/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ 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/trixie-pni-hdri.list
RUN apt-get -qq update && apt-get -qq -y dist-upgrade
RUN apt-get -qq update && apt-get -qq install -y python3-sphinx apt-utils net-tools
RUN apt-get install -y libpninexus3.3.0-dev libpninexus3.3.0 libh5cpp0.7.1-dev libh5cpp0.7.1 python3-numpy libhdf5-dev libboost-regex-dev libboost-program-options-dev libboost-system-dev libboost-date-time-dev libboost-filesystem-dev libblas-dev cython3 python3-setuptools libboost-python-dev python3-numpy-dev g++ python3-h5py git python3-pytest cmake doxygen python3-sphinx libboost-all-dev hdf5-filter-plugin bitshuffle
RUN apt-get install -y libpninexus3.4.0-dev libpninexus3.4.0 libh5cpp0.8.0-dev libh5cpp0.8.0 python3-numpy libhdf5-dev libboost-regex-dev libboost-program-options-dev libboost-system-dev libboost-date-time-dev libboost-filesystem-dev libblas-dev cython3 python3-setuptools libboost-python-dev python3-numpy-dev g++ python3-h5py git python3-pytest cmake doxygen python3-sphinx libboost-all-dev hdf5-filter-plugin bitshuffle
# hdf5-plugin-bz2 hdf5-plugin-lz4

RUN useradd -ms /bin/bash tango
Expand Down
2 changes: 1 addition & 1 deletion .ci/ubuntu22.04_py3/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RUN chmod 644 /etc/apt/trusted.gpg.d/debian-hdri-repo.gpg
RUN add-apt-repository "deb http://repos.pni-hdri.de/apt/ubuntu jammy main" -y
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 libpninexus3.3.0-dev libpninexus3.3.0 libh5cpp0.7.1-dev libh5cpp0.7.1 python3-numpy libhdf5-dev libboost-regex-dev libboost-program-options-dev libboost-system-dev libboost-date-time-dev libboost-filesystem-dev libblas-dev libatlas-base-dev cython3 python3-setuptools libboost-python-dev python3-numpy-abi9 g++ python3-h5py
RUN apt-get -qq install -y libpninexus3.4.0-dev libpninexus3.4.0 libh5cpp0.8.0-dev libh5cpp0.8.0 python3-numpy libhdf5-dev libboost-regex-dev libboost-program-options-dev libboost-system-dev libboost-date-time-dev libboost-filesystem-dev libblas-dev libatlas-base-dev cython3 python3-setuptools libboost-python-dev python3-numpy-abi9 g++ python3-h5py
RUN apt-get -qq install -y hdf5-plugin-bshuf hdf5-plugin-bz2 hdf5-plugin-lz4 python3-pytest git cmake doxygen python3-sphinx libboost-all-dev
RUN useradd -ms /bin/bash tango

Expand Down
2 changes: 1 addition & 1 deletion .ci/ubuntu24.04_py3/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ RUN cd /etc/apt/sources.list.d && wget http://repos.pni-hdri.de/noble-pni-hdri.l

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 libpninexus3.3.0-dev libpninexus3.3.0 libh5cpp0.7.1-dev libh5cpp0.7.1 python3-numpy libhdf5-dev libboost-regex-dev libboost-program-options-dev libboost-system-dev libboost-date-time-dev libboost-filesystem-dev libblas-dev libatlas-base-dev cython3 python3-setuptools libboost-python-dev python3-numpy-abi9 g++ python3-h5py
RUN apt-get -qq install -y libpninexus3.4.0-dev libpninexus3.4.0 libh5cpp0.8.0-dev libh5cpp0.8.0 python3-numpy libhdf5-dev libboost-regex-dev libboost-program-options-dev libboost-system-dev libboost-date-time-dev libboost-filesystem-dev libblas-dev libatlas-base-dev cython3 python3-setuptools libboost-python-dev python3-numpy-abi9 g++ python3-h5py
RUN apt-get -qq install -y hdf5-filter-plugin hdf5-plugin-bshuf python3-pytest git cmake doxygen python3-sphinx libboost-all-dev
RUN useradd -ms /bin/bash tango

Expand Down
2 changes: 1 addition & 1 deletion .ci/ubuntu25.04_py3/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ RUN apt-get -qq update && export DEBIAN_FRONTEND=noninteractive && apt-get -qq d
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-system-dev libboost-date-time-dev libboost-filesystem-dev libblas-dev libatlas-base-dev cython3 python3-setuptools libboost-python-dev python3-numpy-dev g++ python3-h5py
RUN apt-get -qq install -y hdf5-filter-plugin bitshuffle-serial-links python3-pytest git cmake doxygen python3-sphinx libboost-all-dev
RUN apt-get -qq install -y libpninexus3.3.0-dev libpninexus3.3.0 libh5cpp0.7.1-dev libh5cpp0.7.1
RUN apt-get -qq install -y libpninexus3.4.0-dev libpninexus3.4.0 libh5cpp0.8.0-dev libh5cpp0.8.0
RUN useradd -ms /bin/bash tango

# # install latest h5cpp
Expand Down
2 changes: 1 addition & 1 deletion .ci/ubuntu25.10_py3/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ RUN apt-get -qq update && export DEBIAN_FRONTEND=noninteractive && apt-get -qq d
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-system-dev libboost-date-time-dev libboost-filesystem-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
RUN apt-get -qq install -y libpninexus3.3.0-dev libpninexus3.3.0 libh5cpp0.7.1-dev libh5cpp0.7.1
RUN apt-get -qq install -y libpninexus3.4.0-dev libpninexus3.4.0 libh5cpp0.8.0-dev libh5cpp0.8.0
RUN useradd -ms /bin/bash tango

# # install latest h5cpp
Expand Down
45 changes: 45 additions & 0 deletions .ci/ubuntu26.04_py3/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
FROM ubuntu:26.04

# MAINTAINER DESY, Jan Kotanski <jankotan@gmail.com>

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 -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/resolute-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-system-dev libboost-date-time-dev libboost-filesystem-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
RUN apt-get -qq install -y libpninexus3.4.0-dev libpninexus3.4.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
2 changes: 1 addition & 1 deletion .github/workflows/pixi/recipe.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
context:
version: 3.3.0
version: 3.4.0

package:
name: pninexus
Expand Down
26 changes: 13 additions & 13 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,24 +65,24 @@ jobs:
source .sh.sh
pixi run rattler-build build --recipe .github/workflows/pixi/recipe.yaml

windows-2025_tests:
runs-on: windows-2025
steps:
- uses: actions/checkout@v4
- uses: prefix-dev/setup-pixi@v0.9.4
with:
pixi-version: v0.62.2
cache: false
- name: build pninexus
run: |
pixi add rattler-build compilers libboost-headers=1.88.0 h5cpp libpninexus libboost=1.88.0 libboost-python=1.88.0 hdf5=1.14.6
pixi run rattler-build build --recipe .github/workflows/pixi/recipe.yaml
# windows-2025_tests:
# runs-on: windows-2025
# steps:
# - uses: actions/checkout@v4
# - uses: prefix-dev/setup-pixi@v0.9.4
# with:
# pixi-version: v0.62.2
# cache: false
# - name: build pninexus
# run: |
# pixi add rattler-build compilers libboost-headers=1.88.0 h5cpp libpninexus libboost=1.88.0 libboost-python=1.88.0 hdf5=1.14.6
# pixi run rattler-build build --recipe .github/workflows/pixi/recipe.yaml

deb_tests:
runs-on: ubuntu-latest
strategy:
matrix:
os: [debian13, debian12, debian11, ubuntu25.10, ubuntu24.04, ubuntu22.04]
os: [debian13, debian12, debian11, ubuntu26.04, ubuntu24.04, ubuntu22.04]
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
Expand Down
15 changes: 13 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,19 @@
# ChangeLog

## 3.4.0 - 2026-05-05
- update tests for hdf5 2.0 )[#235](https://github.com/pni-libraries/python-pninexus/pull/235), [#233](https://github.com/pni-libraries/python-pninexus/pull/233)
- add support for windows ([#231](https://github.com/pni-libraries/python-pninexus/pull/231))
- cleaning setting string empty ([#229](https://github.com/pni-libraries/python-pninexus/pull/229))
- define empty python string with PyCONSTANT_EMPTY_STR ([#228](https://github.com/pni-libraries/python-pninexus/pull/228])
- cast dims.size explicitly for osx ([#227](https://github.com/pni-libraries/python-pninexus/pull/227))
- add -fno-lto flag ([#225](https://github.com/pni-libraries/python-pninexus/pull/225))
- fix warning on stopping CI docker ([#221](https://github.com/pni-libraries/python-pninexus/pull/221))
- add debian 13 test ([#220](https://github.com/pni-libraries/python-pninexus/pull/220))
- technical release for libpninexus v3.4.0 (https://github.com/pni-libraries/libpninexus/issues/252) and libh5cpp v0.8.0 (https://github.com/ess-dmsc/h5cpp/issues/679)

## 3.3.0 - 2025-05-08
- fixes for writing utf8 strings ([#215](https://github.com/pni-libraries/python-pninexus/pull/215)), ([#213](https://github.com/pni-libraries/python-pninexus/pull/213)), ([#210](https://github.com/pni-libraries/python-pninexus/pull/210))
- technical release for libpninexus v3.3.0 (https://github.com/pni-libraries/libpninexus/issues/252) and libh5cpp v0.7.1 (https://github.com/ess-dmsc/h5cpp/issues/679)
- technical release for libpninexus v3.3.0 (https://github.com/pni-libraries/libpninexus/issues/272) and libh5cpp v0.7.1 (https://github.com/ess-dmsc/h5cpp/issues/698)

## 3.2.3 - 2025-01-12
- adapt code to python 3.12 ([#201](https://github.com/pni-libraries/python-pninexus/pull/201))
Expand All @@ -13,7 +24,7 @@

## 3.2.1 - 2023-10-12
- replace README.md by README.rst ([#190](https://github.com/pni-libraries/python-pninexus/pull/190))

](https://github.com/pni-libraries/python-pninexus/pull/
## 3.2.0 - 2023-10-12
- string parameters to has/get_dataset/group/node added ([#185](https://github.com/pni-libraries/python-pninexus/pull/185))
- get_numpy_include_dirs to numpy.get_include changed ([#184](https://github.com/pni-libraries/python-pninexus/pull/183))
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ For Python3 just replace python with python3 in the above instructions.
Debian and Ubuntu packages
~~~~~~~~~~~~~~~~~~~~~~~~~~

Debian ``trixie``, ``bookworm``, ``bullseye`` or Ubuntu ``questing``,
Debian ``trixie``, ``bookworm``, ``bullseye`` or Ubuntu ``resolute``,
``noble``, ``jammy`` packages can be found in the HDRI repository.

To install the debian packages, add the PGP repository key
Expand Down
1 change: 1 addition & 0 deletions doc/sphinx/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@

html_context = {
"docs_versions" : [
"v3.4.0",
"v3.3.0",
"v3.2.3", "v3.2.2", "v3.2.1", "v3.2.0", "v3.1.0",
"v3.0.3", "v3.0.2", "v3.0.1", "v3.0.0", "v2.0.0", "v1.3.4"]
Expand Down
2 changes: 1 addition & 1 deletion doc/sphinx/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ and for Ubuntu (Noble)

$ wget http://repos.pni-hdri.de/noble-pni-hdri.list

Similarly, proceed for Trixie, Bookworm, Bullseye, Questing, Jammy.
Similarly, proceed for Trixie, Bookworm, Bullseye, Resolute, Noble, Jammy.
Once you have downloaded the file use

.. code-block:: bash
Expand Down
8 changes: 5 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
BuildDoc = None

name = "pninexus"
version = "3.3.0"
# release = "3.3.0"
version = "3.4.0"
release = "3.4.0"
# documentation for release with one '.' is stored as v:latest
release = "3.3"
# release = "3.4"

if release.count(".") == 1:
docs_release = '(latest)'
Expand Down Expand Up @@ -302,6 +302,8 @@ def run(self):
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11',
'Programming Language :: Python :: 3.12',
'Programming Language :: Python :: 3.13',
'Programming Language :: Python :: 3.14',
],
# test_suite="test",
# test_loader="unittest:TestLoader",
Expand Down
Loading