diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9c39d676..8f099eb4 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -17,7 +17,7 @@ repos: - id: end-of-file-fixer - id: sort-simple-yaml - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.14.14 + rev: v0.15.0 hooks: - id: ruff args: [--no-cache, --fix, --exit-non-zero-on-fix] diff --git a/src/drtsans/mono/biosans/api.py b/src/drtsans/mono/biosans/api.py index 265ea3b4..ef7f5c91 100644 --- a/src/drtsans/mono/biosans/api.py +++ b/src/drtsans/mono/biosans/api.py @@ -2178,7 +2178,7 @@ def create_output_dir(output_dir): def form_output_name(workspace): workspace_name = str(workspace) - file_name = workspace_name.split("/")[-1].split(".")[0] + file_name = workspace_name.rsplit("/", maxsplit=1)[-1].split(".")[0] return f"{file_name}.png" diff --git a/src/drtsans/mono/gpsans/api.py b/src/drtsans/mono/gpsans/api.py index d58cec7e..59f4e9a3 100644 --- a/src/drtsans/mono/gpsans/api.py +++ b/src/drtsans/mono/gpsans/api.py @@ -1440,7 +1440,7 @@ def reduce_single_configuration(loaded_ws, reduction_input, prefix="", skip_nan= def form_output_name(workspace): workspace_name = str(workspace) - file_name = workspace_name.split("/")[-1].split(".")[0] + file_name = workspace_name.rsplit("/", maxsplit=1)[-1].split(".")[0] return f"{file_name}.png" diff --git a/tests/integration/drtsans/tof/eqsans/test_reduction_api.py b/tests/integration/drtsans/tof/eqsans/test_reduction_api.py index 4d5aa28c..83363820 100644 --- a/tests/integration/drtsans/tof/eqsans/test_reduction_api.py +++ b/tests/integration/drtsans/tof/eqsans/test_reduction_api.py @@ -396,7 +396,7 @@ def export_iq_comparison(iq1d_tuple_list: List[Tuple[str, IQmod, str]], png_name plt.legend() # save - plt.savefig(f"{png_name.split('.')[0]}_error_bar.png") + plt.savefig(f"{png_name.split('.', maxsplit=1)[0]}_error_bar.png") # close plt.close()