Merge branch 'main' into input_annotations

common-workflow-language · Nov 13, 2023 · 45ddd8d · 45ddd8d
2 parents de090f9 + 8b2153a
commit 45ddd8d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/mypy-requirements.txt b/mypy-requirements.txt
@@ -1,6 +1,6 @@
 mypy==1.6.1  # also update pyproject.toml
 ruamel.yaml>=0.16.0,<0.19
-cwl-utils>=0.22
+cwl-utils>=0.22,!=0.30
 types-requests
 types-setuptools
 types-psutil

diff --git a/pyproject.toml b/pyproject.toml
@@ -8,7 +8,7 @@ requires = [
     "importlib_resources>=1.4",  # equivalent to Python 3.9
     "ruamel.yaml>=0.16.0,<0.18",
     "schema-salad>=8.4.20230426093816,<9",
-    "cwl-utils>=0.19",
+    "cwl-utils>=0.22,!=0.30",
     "galaxy-tool-util>=22.1.2,<23.2,!=23.0.1,!=23.0.2,!=23.0.3,!=23.0.4,!=23.0.5",
     "toml",
     "argcomplete>=1.12.0",

diff --git a/requirements.txt b/requirements.txt
@@ -11,4 +11,4 @@ coloredlogs
 pydot>=1.4.1
 argcomplete>=1.12.0
 pyparsing!=3.0.2  # breaks --print-dot (pydot) https://github.com/pyparsing/pyparsing/issues/319
-cwl-utils>=0.22
+cwl-utils>=0.22,!=0.30
diff --git a/setup.py b/setup.py
@@ -114,7 +114,7 @@
         "pydot >= 1.4.1",
         "argcomplete",
         "pyparsing != 3.0.2",  # breaks --print-dot (pydot) https://github.com/pyparsing/pyparsing/issues/319
-        "cwl-utils >= 0.22",
+        "cwl-utils >= 0.22, != 0.30",
     ],
     extras_require={
         "deps": [