rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix spurious line endings, don't allow ruff-format to fail anymore

Browse source
This commit is contained in:
Julian Stirling 2025-04-02 14:25:22 +01:00
parent 928d5ef300
commit 32f2a7ce70
2 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitlab-ci.yml
View file

@ -69,7 +69,6 @@ ruff-lint:
ruff-format: ruff-format:
stage: analysis stage: analysis
extends: .python extends: .python
allow_failure: true
script: script:
- ruff format --check - ruff format --check

14
src/openflexure_microscope_server/things/smart_scan.py
View file

@ -615,7 +615,7 @@ class SmartScanThing(Thing):
logger.info( logger.info(
f"Generated normalisation image with shape {white_norm.shape}, " f"Generated normalisation image with shape {white_norm.shape}, "
f"max {white_norm.max(axis=(0,1))}, min {white_norm.min(axis=(0,1))}" f"max {white_norm.max(axis=(0, 1))}, min {white_norm.min(axis=(0, 1))}"
) )
norm_inputs = { norm_inputs = {
"luminance": lum, "luminance": lum,
@ -660,7 +660,7 @@ class SmartScanThing(Thing):
) )
save_time = time.time() save_time = time.time()
logger.info( logger.info(
f"Acquired {name} in {acquisition_time-capture_start:.1f}s then {save_time-acquisition_time:.1f}s saving to disk" f"Acquired {name} in {acquisition_time - capture_start:.1f}s then {save_time - acquisition_time:.1f}s saving to disk"
) )
except Exception as e: except Exception as e:
logger.error( logger.error(
@ -691,7 +691,7 @@ class SmartScanThing(Thing):
# if more than 92% of the image is background, treat it as background and continue # if more than 92% of the image is background, treat it as background and continue
if not image_is_sample: if not image_is_sample:
logger.info( logger.info(
f"Skipping {stage.position} as it is {round(background_detect.background_fraction(),0)}% background." f"Skipping {stage.position} as it is {round(background_detect.background_fraction(), 0)}% background."
) )
else: else:
# if not, it's sample. run an autofocus and use the updated height # if not, it's sample. run an autofocus and use the updated height
@ -826,7 +826,7 @@ class SmartScanThing(Thing):
except Exception as e: except Exception as e:
logger.error( logger.error(
f"The scan stopped because of an error: {e}", f"The scan stopped because of an error: {e}",
"We will attempt to stitch and archive the images acquired " "so far.", "We will attempt to stitch and archive the images acquired so far.",
exc_info=e, exc_info=e,
) )
raise e raise e
@ -1084,7 +1084,7 @@ class SmartScanThing(Thing):
"--stitching_mode", "--stitching_mode",
"only_correlate", "only_correlate",
"--minimum_overlap", "--minimum_overlap",
f"{round(overlap*0.9, 2)}", f"{round(overlap * 0.9, 2)}",
images_folder, images_folder,
] ]
) )
@ -1164,7 +1164,7 @@ class SmartScanThing(Thing):
"all", "all",
f"{tiff_arg}", f"{tiff_arg}",
"--minimum_overlap", "--minimum_overlap",
f"{round(overlap*0.9,2)}", f"{round(overlap * 0.9, 2)}",
images_folder, images_folder,
], ],
) )
@ -1193,7 +1193,7 @@ class SmartScanThing(Thing):
) )
# logger.info("Creating zip archive of images (may take some time)...") # logger.info("Creating zip archive of images (may take some time)...")
zip_fname = f'{os.path.join(scan_folder, "images")}.zip' zip_fname = f"{os.path.join(scan_folder, 'images')}.zip"
# Create an empty zip file - we don't want to autofill it with files, # Create an empty zip file - we don't want to autofill it with files,
# as some of them should only be added at the end (as we can't overwrite) # as some of them should only be added at the end (as we can't overwrite)