diff --git a/setup.py b/setup.py index 6acd8a39c93e9f64daf01c22ece2902575b7c4dc..c5eb537959cf1afbcc6613bb88c4fc75c0c0d07d 100644 --- a/setup.py +++ b/setup.py @@ -74,7 +74,6 @@ setup( ext_modules=cythonize(ext_modules), install_requires=[ "iCalibrationDB @ git+ssh://git@git.xfel.eu:10022/detectors/cal_db_interactive.git@2.0.5", # noqa - "nbparameterise @ git+ssh://git@git.xfel.eu:10022/detectors/nbparameterise.git@0.3", # noqa "XFELDetectorAnalysis @ git+ssh://git@git.xfel.eu:10022/karaboDevices/pyDetLib.git@2.5.6-2.10.0#subdirectory=lib", # noqa "Cython==0.29.21", "Jinja2==2.11.2", @@ -101,6 +100,7 @@ setup( "nbclient==0.5.1", "nbconvert==5.6.1", "nbformat==5.0.7", + "nbparameterise==0.5", "notebook==6.1.5", "numpy==1.19.1", "prettytable==0.7.2", diff --git a/src/xfel_calibrate/calibrate.py b/src/xfel_calibrate/calibrate.py index 000dddea5d0975ff604f6c44c4a896d05c5de15c..951dba8ea94b711cff5ce1796b7486633696f107 100755 --- a/src/xfel_calibrate/calibrate.py +++ b/src/xfel_calibrate/calibrate.py @@ -407,7 +407,7 @@ def add_args_from_nb(nb, parser, cvar=None, no_required=False): :param bool no_required: If True, none of the added options are required. """ parser.description = make_epilog(nb) - parms = extract_parameters(nb, lang='python3') + parms = extract_parameters(nb, lang='python') for p in parms: @@ -676,7 +676,7 @@ def concurrent_run(temp_path, nb, nbname, args, cparm=None, cval=None, suffix = flatten_list(cval) # first convert the notebook - parms = extract_parameters(nb, lang='python3') + parms = extract_parameters(nb, lang='python') if has_parm(parms, "cluster_profile"): cluster_profile = f"{args['cluster_profile']}_{suffix}" @@ -686,7 +686,7 @@ def concurrent_run(temp_path, nb, nbname, args, cparm=None, cval=None, params = parameter_values(parms, **args) params = parameter_values(params, cluster_profile=cluster_profile) - new_nb = replace_definitions(nb, params, execute=False, lang='python3') + new_nb = replace_definitions(nb, params, execute=False, lang='python') if not show_title: first_markdown_cell(new_nb).source = '' set_figure_format(new_nb, args["vector_figs"]) @@ -843,7 +843,7 @@ def run(): if ext_func is not None: extend_params(nb, ext_func) - parms = extract_parameters(nb, lang='python3') + parms = extract_parameters(nb, lang='python') title, author, version = extract_title_author_version(nb)