From 0536e7febf390011c268083772c03e4e46299be1 Mon Sep 17 00:00:00 2001
From: ahmedk <karim.ahmed@xfel.eu>
Date: Mon, 7 Mar 2022 13:20:30 +0100
Subject: [PATCH] fix the tests and add a temporary branch name for
cal_db_interactive
---
setup.py | 2 +-
src/cal_tools/agipdlib.py | 4 ++--
tests/test_cal_tools.py | 1 -
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/setup.py b/setup.py
index e73c52388..4b9926306 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@2.1.0", # noqa
+ "iCalibrationDB @ git+ssh://git@git.xfel.eu:10022/detectors/cal_db_interactive.git@feat/ccv_tag", # noqa
"XFELDetectorAnalysis @ git+ssh://git@git.xfel.eu:10022/karaboDevices/pyDetLib.git@2.7.0", # noqa
]
diff --git a/src/cal_tools/agipdlib.py b/src/cal_tools/agipdlib.py
index cb27f73a6..a587a3cdd 100644
--- a/src/cal_tools/agipdlib.py
+++ b/src/cal_tools/agipdlib.py
@@ -104,7 +104,7 @@ class AgipdCtrl:
def get_gain_setting(
self,
- creation_time: "datetime.datetime",
+ creation_time: datetime,
) -> Optional[int]:
"""Retrieve Gain setting.
@@ -1280,7 +1280,7 @@ class AgipdCorrections:
def initialize_from_db(self, karabo_id: str, karabo_da: str,
cal_db_interface: str,
- creation_time: datetime.datetime,
+ creation_time: datetime,
memory_cells: float, bias_voltage: int,
photon_energy: float, gain_setting: float,
acquisition_rate: float, integration_time: int,
diff --git a/tests/test_cal_tools.py b/tests/test_cal_tools.py
index 102f613b7..cc82e4b17 100644
--- a/tests/test_cal_tools.py
+++ b/tests/test_cal_tools.py
@@ -335,7 +335,6 @@ def test_get_pdu_from_db(_agipd_const_cond):
"CAL_PHYSICAL_DETECTOR_UNIT-2_TEST"]
-# TODO add a marker for accessing zmq end_point
@pytest.mark.requires_gpfs
@pytest.mark.requires_caldb
def test_initialize_from_db():
--
GitLab