From da929a317028b9f3cdb9890fde0d62d87dbb5c5c Mon Sep 17 00:00:00 2001
From: ahmedk <karim.ahmed@xfel.eu>
Date: Thu, 31 Mar 2022 10:00:43 +0200
Subject: [PATCH] add new cal_db_interactive tag and fix docstring
---
setup.py | 2 +-
src/cal_tools/tools.py | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/setup.py b/setup.py
index 4b9926306..5c40b2f74 100644
--- a/setup.py
+++ b/setup.py
@@ -94,7 +94,7 @@ install_requires = [
if "readthedocs.org" not in sys.executable:
install_requires += [
- "iCalibrationDB @ git+ssh://git@git.xfel.eu:10022/detectors/cal_db_interactive.git@feat/ccv_tag", # noqa
+ "iCalibrationDB @ git+ssh://git@git.xfel.eu:10022/detectors/cal_db_interactive.git@2.2.0", # noqa
"XFELDetectorAnalysis @ git+ssh://git@git.xfel.eu:10022/karaboDevices/pyDetLib.git@2.7.0", # noqa
]
diff --git a/src/cal_tools/tools.py b/src/cal_tools/tools.py
index 1ec6574d5..9a20cfe1d 100644
--- a/src/cal_tools/tools.py
+++ b/src/cal_tools/tools.py
@@ -636,16 +636,16 @@ def send_to_db(db_module: str, karabo_id: str, constant, condition,
:param condition: Calibration condition
:param file_loc: Location of raw data.
:param report_path: xfel-calbrate report path to inject along with
- the calibration constant versions to the database.
+ the calibration constant versions to the database.
:param cal_db_interface: Interface string, e.g. "tcp://max-exfl016:8015"
:param creation_time: Latest time for constant to be created
:param timeout: Timeout for zmq request
:param ntries: number of tries to contact the database,
- ntries is set to 7 so that if the timeout started
- at 30s last timeout will be ~ 1h.
+ ntries is set to 7 so that if the timeout started
+ at 30s last timeout will be ~ 1h.
:param doraise: if True raise errors during communication with DB
:param variant: A calibration constant version variant attribute
- for the constant file.
+ for the constant file.
"""
success = False
--
GitLab