Skip to content

Commit d8fb5d7

Browse files
jkotanjkotan
authored
Issue 232: add windows macos and linux tests with pixi (#233)
* add linux_tests * comment out patches * update pixi path * fix typo * source pixi in tests * fix the recipe path * update recipe * update recipe * add deps * add deps * add deps * use container * fix containter name * update pixi dir * add bash * add bash * fix typo * use bash * add hdf5 path * update recipe * update printouts * update setup.py * change the path * update deps * update deps * update deps * update deps * update deps * update deps * update deps * comment out tests * add numpy * add setuptool * add build deps back * comment tests out * add mac and win tests * update config * comment out windows * fix pixi path for macos * fix pixi path for macos * add compilers * remove compilers for mac * add windows * add windows * remove strategy * change to windows 2025 * add more windows test content * add missing slash * update config * update config * update config * add python-pninexus * add checkout * fix typo * add windows switch * change build deps * add windows switch * fix boost python version * add headers * add headers * fix boost version * fix boost version * fix hdf5 version * fix hdf5 version * update tests for aarch * update tests * update tests * Update predefined_type_test.py * Update predefined_type_test.py
1 parent 91d6fd0 commit d8fb5d7

6 files changed

Lines changed: 199 additions & 15 deletions

File tree

‎.github/workflows/pixi/recipe.yaml‎

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
context:
2+
version: 3.3.0
3+
4+
package:
5+
name: pninexus
6+
version: ${{ version }}
7+
8+
source:
9+
- path: ../../../
10+
11+
build:
12+
noarch: python
13+
number: 0
14+
script:
15+
- if: win
16+
then:
17+
- set CL=/DH5_BUILT_AS_DYNAMIC_LIB=1 %CL%
18+
- set HDF5_LOCAL_PATH=__SYS__
19+
- set HDF5_HL_LOCAL_PATH=__SYS__
20+
- set HDF5_INC_LOCAL_PATH=__SYS__
21+
else:
22+
- export HDF5_HL_LOCAL_PATH=__SYS__
23+
- export HDF5_INC_LOCAL_PATH=__SYS__
24+
- python setup.py install
25+
- python -m pytest test
26+
- if: win
27+
then: python setup.py install --prefix=%PREFIX%
28+
else: python setup.py install --prefix=$PREFIX
29+
30+
requirements:
31+
build:
32+
# - ${{ compiler('cxx') }}
33+
# - ${{ stdlib('c') }}
34+
- python
35+
- cmake
36+
- ninja
37+
- numpy
38+
- setuptools
39+
- pytest # for testing
40+
- h5py # for testing
41+
- sphinx # for building documentation
42+
- hdf5
43+
- h5cpp
44+
- sphinx
45+
- libpninexus
46+
- libboost-headers
47+
- libboost-devel
48+
- libboost-python-devel
49+
- blas
50+
- zlib
51+
host:
52+
- python
53+
- setuptools
54+
- pip
55+
- pytest # for testing
56+
- h5py # for testing
57+
- sphinx # for building documentation
58+
- numpy
59+
- hdf5
60+
- h5cpp
61+
- sphinx
62+
- libpninexus
63+
- libboost-headers
64+
- libboost-devel
65+
- libboost-python-devel
66+
- blas
67+
- zlib
68+
run:
69+
- python
70+
- libboost-devel
71+
- libboost-python-devel
72+
- hdf5
73+
- h5cpp
74+
- libpninexus
75+
76+
# # ImportError: libhdf5_hl.so.310: cannot open shared object file: No such file or directory
77+
# tests:
78+
# - python:
79+
# # python_version: ${{ python_min }}.*
80+
# imports:
81+
# - pninexus.h5cpp
82+
# - pninexus.nexus
83+
84+
about:
85+
homepage: https://github.com/pni-libraries/python-pninexus
86+
license: GPL-2.0-only
87+
license_file: LICENSE
88+
summary: Python bindings or NeXus libpninexus and h5cpp library
89+
description: |
90+
pninexus is python bindings of C++ library to create NeXus files.
91+
It provides NeXus tree-structure builder basedon XML (NXDL-like) input,
92+
NeXus path parsers and other algorithms to access NeXus files.
93+
documentation: https://pni-libraries.github.io/python-pninexus
94+
repository: https://github.com/pni-libraries/python-pninexus
95+
96+
extra:
97+
recipe-maintainers:
98+
- jkotan
99+
- yuelongyu

‎.github/workflows/pixi/variants.yaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
zlib:
2+
- 1
3+
hdf5:
4+
- 1.14.6
5+
libboost-python-devel:
6+
- 1.88.0
7+
libboost-devel:
8+
- 1.88.0
9+
# c_stdlib_version:
10+
# - 2.17
11+
# c_stdlib:
12+
# - sysroot

‎.github/workflows/tests.yml‎

Lines changed: 59 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,65 @@ jobs:
2020
- name: Run flake8
2121
run: flake8 .
2222

23-
python3_tests:
23+
linux_tests:
24+
runs-on: ubuntu-latest
25+
container:
26+
image: debian:trixie
27+
steps:
28+
- uses: actions/checkout@v2
29+
- uses: actions/setup-python@v2
30+
31+
- name: install pixi
32+
shell: bash
33+
run: |
34+
apt-get update
35+
apt-get -qq -y dist-upgrade
36+
apt-get -qq update && apt-get install -qq -y flake8 python3 curl bash
37+
curl -fsSL https://pixi.sh/install.sh | sh
38+
export PATH=/github/home/.pixi/bin:$PATH
39+
pixi shell-hook > .sh.sh
40+
source .sh.sh
41+
pixi add rattler-build compilers
42+
- name: build pninexus
43+
shell: bash
44+
run: |
45+
source .sh.sh
46+
pixi run rattler-build build --recipe .github/workflows/pixi/recipe.yaml
47+
48+
macos-15_tests:
49+
runs-on: macos-15
50+
steps:
51+
- uses: actions/checkout@v2
52+
- uses: actions/setup-python@v2
53+
54+
- name: install pixi
55+
shell: bash
56+
run: |
57+
curl -fsSL https://pixi.sh/install.sh | sh
58+
export PATH=/Users/runner/.pixi/bin:$PATH
59+
pixi shell-hook > .sh.sh
60+
source .sh.sh
61+
pixi add rattler-build
62+
- name: build pninexus
63+
shell: bash
64+
run: |
65+
source .sh.sh
66+
pixi run rattler-build build --recipe .github/workflows/pixi/recipe.yaml
67+
68+
windows-2025_tests:
69+
runs-on: windows-2025
70+
steps:
71+
- uses: actions/checkout@v4
72+
- uses: prefix-dev/setup-pixi@v0.9.4
73+
with:
74+
pixi-version: v0.62.2
75+
cache: false
76+
- name: build pninexus
77+
run: |
78+
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
79+
pixi run rattler-build build --recipe .github/workflows/pixi/recipe.yaml
80+
81+
deb_tests:
2482
runs-on: ubuntu-latest
2583
strategy:
2684
matrix:
@@ -89,4 +147,3 @@ jobs:
89147
run: |
90148
docker exec --user root ndts /bin/bash -c "chown -R 1001 /home/tango "
91149
docker container stop ndts
92-

‎pixi.toml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
[workspace]
2+
authors = ["Jan Kotanski <jankotan@gmail.com>"]
3+
channels = ["conda-forge"]
4+
name = "libpninexus"
5+
platforms = ["linux-64", "linux-aarch64", "osx-arm64", "osx-64", "win-64"]
6+
version = "0.1.0"
7+
8+
[tasks]
9+
10+
[dependencies]
11+
rattler-build = ">=0.60.0,<0.61"
12+
ipython = ">=9.11.0,<10"
13+
python = "==3.14"
14+
conda-smithy = ">=3.56.3,<4"

‎setup.py‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# setup script for python-pninexus
22
from __future__ import print_function
3-
import codecs
43
import sys
54
import os
65
import os.path
@@ -37,7 +36,7 @@ def read(fname):
3736
:param fname: readme file name
3837
:type fname: :obj:`str`
3938
"""
40-
with codecs.open(os.path.join('.', fname), encoding='utf-8') as f:
39+
with open(os.path.join('.', fname), encoding='utf-8') as f:
4140
long_description = f.read()
4241
return long_description
4342

@@ -73,7 +72,11 @@ def read(fname):
7372
nexus_config.add_link_library(
7473
"boost_python{major}{minor}".format(major=sys.version_info.major,
7574
minor=sys.version_info.minor))
76-
nexus_config.add_include_directory('/usr/include/hdf5/serial')
75+
hdf5_include_path = os.environ.get('HDF5_INC_LOCAL_PATH')
76+
if not hdf5_include_path:
77+
nexus_config.add_include_directory('/usr/include/hdf5/serial')
78+
elif hdf5_include_path != "__SYS__":
79+
nexus_config.add_include_directory(hdf5_include_path)
7780

7881
hdf5_hl_path = os.environ.get('HDF5_HL_LOCAL_PATH')
7982
if hdf5_hl_path:
@@ -291,7 +294,7 @@ def run(self):
291294
'Intended Audience :: Science/Research',
292295
'Topic :: Scientific/Engineering :: Physics',
293296
'Topic :: Software Development :: Libraries :: Python Modules',
294-
'License :: OSI Approved :: GNU General Public License v2 (GPLv2)',
297+
# 'License :: OSI Approved :: GNU General Public License v2 (GPLv2)',
295298
'Programming Language :: Python :: 2.7',
296299
'Programming Language :: Python :: 3.7',
297300
'Programming Language :: Python :: 3.8',
@@ -300,8 +303,8 @@ def run(self):
300303
'Programming Language :: Python :: 3.11',
301304
'Programming Language :: Python :: 3.12',
302305
],
303-
test_suite="test",
304-
test_loader="unittest:TestLoader",
306+
# test_suite="test",
307+
# test_loader="unittest:TestLoader",
305308
cmdclass={
306309
"install": pni_install,
307310
'build_sphinx': BuildDoc,

‎test/h5cpp_tests/datatype_tests/predefined_type_test.py‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -544,8 +544,9 @@ def testFloat128(self):
544544

545545
prec = dtype.precision
546546
self.assertTrue(dtype.precision in [64, 80, 128])
547-
dtype.precision = 80
548-
self.assertEqual(dtype.precision, 80)
547+
# mprec = 80
548+
# dtype.precision = mprec
549+
# self.assertEqual(dtype.precision, mprec)
549550
dtype.precision = prec
550551
self.assertEqual(dtype.precision, prec)
551552

@@ -593,11 +594,9 @@ def testFloat128(self):
593594
dtype.norm = norm
594595

595596
ebias = dtype.ebias
596-
if not LINUX:
597-
dtype.size = 8
598-
sz = dtype.size
599-
self.assertTrue(dtype.ebias in [2 * sz * sz * sz - 1,
600-
4 * sz * sz * sz - 1])
597+
self.assertTrue(ebias in [1023, 16383])
598+
self.assertTrue(dtype.size in [9, 16, 17])
599+
601600
dtype.ebias = 63
602601
self.assertEqual(dtype.ebias, 63)
603602
dtype.ebias = 31

0 commit comments

Comments
 (0)