Merge pull request #15287 from mvdbeek/cwltest_fix

Bump cwltest requirement and fix import

lib/galaxy/dependencies/dev-requirements.txt

@@ -25,7 +25,7 @@ codespell==2.2.2 ; python_version >= "3.7" and python_version < "3.11"
 colorama==0.4.6 ; python_version >= "3.7" and python_version < "3.11" and sys_platform == "win32" or python_version >= "3.7" and python_version < "3.11" and platform_system == "Windows"
 commonmark==0.9.1 ; python_version >= "3.7" and python_version < "3.11"
 coverage[toml]==7.0.1 ; python_version >= "3.7" and python_version < "3.11"
-cwltest==2.2.20210901154959 ; python_version >= "3.7" and python_version < "3.11"
+cwltest==2.3.20230108193615 ; python_version >= "3.7" and python_version < "3.11"
 cycler==0.11.0 ; python_version >= "3.7" and python_version < "3.11"
 darker==1.6.1 ; python_version >= "3.7" and python_version < "3.11"
 defusedxml==0.7.1 ; python_version >= "3.7" and python_version < "3.11"

lib/galaxy_test/base/populators.py

@@ -67,7 +67,7 @@ from typing import (
 )
 from uuid import UUID
 
-import cwltest.utils
+import cwltest.compare
 import requests
 import yaml
 from bioblend.galaxy import GalaxyClient
@@ -2241,7 +2241,7 @@ class CwlPopulator:
         try:
             for key, value in expected_outputs.items():
                 actual_output = run.get_output_as_object(key)
-                cwltest.utils.compare(value, actual_output)
+                cwltest.compare.compare(value, actual_output)
         except Exception:
             self.dataset_populator._summarize_history(run.history_id)
             raise

pyproject.toml

@@ -116,7 +116,7 @@ zipstream-new = "*"
 ase = ">=3.18.1"
 black = "^22.1.0"
 codespell = "*"
-cwltest = "2.2.20210901154959"
+cwltest = "*"
 darker = "*"
 fluent-logger = "*"
 httpx = "*"