Merge branch 'release_24.0' into release_24.1

nsoranzo · Dec 19, 2024 · 8f0465f · 8f0465f
2 parents 8aefad4 + 0d4ec88
commit 8f0465f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/mulled.yaml b/.github/workflows/mulled.yaml
@@ -44,6 +44,8 @@ jobs:
           key: tox-cache-${{ runner.os }}-${{ steps.full-python-version.outputs.version }}-${{ hashFiles('galaxy root/requirements.txt') }}-mulled
       - name: Install Apptainer's singularity
         uses: eWaterCycle/setup-apptainer@v2
+        with:
+          apptainer-version: 1.3.6  # https://github.com/eWaterCycle/setup-apptainer/pull/68
       - name: Install tox
         run: pip install tox
       - name: Run tests

diff --git a/client/src/components/History/CurrentHistory/HistoryOperations/SelectionChangeWarning.vue b/client/src/components/History/CurrentHistory/HistoryOperations/SelectionChangeWarning.vue
@@ -31,7 +31,7 @@ function onDoNotShowAgain() {
 watch(
     () => props.querySelectionBreak,
     () => {
-        dismissCountDown.value = showSelectionQueryBreakWarning ? dismissSecs.value : 0;
+        dismissCountDown.value = showSelectionQueryBreakWarning.value ? dismissSecs.value : 0;
     }
 );
 </script>

diff --git a/pytest.ini b/pytest.ini
@@ -1,5 +1,5 @@
 [pytest]
-addopts = --doctest-continue-on-failure --verbosity=1
+addopts = --doctest-continue-on-failure --verbosity=1 --showlocals
 asyncio_mode = auto
 log_level = DEBUG
 # Install pytest-memray and set memray to true here to enable memory profiling of tests

diff --git a/test/unit/tool_util/mulled/test_mulled_update_singularity_containers.py b/test/unit/tool_util/mulled/test_mulled_update_singularity_containers.py
@@ -46,6 +46,6 @@ def test_singularity_container_test(tmp_path) -> None:
         "singularity",
         tmp_path,
     )
-    assert "samtools:1.0--1" in results["passed"]
-    assert "pybigwig:0.3.22--py36h54a71a5_0" in results["passed"]
-    assert "yasm:1.3.0--0" in results["notest"]
+    assert "samtools:1.0--1" in results["passed"], results
+    assert "pybigwig:0.3.22--py36h54a71a5_0" in results["passed"], results
+    assert "yasm:1.3.0--0" in results["notest"], results