From 9e1eb1d4d52061f52d3ffcfe0616fa6ce871a346 Mon Sep 17 00:00:00 2001
From: "Michael R. Crusoe" <michael.crusoe@gmail.com>
Date: Fri, 23 Jun 2023 07:16:19 +0200
Subject: [PATCH] pin to compatible galaxy-util

---
 cwltool/validate_js.py | 14 +++-----------
 setup.py               |  2 +-
 test-requirements.txt  |  1 +
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/cwltool/validate_js.py b/cwltool/validate_js.py
index 27a7ace66..3b54c4d37 100644
--- a/cwltool/validate_js.py
+++ b/cwltool/validate_js.py
@@ -87,20 +87,12 @@ def get_expressions(
         if not isinstance(tool, MutableSequence):
             return []
 
-        def tmp_expr(
-            x: Tuple[int, Union[CommentedMap, str, CommentedSeq]]
-        ) -> List[Tuple[str, Optional[SourceLine]]]:
-            # using a lambda for this broke mypyc v0.910 and before
-            return get_expressions(
-                x[1],
-                cast(ArraySchema, schema).items,
-                SourceLine(tool, x[0], include_traceback=debug),
-            )
-
         return list(
             itertools.chain(
                 *map(
-                    tmp_expr,
+                    lambda x: get_expressions(
+                        x[1], getattr(schema, "items"), SourceLine(tool, x[0])  # noqa: B009
+                    ),
                     enumerate(tool),
                 )
             )
diff --git a/setup.py b/setup.py
index bc95743f6..468e5e1cc 100644
--- a/setup.py
+++ b/setup.py
@@ -132,7 +132,7 @@
         "cwl-utils >= 0.22",
     ],
     extras_require={
-        "deps": ["galaxy-tool-util >= 22.1.2, <23"],
+        "deps": ["galaxy-tool-util >= 22.1.2, <23", "galaxy-util <23"],
     },
     python_requires=">=3.6, <4",
     setup_requires=PYTEST_RUNNER,
diff --git a/test-requirements.txt b/test-requirements.txt
index e8bb881b5..02c65e952 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -9,3 +9,4 @@ arcp >= 0.2.0
 rdflib-jsonld>=0.4.0, <= 0.6.1;python_version<='3.6'
 -rrequirements.txt
 galaxy-tool-util >= 22.1.2, < 23
+galaxy-util < 23