Skip to content

Commit 78afb0e

Browse files
jkotanjkotan
committed
Merge branch 'develop' of https://github.com/pni-libraries/python-pninexus into develop
2 parents 3057cc1 + 1985e3e commit 78afb0e

7 files changed

Lines changed: 52 additions & 6 deletions

File tree

‎.ci/debian11_py3/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM debian:bullseye
22

3-
MAINTAINER DESY, Jan Kotanski <jankotan@gmail.com>
3+
# MAINTAINER DESY, Jan Kotanski <jankotan@gmail.com>
44

55

66
RUN apt-get update

‎.ci/debian12_py3/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM debian:bookworm
22

3-
MAINTAINER DESY, Jan Kotanski <jankotan@gmail.com>
3+
# MAINTAINER DESY, Jan Kotanski <jankotan@gmail.com>
44

55

66
RUN apt-get update

‎.ci/debian13_py3/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM debian:trixie
22

3-
MAINTAINER DESY, Jan Kotanski <jankotan@gmail.com>
3+
# MAINTAINER DESY, Jan Kotanski <jankotan@gmail.com>
44

55

66
RUN apt-get update

‎.ci/ubuntu22.04_py3/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM ubuntu:22.04
22

3-
MAINTAINER DESY, Jan Kotanski <jankotan@gmail.com>
3+
# MAINTAINER DESY, Jan Kotanski <jankotan@gmail.com>
44

55
RUN sed -i 's|http://archive|http://de.archive|g' /etc/apt/sources.list
66
RUN apt-get update

‎.ci/ubuntu24.04_py3/Dockerfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
FROM ubuntu:24.04
22

3-
MAINTAINER DESY, Jan Kotanski <jankotan@gmail.com>
3+
# MAINTAINER DESY, Jan Kotanski <jankotan@gmail.com>
44

55

6+
RUN sed -i 's|http://archive|http://de.archive|g' /etc/apt/sources.list.d/ubuntu.sources
67
RUN apt-get update
78
RUN apt-get install -y base-passwd apt-utils dialog -y
89
RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections

‎.ci/ubuntu25.10_py3/Dockerfile‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
FROM ubuntu:25.10
2+
3+
# MAINTAINER DESY, Jan Kotanski <jankotan@gmail.com>
4+
5+
RUN sed -i 's|http://archive|http://de.archive|g' /etc/apt/sources.list.d/ubuntu.sources
6+
RUN apt-get update
7+
RUN apt-get install -y base-passwd apt-utils dialog -y
8+
RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
9+
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
10+
11+
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
12+
RUN chmod 644 /etc/apt/trusted.gpg.d/debian-hdri-repo.gpg
13+
RUN cd /etc/apt/sources.list.d && wget http://repos.pni-hdri.de/questing-pni-hdri.sources
14+
15+
RUN apt-get -qq update && export DEBIAN_FRONTEND=noninteractive && apt-get -qq dist-upgrade
16+
RUN apt-get -qq update && export DEBIAN_FRONTEND=noninteractive && apt-get -qq install -y python3-sphinx apt-utils net-tools
17+
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
18+
RUN apt-get -qq install -y hdf5-filter-plugin bitshuffle python3-pytest git cmake doxygen python3-sphinx libboost-all-dev
19+
RUN apt-get -qq install -y libpninexus3.3.0-dev libpninexus3.3.0 libh5cpp0.7.1-dev libh5cpp0.7.1
20+
RUN useradd -ms /bin/bash tango
21+
22+
# # install latest h5cpp
23+
# RUN mkdir -p /opt/h5cpp
24+
# RUN mkdir -p /h5cpp-src
25+
# RUN cd /h5cpp-src && git clone https://github.com/ess-dmsc/h5cpp && mkdir build
26+
# 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
27+
# ENV CPLUS_INCLUDE_PATH=/opt/h5cpp/include
28+
# ENV LD_LIBRARY_PATH=/opt/h5cpp/lib
29+
# ENV H5CPP=/opt/h5cpp/lib/cmake/h5cpp-0.6
30+
# ENV H5CPP_LOCAL_PATH=/opt/h5cpp
31+
# ENV HDF5_HL_LOCAL_PATH=/usr/lib/x86_64-linux-gnu/hdf5/serial/
32+
33+
# # install latest linpninexus
34+
# RUN mkdir -p /opt/libpninexus
35+
# RUN mkdir -p /libpninexus-src
36+
# RUN cd /libpninexus-src && git clone https://github.com/pni-libraries/libpninexus && mkdir build
37+
# # 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
38+
# RUN cd /libpninexus-src/build && cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/opt/libpninexus/ -DPNINEXUS_CONAN=DISABLE ../libpninexus && make -j4 && make install -j4
39+
# ENV CPLUS_INCLUDE_PATH=$CPLUS_INCLUDE_PATH:/opt/libpninexus/include
40+
# ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/libpninexus/lib
41+
# ENV PNINEXUS_LOCAL_PATH=/opt/libpninexus
42+
43+
ENV PKG_CONFIG_PATH=/home/tango/lib/pkgconfig
44+
USER tango
45+
WORKDIR /home/tango

‎.github/workflows/tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
runs-on: ubuntu-latest
2525
strategy:
2626
matrix:
27-
os: [debian13, debian12, debian11, ubuntu25.04, ubuntu24.04, ubuntu22.04]
27+
os: [debian13, debian12, debian11, ubuntu25.10, ubuntu24.04, ubuntu22.04]
2828
steps:
2929
- uses: actions/checkout@v2
3030
- uses: actions/setup-python@v2

0 commit comments

Comments
 (0)