Skip to content

Commit 6f14415

Browse files
committed
fix: python stuff
1 parent 54d0078 commit 6f14415

File tree

5 files changed

+18
-9
lines changed

5 files changed

+18
-9
lines changed

bind/python/requirements.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
cppyy==3.1.2
2-
cppyy-backend==1.15.2
3-
cppyy-cling==6.30.0
4-
CPyCppyy==1.12.16
1+
cppyy==3.5.0
2+
cppyy-backend==1.15.3
3+
cppyy-cling==6.32.8
4+
CPyCppyy==1.13.0
55
pkgconfig==1.5.5
66
hipopy==2.0.1

examples/iguana_ex_python_00_run_functions.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@
4444

4545
# set log levels
4646
# NOTE: this can also be done in a config file
47-
seq.SetOption('clas12::EventBuilderFilter', 'log', 'info')
48-
seq.SetOption('clas12::SectorFinder', 'log', 'info')
49-
seq.SetOption('clas12::rga::MomentumCorrection', 'log', 'info')
47+
seq.SetLogLevel('clas12::EventBuilderFilter', 'info')
48+
seq.SetLogLevel('clas12::SectorFinder', 'info')
49+
seq.SetLogLevel('clas12::rga::MomentumCorrection', 'info')
5050

5151
# set algorithm options
5252
# NOTE: this can also be done in a config file, but setting options here OVERRIDES config file settings

examples/meson.build

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,9 @@ if (get_option('bind_python'))
6464
install_dir: get_option('bindir'),
6565
install_mode: 'rwxr-xr-x'
6666
)
67-
# FIXME: currently these are just tested in CI; there is some environment issue here...
67+
# FIXME: test disabled, because of https://github.com/JeffersonLab/iguana/issues/427
68+
# and many of us have Clas12root libraries in LD_LIBRARY_PATH; anyway, these scripts
69+
# are tested on CI at least
6870
# if fs.is_file(get_option('test_data_file'))
6971
# test(
7072
# example,

meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ project_test_env.set(
185185
)
186186
project_test_env.prepend(
187187
'PYTHONPATH',
188-
meson.project_source_root() / 'bind' / 'python'
188+
get_option('prefix') / 'python'
189189
)
190190

191191
# set preprocessor macros

meson/setup_python_venv.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/usr/bin/env bash
2+
set -euo pipefail
3+
python -m venv .venv
4+
source .venv/bin/activate
5+
python -m pip install -r bind/python/requirements.txt
6+
python -m pip install -r doc/mkdocs/requirements.txt
7+
echo "DONE: now source one of the activate scripts in '.venv/bin/'"

0 commit comments

Comments
 (0)