From 11e59035a1da78c11be28cf9fb03c6261aece3cf Mon Sep 17 00:00:00 2001 From: Mads Jakobsen <mads.jakobsen@xfel.eu> Date: Tue, 11 Mar 2025 14:40:04 +0100 Subject: [PATCH] moved file with conditionaling loading, so that python project can still be used wuhtout karabo installed --- python_package/src/onlinemid/__init__.py | 3 ++- .../src/onlinemid/utils}/hash_and_dict.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) rename {karabo_devices => python_package/src/onlinemid/utils}/hash_and_dict.py (96%) diff --git a/python_package/src/onlinemid/__init__.py b/python_package/src/onlinemid/__init__.py index e5892d0..35cb2f1 100644 --- a/python_package/src/onlinemid/__init__.py +++ b/python_package/src/onlinemid/__init__.py @@ -4,5 +4,6 @@ from .utils.agipd import agipd_module_name_from_mid_agipd_source from .utils.agipd import mid_agipd_source_from_agipd_module_name from .utils.agipd import agipd_module_name_from_agipd_module_number from .utils.agipd import agipd_module_number_from_agipd_module_name - +from .utils.hash_and_dict import dict_from_hash +from .utils.hash_and_dict import hash_from_dict from .utils.online_data_structures import NpVec diff --git a/karabo_devices/hash_and_dict.py b/python_package/src/onlinemid/utils/hash_and_dict.py similarity index 96% rename from karabo_devices/hash_and_dict.py rename to python_package/src/onlinemid/utils/hash_and_dict.py index 8a1541b..08fe7e1 100644 --- a/karabo_devices/hash_and_dict.py +++ b/python_package/src/onlinemid/utils/hash_and_dict.py @@ -1,7 +1,8 @@ -from karabo.bound import Hash def hash_from_dict(dictionary): + from karabo.bound import Hash + def ensure_it_is_hashable(var): ''' a function that recursivly makes a dictionart into a hash, -- GitLab