Started Running as brainvisa ---------------------------------------- $ /usr/bin/python3 /home_local/a-sac-ns-brainvisa/bbi-daily/soma-env-qt6/src/brainvisa-cmake/bin/bv_run_pixi_env.py bv_maker name=soma-env-qt6 -- sources ---------------------------------------- Updating git repository /home_local/a-sac-ns-brainvisa/bbi-daily/soma-env-qt6/src/aims-free $ git fetch --tags --prune origin '+refs/heads/*:refs/remotes/origin/*' Depuis https://github.com/brainvisa/aims-free 6a2ac96b..5a790aa9 sip-6-15 -> origin/sip-6-15 084f3953..e2e77a64 soma-env-6.0 -> origin/soma-env-6.0 $ git update-ref --no-deref refs/bv_head refs/remotes/origin/soma-env-6.0 $ git -c remote.origin.skipDefaultUpdate remote update $ git pull --ff-only Mise à jour 6a2ac96b..5a790aa9 Fast-forward CMakeLists.txt | 10 ++ aimsdata/shared/plugins/aimsdata.plugins | 3 +- aimsdata/sphinx/user_doc/changelog.md | 1 + aimsdata/src/CMakeLists.txt | 5 + aimsdata/src/aimsdata/fibers/bundles.cc | 1 + aimsdata/src/aimsdata/io/fileFormat_bucket.cc | 11 ++ aimsdata/src/aimsdata/io/finder.cc | 6 +- aimsdata/src/aimsdata/io/finder.h | 4 +- aimsdata/src/aimsdata/io/graphBundlesFormat.cc | 1 - aimsdata/src/aimstrx/CMakeLists.txt | 30 +++++ aimsdata/src/aimstrx/fibers/trxbundlereader.cc | 161 +++++++++++++++++++++++++ aimsdata/src/aimstrx/fibers/trxbundlereader.h | 31 +++++ aimsdata/src/aimstrx/plugin/trxplugin.cc | 89 ++++++++++++++ aimsdata/src/aimstrx/plugin/trxplugin.h | 22 ++++ pyaims/python/soma/aims/io_ext.py | 106 +++++++++++++++- pyaims/src/sip/aims.sip | 9 ++ pyaims/src/sip/generatedtypes.py | 1 + 17 files changed, 479 insertions(+), 12 deletions(-) create mode 100644 aimsdata/src/aimstrx/CMakeLists.txt create mode 100644 aimsdata/src/aimstrx/fibers/trxbundlereader.cc create mode 100644 aimsdata/src/aimstrx/fibers/trxbundlereader.h create mode 100644 aimsdata/src/aimstrx/plugin/trxplugin.cc create mode 100644 aimsdata/src/aimstrx/plugin/trxplugin.h $ git merge --ff-only refs/bv_head Déjà à jour. Updating git repository /home_local/a-sac-ns-brainvisa/bbi-daily/soma-env-qt6/src/aims-gpl $ git fetch --tags --prune origin '+refs/heads/*:refs/remotes/origin/*' $ git update-ref --no-deref refs/bv_head refs/remotes/origin/soma-env-6.0 $ git -c remote.origin.skipDefaultUpdate remote update $ git merge --ff-only refs/bv_head Déjà à jour. Updating git repository /home_local/a-sac-ns-brainvisa/bbi-daily/soma-env-qt6/src/anatomist-free $ git fetch --tags --prune origin '+refs/heads/*:refs/remotes/origin/*' $ git update-ref --no-deref refs/bv_head refs/remotes/origin/soma-env-6.0 $ git -c remote.origin.skipDefaultUpdate remote update $ git pull --ff-only Déjà à jour. $ git merge --ff-only refs/bv_head Déjà à jour. Updating git repository /home_local/a-sac-ns-brainvisa/bbi-daily/soma-env-qt6/src/anatomist-gpl $ git fetch --tags --prune origin '+refs/heads/*:refs/remotes/origin/*' $ git update-ref --no-deref refs/bv_head refs/remotes/origin/soma-env-6.0 $ git -c remote.origin.skipDefaultUpdate remote update $ git merge --ff-only refs/bv_head Déjà à jour. Updating git repository /home_local/a-sac-ns-brainvisa/bbi-daily/soma-env-qt6/src/axon $ git fetch --tags --prune origin '+refs/heads/*:refs/remotes/origin/*' $ git update-ref --no-deref refs/bv_head refs/remotes/origin/soma-env-6.0 $ git -c remote.origin.skipDefaultUpdate remote update $ git merge --ff-only refs/bv_head Déjà à jour. Updating git repository /home_local/a-sac-ns-brainvisa/bbi-daily/soma-env-qt6/src/bioprocessing $ git fetch --tags --prune origin '+refs/heads/*:refs/remotes/origin/*' $ git update-ref --no-deref refs/bv_head refs/remotes/origin/soma-env-6.0 $ git -c remote.origin.skipDefaultUpdate remote update $ git merge --ff-only refs/bv_head Déjà à jour. Updating git repository /home_local/a-sac-ns-brainvisa/bbi-daily/soma-env-qt6/src/brainrat-gpl $ git fetch --tags --prune origin '+refs/heads/*:refs/remotes/origin/*' $ git update-ref --no-deref refs/bv_head refs/remotes/origin/soma-env-6.0 $ git -c remote.origin.skipDefaultUpdate remote update $ git merge --ff-only refs/bv_head Déjà à jour. Updating git repository /home_local/a-sac-ns-brainvisa/bbi-daily/soma-env-qt6/src/brainrat-private $ git fetch --tags --prune origin '+refs/heads/*:refs/remotes/origin/*' $ git update-ref --no-deref refs/bv_head refs/remotes/origin/soma-env-6.0 $ git -c remote.origin.skipDefaultUpdate remote update $ git merge --ff-only refs/bv_head Déjà à jour. Updating git repository /home_local/a-sac-ns-brainvisa/bbi-daily/soma-env-qt6/src/brainvisa-cmake $ git fetch --tags --prune origin '+refs/heads/*:refs/remotes/origin/*' $ git update-ref --no-deref refs/bv_head refs/remotes/origin/master $ git -c remote.origin.skipDefaultUpdate remote update $ git merge --ff-only refs/bv_head Déjà à jour. $ pre-commit install pre-commit installed at .git/hooks/pre-commit Updating git repository /home_local/a-sac-ns-brainvisa/bbi-daily/soma-env-qt6/src/brainvisa-cmake $ git fetch --tags --prune origin '+refs/heads/*:refs/remotes/origin/*' $ git update-ref --no-deref refs/bv_head refs/remotes/origin/master $ git -c remote.origin.skipDefaultUpdate remote update $ git merge --ff-only refs/bv_head Déjà à jour. $ pre-commit install pre-commit installed at .git/hooks/pre-commit Updating git repository /home_local/a-sac-ns-brainvisa/bbi-daily/soma-env-qt6/src/brainvisa-share $ git fetch --tags --prune origin '+refs/heads/*:refs/remotes/origin/*' $ git update-ref --no-deref refs/bv_head refs/remotes/origin/soma-env-6.0 $ git -c remote.origin.skipDefaultUpdate remote update $ git merge --ff-only refs/bv_head Déjà à jour. Updating git repository /home_local/a-sac-ns-brainvisa/bbi-daily/soma-env-qt6/src/brainvisa-spm $ git fetch --tags --prune origin '+refs/heads/*:refs/remotes/origin/*' $ git update-ref --no-deref refs/bv_head refs/remotes/origin/soma-env-6.0 $ git -c remote.origin.skipDefaultUpdate remote update $ git merge --ff-only refs/bv_head Déjà à jour. Updating git repository /home_local/a-sac-ns-brainvisa/bbi-daily/soma-env-qt6/src/brainvisa_freesurfer $ git fetch --tags --prune origin '+refs/heads/*:refs/remotes/origin/*' $ git update-ref --no-deref refs/bv_head refs/remotes/origin/soma-env-6.0 $ git -c remote.origin.skipDefaultUpdate remote update $ git merge --ff-only refs/bv_head Déjà à jour. Updating git repository /home_local/a-sac-ns-brainvisa/bbi-daily/soma-env-qt6/src/capsul $ git fetch --tags --prune origin '+refs/heads/*:refs/remotes/origin/*' $ git update-ref --no-deref refs/bv_head refs/remotes/origin/soma-env-6.0 $ git -c remote.origin.skipDefaultUpdate remote update $ git merge --ff-only refs/bv_head Déjà à jour. $ pre-commit install pre-commit installed at .git/hooks/pre-commit Updating git repository /home_local/a-sac-ns-brainvisa/bbi-daily/soma-env-qt6/src/constellation-gpl $ git fetch --tags --prune origin '+refs/heads/*:refs/remotes/origin/*' $ git update-ref --no-deref refs/bv_head refs/remotes/origin/soma-env-6.0 $ git -c remote.origin.skipDefaultUpdate remote update $ git merge --ff-only refs/bv_head Déjà à jour. Updating git repository /home_local/a-sac-ns-brainvisa/bbi-daily/soma-env-qt6/src/constellation-nonfree $ git fetch --tags --prune origin '+refs/heads/*:refs/remotes/origin/*' $ git update-ref --no-deref refs/bv_head refs/remotes/origin/soma-env-6.0 $ git -c remote.origin.skipDefaultUpdate remote update $ git merge --ff-only refs/bv_head Déjà à jour. Updating git repository /home_local/a-sac-ns-brainvisa/bbi-daily/soma-env-qt6/src/cortical_surface-gpl $ git fetch --tags --prune origin '+refs/heads/*:refs/remotes/origin/*' $ git update-ref --no-deref refs/bv_head refs/remotes/origin/soma-env-6.0 $ git -c remote.origin.skipDefaultUpdate remote update $ git merge --ff-only refs/bv_head Déjà à jour. Updating git repository /home_local/a-sac-ns-brainvisa/bbi-daily/soma-env-qt6/src/cortical_surface-nonfree $ git fetch --tags --prune origin '+refs/heads/*:refs/remotes/origin/*' $ git update-ref --no-deref refs/bv_head refs/remotes/origin/soma-env-6.0 $ git -c remote.origin.skipDefaultUpdate remote update $ git merge --ff-only refs/bv_head Déjà à jour. Updating git repository /home_local/a-sac-ns-brainvisa/bbi-daily/soma-env-qt6/src/disco $ git fetch --tags --prune origin '+refs/heads/*:refs/remotes/origin/*' $ git update-ref --no-deref refs/bv_head refs/remotes/origin/soma-env-6.0 $ git -c remote.origin.skipDefaultUpdate remote update $ git merge --ff-only refs/bv_head Déjà à jour. $ pre-commit install pre-commit installed at .git/hooks/pre-commit Updating git repository /home_local/a-sac-ns-brainvisa/bbi-daily/soma-env-qt6/src/highres-cortex $ git fetch --tags --prune origin '+refs/heads/*:refs/remotes/origin/*' $ git update-ref --no-deref refs/bv_head refs/remotes/origin/soma-env-6.0 $ git -c remote.origin.skipDefaultUpdate remote update $ git merge --ff-only refs/bv_head Déjà à jour. $ pre-commit install pre-commit installed at .git/hooks/pre-commit Updating git repository /home_local/a-sac-ns-brainvisa/bbi-daily/soma-env-qt6/src/morpho-deepsulci $ git fetch --tags --prune origin '+refs/heads/*:refs/remotes/origin/*' $ git update-ref --no-deref refs/bv_head refs/remotes/origin/soma-env-6.0 $ git -c remote.origin.skipDefaultUpdate remote update $ git merge --ff-only refs/bv_head Déjà à jour. Updating git repository /home_local/a-sac-ns-brainvisa/bbi-daily/soma-env-qt6/src/morphologist-baby $ git fetch --tags --prune origin '+refs/heads/*:refs/remotes/origin/*' $ git update-ref --no-deref refs/bv_head refs/remotes/origin/soma-env-6.0 $ git -c remote.origin.skipDefaultUpdate remote update $ git merge --ff-only refs/bv_head Déjà à jour. Updating git repository /home_local/a-sac-ns-brainvisa/bbi-daily/soma-env-qt6/src/morphologist-gpl $ git fetch --tags --prune origin '+refs/heads/*:refs/remotes/origin/*' $ git update-ref --no-deref refs/bv_head refs/remotes/origin/soma-env-6.0 $ git -c remote.origin.skipDefaultUpdate remote update $ git pull --ff-only Déjà à jour. $ git merge --ff-only refs/bv_head Déjà à jour. Updating git repository /home_local/a-sac-ns-brainvisa/bbi-daily/soma-env-qt6/src/morphologist-nonfree $ git fetch --tags --prune origin '+refs/heads/*:refs/remotes/origin/*' $ git update-ref --no-deref refs/bv_head refs/remotes/origin/soma-env-6.0 $ git -c remote.origin.skipDefaultUpdate remote update $ git pull --ff-only Déjà à jour. $ git merge --ff-only refs/bv_head Déjà à jour. Updating git repository /home_local/a-sac-ns-brainvisa/bbi-daily/soma-env-qt6/src/morphologist-ui $ git fetch --tags --prune origin '+refs/heads/*:refs/remotes/origin/*' $ git update-ref --no-deref refs/bv_head refs/remotes/origin/soma-env-6.0 $ git -c remote.origin.skipDefaultUpdate remote update $ git merge --ff-only refs/bv_head Déjà à jour. Updating git repository /home_local/a-sac-ns-brainvisa/bbi-daily/soma-env-qt6/src/populse-db $ git fetch --tags --prune origin '+refs/heads/*:refs/remotes/origin/*' $ git update-ref --no-deref refs/bv_head refs/remotes/origin/soma-env-6.0 $ git -c remote.origin.skipDefaultUpdate remote update $ git merge --ff-only refs/bv_head Déjà à jour. $ pre-commit install pre-commit installed at .git/hooks/pre-commit Updating git repository /home_local/a-sac-ns-brainvisa/bbi-daily/soma-env-qt6/src/primatologist-gpl $ git fetch --tags --prune origin '+refs/heads/*:refs/remotes/origin/*' $ git update-ref --no-deref refs/bv_head refs/remotes/origin/soma-env-6.0 $ git -c remote.origin.skipDefaultUpdate remote update $ git merge --ff-only refs/bv_head Déjà à jour. Updating git repository /home_local/a-sac-ns-brainvisa/bbi-daily/soma-env-qt6/src/soma-base $ git fetch --tags --prune origin '+refs/heads/*:refs/remotes/origin/*' $ git update-ref --no-deref refs/bv_head refs/remotes/origin/soma-env-6.0 $ git -c remote.origin.skipDefaultUpdate remote update $ git pull --ff-only Déjà à jour. $ git merge --ff-only refs/bv_head Déjà à jour. $ pre-commit install pre-commit installed at .git/hooks/pre-commit Updating git repository /home_local/a-sac-ns-brainvisa/bbi-daily/soma-env-qt6/src/soma-io $ git fetch --tags --prune origin '+refs/heads/*:refs/remotes/origin/*' Depuis https://github.com/brainvisa/soma-io e28809d..f9a90e6 soma-env-6.0 -> origin/soma-env-6.0 $ git update-ref --no-deref refs/bv_head refs/remotes/origin/soma-env-6.0 $ git -c remote.origin.skipDefaultUpdate remote update $ git pull --ff-only Déjà à jour. $ git merge --ff-only refs/bv_head astuce : Des branches divergentes ne peuvent pas être gérées en avance rapide, vous devez soit : astuce : astuce : git merge --no-ff astuce : astuce : ou : astuce : astuce : git rebase astuce : astuce : Disable this message with "git config set advice.diverging false" fatal : Pas possible d'avancer rapidement, abandon. ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ The upstream branch could not be merged, please refer to the error message above. ======================================================================== Updating git repository /home_local/a-sac-ns-brainvisa/bbi-daily/soma-env-qt6/src/soma-workflow $ git fetch --tags --prune origin '+refs/heads/*:refs/remotes/origin/*' $ git update-ref --no-deref refs/bv_head refs/remotes/origin/soma-env-6.0 $ git -c remote.origin.skipDefaultUpdate remote update $ git pull --ff-only Déjà à jour. $ git merge --ff-only refs/bv_head Déjà à jour. $ pre-commit install pre-commit installed at .git/hooks/pre-commit Updating git repository /home_local/a-sac-ns-brainvisa/bbi-daily/soma-env-qt6/src/sulci-nonfree $ git fetch --tags --prune origin '+refs/heads/*:refs/remotes/origin/*' $ git update-ref --no-deref refs/bv_head refs/remotes/origin/soma-env-6.0 $ git -c remote.origin.skipDefaultUpdate remote update $ git merge --ff-only refs/bv_head Déjà à jour. Summary of Git repositories in /home_local/a-sac-ns-brainvisa/bbi-daily/soma-env-qt6/src ======================================================================================== ┌───── * uncommitted working tree changes │┌──── + uncommitted index changes ││┌─── $ stash present │││┌── % untracked files ││││ ┌ HEAD ││││ │ ┌ update status ││││ │ │ ┌ bv_maker upstream state ││││ │ │ │ ┌ Git upstream state ││││ │ │ │ │ ┌ Directory sip-6-15 (5a790aa9) ✓ U+11 u= aims-free soma-env-6.0 (333d6d9) ✓ U= aims-gpl qt6 (2475ee08) ✓ U+1 u= anatomist-free soma-env-6.0 (f98a01b) ✓ U= anatomist-gpl soma-env-6.0 (98d37787) ✓ U= axon soma-env-6.0 (cb8a653) ✓ U= bioprocessing soma-env-6.0 (a38f070) ✓ U= brainrat-gpl soma-env-6.0 (aaecedf) ✓ U= brainrat-private % master (850b6f3) ✓ U= brainvisa-cmake % master (850b6f3) ✓ U= brainvisa-cmake soma-env-6.0 (de9ad09) ✓ U= brainvisa-share soma-env-6.0 (50f4b51) ✓ U= brainvisa-spm soma-env-6.0 (b4a9fda) ✓ U= brainvisa_freesurfer soma-env-6.0 (88aa7fab) ✓ U= capsul soma-env-6.0 (4b11ec2) ✓ U= constellation-gpl soma-env-6.0 (2cb7705) ✓ U= constellation-nonfree soma-env-6.0 (571abe4) ✓ U= cortical_surface-gpl soma-env-6.0 (9b0400d) ✓ U= cortical_surface-nonfree soma-env-6.0 (a5ea258) ✓ U= disco soma-env-6.0 (efaab07) ✓ U= highres-cortex soma-env-6.0 (1ccf0e8) ✓ U= morpho-deepsulci soma-env-6.0 (facd37e) ✓ U= morphologist-baby master (bcaddf2c) ✓ U= u+32 morphologist-gpl qt6 (d204b72) ✓ U+2 u= morphologist-nonfree soma-env-6.0 (a83f257) ✓ U= morphologist-ui soma-env-6.0 (efe0f30) ✓ U= populse-db soma-env-6.0 (fdd4bc1) ✓ U= primatologist-gpl qt6 (ffc288d) ✓ U+4 u= soma-base qt6 (1f2bc09) ✗ merge failed U+12-1 u= soma-io qt6 (72202ab) ✓ U+1 u= soma-workflow soma-env-6.0 (f3dc66a) ✓ U= sulci-nonfree Traceback (most recent call last): File "/home_local/a-sac-ns-brainvisa/bbi-daily/soma-env-qt6/src/brainvisa-cmake/python/brainvisa_cmake/commands.py", line 88, in process logs = getattr(o, method)(*meth_args, ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/home_local/a-sac-ns-brainvisa/bbi-daily/soma-env-qt6/src/brainvisa-cmake/python/brainvisa_cmake/sources.py", line 441, in process raise RuntimeError("Error updating one or more Git repositories") RuntimeError: Error updating one or more Git repositories bv_maker summary: FAILED step sources: /home_local/a-sac-ns-brainvisa/bbi-daily/soma-env-qt6/src, started: 2026/09/23 16:12, stopped: 2026/09/23 16:13 There were errors. Traceback (most recent call last): File "/home_local/a-sac-ns-brainvisa/bbi-daily/soma-env-qt6/src/brainvisa-cmake/bin/bv_run_pixi_env.py", line 75, in <module> subprocess.check_call(cmd, cwd=wd, env=env) File "/usr/lib/python3.12/subprocess.py", line 413, in check_call raise CalledProcessError(retcode, cmd) subprocess.CalledProcessError: Command '['pixi', 'run', '--frozen', 'bv_maker', 'sources']' returned non-zero exit status 1. Finished: FAILURE