Merging main

Author: Koldstream

.bumpclient.toml

@@ -1,5 +1,5 @@
 [tool.bumpversion]
-current_version = "0.24.2"
+current_version = "0.25.3"
 commit = true
 tag = false
 

.bumpversion.toml

@@ -1,5 +1,5 @@
 [tool.bumpversion]
-current_version = "0.24.2"
+current_version = "0.25.3"
 commit = true
 tag = true
 

Helm/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 name: murfey-services
 description: Umbrella Helm chart for deploying the servers and daemons needed to enable Murfey to transfer and process data
-version: 0.24.2
+version: 0.25.3
 dependencies:
   - name: murfey-instrument-server-clem
   - name: murfey-instrument-server-tem

Helm/charts/murfey-instrument-server-clem/Chart.yaml

@@ -1,4 +1,4 @@
 apiVersion: v1
 name: murfey-instrument-server-clem
 description: Helm chart for deploying a Murfey instrument server, which executes orders to detect, modify, and transfer files on the instrument PC, and notifies the backend server about transferred files
-version: 0.24.2
+version: 0.25.3

Helm/charts/murfey-instrument-server-tem/Chart.yaml

@@ -1,4 +1,4 @@
 apiVersion: v1
 name: murfey-instrument-server-tem
 description: Helm chart for deploying a Murfey instrument server, which executes orders to detect, modify, and transfer files on the instrument PC, and notifies the backend server about transferred files
-version: 0.24.2
+version: 0.25.3

Helm/charts/murfey-rsync/Chart.yaml

@@ -1,4 +1,4 @@
 apiVersion: v1
 name: murfey-rsync
 description: Helm chart for deploying an rsync daemon, which is responsible for executing the transfer of files from the client storage directory to the server storage system
-version: 0.24.2
+version: 0.25.3

Helm/charts/murfey-server/Chart.yaml

@@ -1,4 +1,4 @@
 apiVersion: v1
 name: murfey-server
 description: Helm chart for deploying a Murfey backend server, which is responsible for orchestrating the data transfer and processing workflow between the client PC and the storage system
-version: 0.24.2
+version: 0.25.3

pyproject.toml

@@ -7,7 +7,7 @@ requires = [
 
 [project]
 name = "murfey"
-version = "0.24.2"
+version = "0.25.3"
 description = "Client-Server architecture hauling Cryo-EM data"
 readme = "README.md"
 keywords = [
@@ -72,7 +72,8 @@ smartem = [
     "smartem-decisions[backend]",
 ]
 sxt = [
-    "txrm2tiff",
+    "numpy<3",
+    "olefile",
 ]
 [project.urls]
 Bug-Tracker = "https://github.com/DiamondLightSource/python-murfey/issues"

src/murfey/__init__.py

@@ -1,4 +1,4 @@
 from __future__ import annotations
 
-__version__ = "0.24.2"
-__supported_client_version__ = "0.24.2"
+__version__ = "0.25.3"
+__supported_client_version__ = "0.25.3"

src/murfey/cli/repost_failed_calls.py

@@ -93,7 +93,6 @@ def handle_failed_posts(messages_path: list[Path], murfey_db: Session):
     # These imports need to happen after transport object is configured
     import murfey.server.api.auth
     import murfey.server.api.bootstrap
-    import murfey.server.api.clem
     import murfey.server.api.display
     import murfey.server.api.file_io_frontend
     import murfey.server.api.file_io_instrument
@@ -106,6 +105,7 @@ def handle_failed_posts(messages_path: list[Path], murfey_db: Session):
     import murfey.server.api.session_info
     import murfey.server.api.websocket
     import murfey.server.api.workflow
+    import murfey.server.api.workflow_clem
 
     for json_file in messages_path:
         with open(json_file, "r") as json_data: