From 73e9b0cb62582e3d8a8d5b214420b50aadd09e85 Mon Sep 17 00:00:00 2001 From: Robert Rosca <robert.rosca@xfel.eu> Date: Wed, 7 Apr 2021 00:19:37 +0200 Subject: [PATCH] Hotfixes after rebase Minor fixes, pushing straight to mastser as one is a breaking bug, symlinks in src/xfel_calibrate point to the wrong directory causing it to not be able to find notebooks. Caught by !464 tests --- .gitignore | 3 ++- src/xfel_calibrate/bin | 2 +- src/xfel_calibrate/notebooks | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a5ddc11c7..3ea4aabcd 100644 --- a/.gitignore +++ b/.gitignore @@ -21,7 +21,6 @@ LPD/results Test build -cal_tools/agipdalgs.c* docs/build docs/source/_notebooks docs/source/_static/reports @@ -30,6 +29,8 @@ docs/source/test_results.rst docs/source/test_rsts reportservice/*.log slurm_tmp* +src/cal_tools/agipdalgs.c +src/cal_tools/agipdalgs.cpython-36m-x86_64-linux-gnu.so webservice/*.log webservice/*sqlite webservice/webservice.yaml diff --git a/src/xfel_calibrate/bin b/src/xfel_calibrate/bin index 19f285ac7..db397da27 120000 --- a/src/xfel_calibrate/bin +++ b/src/xfel_calibrate/bin @@ -1 +1 @@ -../bin \ No newline at end of file +../../bin \ No newline at end of file diff --git a/src/xfel_calibrate/notebooks b/src/xfel_calibrate/notebooks index 8f9a5b2e6..2057abdaa 120000 --- a/src/xfel_calibrate/notebooks +++ b/src/xfel_calibrate/notebooks @@ -1 +1 @@ -../notebooks \ No newline at end of file +../../notebooks \ No newline at end of file -- GitLab