Merge branch 'main' into doppio-live-processing

Author: stephen-riggs

.bumpclient.toml

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

.bumpversion.toml

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

.github/workflows/ci.yml

@@ -69,15 +69,15 @@ jobs:
           docker container list -a
 
       - name: Get ISPyB database
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v8
         with:
           name: database
           path: database/
 
       - name: Install Murfey
         run: |
           set -eux
-          pip install --disable-pip-version-check -e "."[cicd,server,developer]
+          pip install --disable-pip-version-check -e "."[cicd,server,developer,sxt]
 
       - uses: shogo82148/actions-setup-mysql@v1
         with:
@@ -129,7 +129,7 @@ jobs:
           PYTHONDEVMODE=1 pytest -v -ra --cov=murfey --cov-report=xml --cov-branch
 
       - name: Upload test results to Codecov
-        uses: codecov/codecov-action@v5
+        uses: codecov/codecov-action@v6
         with:
           name: ${{ matrix.python-version }}
           files: coverage.xml

.github/workflows/publish-version.yml

@@ -78,7 +78,7 @@ jobs:
       - name: Build python package
         run: python3 -m build
       - name: Store built package artifact
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: package-distributions
           path: dist/
@@ -100,7 +100,7 @@ jobs:
 
     steps:
       - name: Download all the dists
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v8
         with:
           name: package-distributions
           path: dist/
@@ -123,12 +123,12 @@ jobs:
 
     steps:
       - name: Download all the dists
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v8
         with:
           name: package-distributions
           path: dist/
       - name: Sign the dists with Sigstore
-        uses: sigstore/gh-action-sigstore-python@v3.2.0
+        uses: sigstore/gh-action-sigstore-python@v3.3.0
         with:
           inputs: >-
             ./dist/*.tar.gz

.github/workflows/test.yml

@@ -60,7 +60,7 @@ jobs:
           mkdir database
           wget -t 3 --waitretry=20 https://github.com/DiamondLightSource/ispyb-database/releases/download/v${{ env.ISPYB_DATABASE_SCHEMA }}/ispyb-database-${{ env.ISPYB_DATABASE_SCHEMA }}.tar.gz -O database/ispyb-database.tar.gz
       - name: Store database artifact
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: database
           path: database/

Dockerfiles/murfey-instrument-server

@@ -32,7 +32,7 @@ RUN apt-get update && \
         pip \
         build \
         importlib-metadata && \
-    /venv/bin/python -m pip install /python-murfey
+    /venv/bin/python -m pip install /python-murfey[sxt]
 
 
 # Transfer completed Murfey build to base image

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.23.4
+version: 0.24.2
 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.23.4
+version: 0.24.2

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.23.4
+version: 0.24.2

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.23.4
+version: 0.24.2