Move geometry devices, some utilities to own repositories
Merge request reports
Activity
assigned to @hammerd
added 7 commits
-
58b66517...487bf37c - 5 commits from branch
master
- 8eca5323 - Start moving scene utils, geometry stuff out
- fe041fa3 - Merge branch 'move-utils-out' of ssh://git.xfel.eu:10022/calibration/calng into move-utils-out
-
58b66517...487bf37c - 5 commits from branch
added 2 commits
added 1 commit
- a949d488 - Unrelated: remove duplicate import of ProxyFactory
I took the chance to also move some utilities out which are needed in other devices eventually. This does mean we have multiple
DEPENDS
files to maintain;-
calng
DEPENDS
oncalngUtils
andgeometryDevices
-
geometryDevices
DEPENDS
oncalngUtils
(heavily uses scene generation code)
While moving some tests to
calngUtils
where they now belong, I also moved thetests
folder from[root]/src/tests
to[root]/tests
which seems to be more common. As noted in the commit history, I included the following unrelated fixes:-
removemoving to separate MR.defaultValue
from output schemata elements, fixing #33 (closed) - add missing
pip install --upgrade .
to theMakefile
- small fix of an old test (all tests should pass)
One thing not yet resolved for 2.19.x support: #34 (closed) I have narrowed down where it happens and it can be avoided as described in comment there, but I would like to better understand what goes wrong / come up with a better fix.
Planning to merge this week unless there are complaints. Feel free, in particular, to suggest better naming of the various utilities now in
calngUtils
.Edited by David Hammer-
changed milestone to %2023 winter shutdown
added 1 commit
- c89bdfa8 - Revert "Unrelated: remove default values in output schemata for 2.19.x"
added 16 commits
-
c89bdfa8...62f3038e - 2 commits from branch
master
- ba850763 - Start moving scene utils, geometry stuff out
- c8a70611 - Set h5py version, add xarray
- 75a7eec7 - Add concrete scenes, fix import for RoiTool
- 965b9272 - Unrelated: fix test of DsscCalcatFriend
- 816936f7 - Unrelated: fix Makefile install self
- 8710d05f - Unrelated: remove default values in output schemata for 2.19.x
- 3a0a32d3 - Add dependency on calngUtils and geometryDevices
- 3c02f457 - Move most util testing out
- c3138f29 - Unrelated: remove duplicate import of ProxyFactory
- 16879bab - Removing old test
- c43f5e43 - Revert "Unrelated: remove default values in output schemata for 2.19.x"
- aa5fb022 - Merge branch 'move-utils-out' of ssh://git.xfel.eu:10022/calibration/calng into move-utils-out
- 03727e86 - Don't require posixshmem (rebase mess-up)
- 76b9398a - Move shmem_utils out
Toggle commit list-
c89bdfa8...62f3038e - 2 commits from branch
Also, now assuming https://git.xfel.eu/calibration/calngutils/-/merge_requests/1 (
shmem_utils
found incalngUtils
)mentioned in commit 0b32e7fd