Merge branch 'release_25.1' into dev

Author: mvdbeek

client/src/components/History/Export/HistoryExport.vue

@@ -292,6 +292,7 @@ const breadcrumbItems = computed(() => [
                 :records="previousExportRecords"
                 class="mt-3"
                 @onDownload="downloadFromRecord"
+                @onCopyDownloadLink="copyDownloadLinkFromRecord"
                 @onReimport="reimportFromRecord" />
         </GModal>
     </div>

lib/galaxy/files/sources/huggingface.py

@@ -104,7 +104,7 @@ def _to_filesystem_path(self, path: str) -> str:
 
     def _extract_timestamp(self, info: dict) -> Optional[str]:
         """Extract timestamp from Hugging Face file info to use it in the RemoteFile entry."""
-        last_commit: dict = info.get("last_commit", {})
+        last_commit: dict = info.get("last_commit") or {}
         return last_commit.get("date")
 
     def _get_file_hashes(self, info: dict) -> Optional[list[RemoteFileHash]]:

lib/galaxy/tool_util/verify/asserts/size.py

@@ -36,7 +36,7 @@ def assert_has_size(
         size = value
     _assert_number(
         output_size,
-        value,
+        size,
         delta,
         min,
         max,

lib/galaxy_test/api/test_workflows.py

@@ -28,13 +28,13 @@
 from galaxy.tool_util_models import UserToolSource
 from galaxy.util import UNKNOWN
 from galaxy.util.unittest_utils import skip_if_github_down
-from galaxy_test.api.test_tools import TOOL_WITH_SHELL_COMMAND
 from galaxy_test.base import rules_test_data
 from galaxy_test.base.populators import (
     DatasetCollectionPopulator,
     DatasetPopulator,
     RunJobsSummary,
     skip_without_tool,
+    TOOL_WITH_SHELL_COMMAND,
     wait_on,
     workflow_str,
     WorkflowPopulator,

test/unit/tool_util/verify/test_asserts.py

@@ -8,6 +8,7 @@
     import h5py
 except ImportError:
     h5py = None
+import pytest
 
 from galaxy.tool_util.parser.xml import __parse_assert_list_from_elem
 from galaxy.tool_util.verify import asserts
@@ -489,15 +490,17 @@ def test_has_line_matching_n_failure():
     GZA100 = gzip.compress(A100)
 
 
-def test_has_size_success():
+@pytest.mark.parametrize("size_attrib", ["size", "value"])
+def test_has_size_success(size_attrib):
     """test has_size"""
-    a = run_assertions(SIZE_HAS_SIZE_ASSERTION.format(size_attrib="size", value=10), TEXT_DATA_HAS_TEXT)
+    a = run_assertions(SIZE_HAS_SIZE_ASSERTION.format(size_attrib=size_attrib, value=10), TEXT_DATA_HAS_TEXT)
     assert len(a) == 0
 
 
-def test_has_size_failure():
+@pytest.mark.parametrize("size_attrib", ["size", "value"])
+def test_has_size_failure(size_attrib):
     """test has_size .. negative test"""
-    a = run_assertions(SIZE_HAS_SIZE_ASSERTION.format(size_attrib="value", value="10"), TEXT_DATA_HAS_TEXT * 2)
+    a = run_assertions(SIZE_HAS_SIZE_ASSERTION.format(size_attrib=size_attrib, value="10"), TEXT_DATA_HAS_TEXT * 2)
     assert "Expected file size of 10+-0 found 20" in a
     assert len(a) == 1