Merge pull request #53 from manics/updates

OMERO.server 5.6.15-0 OMERO.web 5.29.0-1

Author: manics

.github/workflows/test_and_publish.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   precommit:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     timeout-minutes: 2
     name: Run pre-commit
     steps:
@@ -16,7 +16,7 @@ jobs:
       - uses: pre-commit/[email protected]
 
   test_omero:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     timeout-minutes: 20
     name: Test OMERO Helm charts
     strategy:
@@ -27,8 +27,8 @@ jobs:
             helm-version: v3.5.4
             # v4 supports k3s 1.24+
             k3s-helm-version: v3
-          - k3s-version: v1.31.1+k3s1
-            helm-version: v3.16.2
+          - k3s-version: v1.32.3+k3s1
+            helm-version: v3.17.2
     steps:
       - uses: actions/checkout@v4
         with:
@@ -51,7 +51,7 @@ jobs:
 
       - name: Install dependencies
         run: |
-          conda install -y -q -c conda-forge python=3.10 omero-py pytest requests ruamel.yaml docker-py
+          conda install -y -q -c conda-forge python=3.12 omero-py pytest requests ruamel.yaml docker-py
           # $CONDA/bin/pip install -r dev-requirements.txt
           echo "$CONDA/bin" >> $GITHUB_PATH
 
@@ -63,7 +63,7 @@ jobs:
 
   # This job can be used as a required status for Pull Requests
   status:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     timeout-minutes: 2
     name: Status
     needs:
@@ -76,7 +76,7 @@ jobs:
           echo "test_omero: ${{ needs.test_omero.result }}"
 
   publish:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     permissions:
       contents: write
     name: Publish OMERO Helm charts
@@ -92,13 +92,13 @@ jobs:
 
       - uses: actions/setup-python@v5
         with:
-          python-version: "3.10"
+          python-version: "3.12"
           cache: pip
           cache-dependency-path: dev-requirements.txt
 
       - uses: azure/setup-helm@v4
         with:
-          version: v3.16.2
+          version: v3.17.2
 
       - name: Install dependencies
         run: pip install -r dev-requirements.txt

.pre-commit-config.yaml

@@ -8,6 +8,9 @@ repos:
     rev: v6.2.1
     hooks:
       - id: beautysh
+        # Workaround bug: ModuleNotFoundError: No module named 'pkg_resources'
+        additional_dependencies:
+          - setuptools
   - repo: https://github.com/gruntwork-io/pre-commit
     rev: v0.1.23
     hooks:

omero-server/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
-appVersion: 5.6.14
+appVersion: 5.6.15-0
 description: OMERO.server
 name: omero-server
-version: 0.4.9
+version: 0.4.10
 icon: https://www.openmicroscopy.org/img/logos/omero-logomark.svg

omero-web/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
-appVersion: 5.28.0-1
+appVersion: 5.29.0-1
 description: OMERO.web
 name: omero-web
-version: 0.4.7
+version: 0.4.8
 icon: https://www.openmicroscopy.org/img/logos/omero-logomark.svg