Merge branch 'split-ruff-ci' into 'v3'

Split up ruff format and lint

See merge request openflexure/openflexure-microscope-server!226

.gitlab-ci.yml

@@ -59,11 +59,17 @@ meta-build-image:
     - web
 
 # Python formatting and static analysis with ruff
-ruff:
+ruff-lint:
   stage: analysis
   extends: .python
   script:
     - ruff check
+
+# Python formatting and static analysis with ruff
+ruff-format:
+  stage: analysis
+  extends: .python
+  script:
     - ruff format --check
 
 # Python type checking with Mypy

pyproject.toml

@@ -24,6 +24,7 @@ dependencies = [
   "numpy ~= 1.20",
   "scipy ~=1.14",
   "piexif",
+  "pydantic ~= 2.10.6",
 ]
 
 [project.optional-dependencies]

src/openflexure_microscope_server/things/smart_scan.py

@@ -826,7 +826,7 @@ class SmartScanThing(Thing):
         except Exception as e:
             logger.error(
                 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,
             )
             raise e
@@ -1193,7 +1193,7 @@ class SmartScanThing(Thing):
             )
         # 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,
         # as some of them should only be added at the end (as we can't overwrite)