From cf5afe67cd673e7bad41650bc34abfa544bd9263 Mon Sep 17 00:00:00 2001
From: Nicola Soranzo <nicola.soranzo@earlham.ac.uk>
Date: Tue, 9 Nov 2021 14:40:46 +0100
Subject: [PATCH] Add a `cwl` extras to `galaxy-tool-util` with `cwltool` as
 dependency

Also:
- Don't install `util` and `tool-util` packages twice in `packages/test.sh`
---
 packages/test.sh            | 11 ++++++-----
 packages/tool_util/setup.py |  3 +++
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/packages/test.sh b/packages/test.sh
index fc820e3b75b..ae1a94ec2bf 100755
--- a/packages/test.sh
+++ b/packages/test.sh
@@ -41,16 +41,17 @@ for ((i=0; i<${#PACKAGE_DIRS[@]}; i++)); do
     run_mypy=${RUN_MYPY[$i]}
 
     cd "$package_dir"
-    pip install -e '.'
-    pip install -r test-requirements.txt
 
     # Install extras (if needed)
     if [ "$package_dir" = "util" ]; then
         pip install -e '.[template,jstree]'
+    elif [ "$package_dir" = "tool_util" ]; then
+        pip install -e '.[cwl,mulled,edam]'
+    else
+        pip install -e '.'
     fi
-    if [ "$package_dir" = "tool_util" ]; then
-        pip install -e '.[mulled,edam]'
-    fi
+
+    pip install -r test-requirements.txt
 
     if [[ "$run_tests" == "1" ]]; then
         pytest --doctest-modules galaxy tests
diff --git a/packages/tool_util/setup.py b/packages/tool_util/setup.py
index 2f4d88de6f6..de046353ec6 100644
--- a/packages/tool_util/setup.py
+++ b/packages/tool_util/setup.py
@@ -99,6 +99,9 @@ setup(
     include_package_data=True,
     install_requires=requirements,
     extras_require={
+        'cwl': [
+            'cwltool==3.0.20201109103151',
+        ],
         'mulled': [
             'conda',
             'cytoolz',  # cytoolz is an undeclared dependency of the conda package on PyPI