Merge branch 'main' into feature/add-zero-initial-scale-test

Author: brettmthompson

.github/workflows/add-remove-labels.yml

@@ -37,7 +37,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v5
+        uses: astral-sh/setup-uv@v6
 
       - name: Run add remove labels
         env:

.github/workflows/add-welcome-comment-set-assignee.yml

@@ -15,7 +15,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v5
+        uses: astral-sh/setup-uv@v6
 
       - name: Run add welcome comment
         env:

.github/workflows/on-review-add-label.yml

@@ -80,7 +80,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v5
+        uses: astral-sh/setup-uv@v6
       - name: 'Run add-remove-labels action'
         env:
           GITHUB_TOKEN: ${{ secrets.OPENDATAHUB_TESTS_BOT_PAT }}

.github/workflows/size-labeler.yml

@@ -15,7 +15,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v5
+        uses: astral-sh/setup-uv@v6
 
       - name: Run size labeler
         env:

.github/workflows/tox-tests.yml

@@ -12,7 +12,7 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Install uv
-      uses: astral-sh/setup-uv@v5
+      uses: astral-sh/setup-uv@v6
 
     - name: Install tox-uv
       run: |

pyproject.toml

@@ -66,7 +66,7 @@ dependencies = [
     "openshift-python-wrapper>=11.0.38",
     "semver>=3.0.4",
     "pytest-order>=1.3.0",
-    "marshmallow==3.26.1",  # this version is needed for pytest-jira
+    "marshmallow==3.26.1,<4", # this version is needed for pytest-jira
 ]
 
 [project.urls]