From 000473d89d6892a2a7d4e4fa3ca68fee8678ce2d Mon Sep 17 00:00:00 2001
From: mvdbeek <m.vandenbeek@gmail.com>
Date: Mon, 9 Jan 2023 15:19:29 +0100
Subject: [PATCH 1/2] Bump cwltest requirement and fix import

Fixes:

```
mypy .
galaxy_test/base/populators.py:2258: error: "Module cwltest.utils" does not
explicitly export attribute "compare"  [attr-defined]
                    cwltest.utils.compare(value, actual_output)
                    ^~~~~~~~~~~~~~~~~~~~~
Found 1 error in 1 file (checked 20 source files)
make: *** [Makefile:96: mypy] Error 1
```
---
 lib/galaxy/dependencies/dev-requirements.txt | 2 +-
 lib/galaxy_test/base/populators.py           | 4 ++--
 pyproject.toml                               | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/galaxy/dependencies/dev-requirements.txt b/lib/galaxy/dependencies/dev-requirements.txt
index 8a48ee27d59..cbb8b0ad98d 100644
--- a/lib/galaxy/dependencies/dev-requirements.txt
+++ b/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"
diff --git a/lib/galaxy_test/base/populators.py b/lib/galaxy_test/base/populators.py
index 1f1af617a06..456c7afeff8 100644
--- a/lib/galaxy_test/base/populators.py
+++ b/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
diff --git a/pyproject.toml b/pyproject.toml
index f3ff6111d42..cab3339e9b6 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -116,7 +116,7 @@ zipstream-new = "*"
 ase = ">=3.18.1"
 black = "^22.1.0"
 codespell = "*"
-cwltest = "2.2.20210901154959"
+cwltest = "2.3.20230108193615"
 darker = "*"
 fluent-logger = "*"
 httpx = "*"

From d369546e9d895b3445fe51e6d0ee7c1d425d48ca Mon Sep 17 00:00:00 2001
From: mvdbeek <m.vandenbeek@gmail.com>
Date: Mon, 9 Jan 2023 15:47:46 +0100
Subject: [PATCH 2/2] Unpin cwltest dev dependency

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index cab3339e9b6..d19959e4dfa 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -116,7 +116,7 @@ zipstream-new = "*"
 ase = ">=3.18.1"
 black = "^22.1.0"
 codespell = "*"
-cwltest = "2.3.20230108193615"
+cwltest = "*"
 darker = "*"
 fluent-logger = "*"
 httpx = "*"