From c0bfaa5b742ad99cb92cf6c7d843aa018b7e6960 Mon Sep 17 00:00:00 2001
From: Thomas Kluyver <thomas@kluyver.me.uk>
Date: Mon, 21 Nov 2022 17:56:47 +0000
Subject: [PATCH] Use calparrot 'wrapper' around running notebook
---
bin/slurm_calibrate.sh | 18 ++++--------------
setup.py | 2 +-
2 files changed, 5 insertions(+), 15 deletions(-)
diff --git a/bin/slurm_calibrate.sh b/bin/slurm_calibrate.sh
index 01026e9af..2483c460d 100755
--- a/bin/slurm_calibrate.sh
+++ b/bin/slurm_calibrate.sh
@@ -43,23 +43,13 @@ then
sleep 15
fi
-# Launch CalParrot to repeat calibration constant queries
-if [ "$caltype" == "CORRECT" ]
-then
- port_file=$(mktemp)
- ${python_path} -m calparrot --port-file $port_file
- calparrot_port=$(cat $port_file)
- rm $port_file
- export CAL_CAL_TOOLS_CALCAT="{base-api-url='http://127.0.0.1:${calparrot_port}/api', use-oauth2=false}"
-fi
-
echo "Running notebook"
-${python_path} -m princess ${nb_path} --save
-
-# Stop CalParrot
if [ "$caltype" == "CORRECT" ]
then
- ${python_path} -m calparrot.stop $calparrot_port
+ # calparrot stores and repeats calcat queries
+ ${python_path} -m calparrot -- ${python_path} -m princess ${nb_path} --save
+else
+ ${python_path} -m princess ${nb_path} --save
fi
# stop the cluster if requested
diff --git a/setup.py b/setup.py
index cf2df3f21..56ad883bb 100644
--- a/setup.py
+++ b/setup.py
@@ -116,7 +116,7 @@ if "readthedocs.org" not in sys.executable:
install_requires += [
"iCalibrationDB @ git+ssh://git@git.xfel.eu:10022/detectors/cal_db_interactive.git@2.3.0", # noqa
"XFELDetectorAnalysis @ git+ssh://git@git.xfel.eu:10022/karaboDevices/pyDetLib.git@2.7.0", # noqa
- "CalParrot @ git+ssh://git@git.xfel.eu:10022/calibration/calparrot.git@fdcdd52fdf8bedc0db1de46aaeb389e48275fdcc", # noqa
+ "CalParrot @ git+ssh://git@git.xfel.eu:10022/calibration/calparrot.git@b0cfc58ff0f231685630b2a12f566faf243b1035", # noqa
]
setup(
--
GitLab