From b6e9171656724e164746a80164ecdd9027add7f7 Mon Sep 17 00:00:00 2001
From: Nicola Soranzo <nicola.soranzo@earlham.ac.uk>
Date: Fri, 12 Nov 2021 03:18:09 +0100
Subject: [PATCH] Update requirements

---
 lib/galaxy/dependencies/dev-requirements.txt    | 9 +++++----
 lib/galaxy/dependencies/pinned-requirements.txt | 3 ++-
 pyproject.toml                                  | 4 ++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/lib/galaxy/dependencies/dev-requirements.txt b/lib/galaxy/dependencies/dev-requirements.txt
index 3f9c65b08c11..e8be11bc14be 100644
--- a/lib/galaxy/dependencies/dev-requirements.txt
+++ b/lib/galaxy/dependencies/dev-requirements.txt
@@ -50,13 +50,14 @@ commonmark==0.9.1; python_version >= "3.6" and python_version < "4.0"
 contextvars==2.4; python_version < "3.7" and python_version >= "3.6"
 coverage==6.1.1; python_version >= "3.6"
 cryptography==35.0.0; python_version >= "3.6"
-cwltest==2.2.20210901154959; python_version >= "3.5" and python_version < "4"
+cwl-upgrader==1.2.2; python_version >= "3.6" and python_version < "4"
+cwl-utils==0.13; python_version >= "3.6"
+cwltest==2.2.20210901154959; python_version >= "3.6" and python_version < "4"
 cwltool==3.1.20211107152837; python_version >= "3.6" and python_version < "4"
-cwl-utils >= 0.12
 dataclasses==0.8; python_version >= "3.6" and python_version < "3.7" and python_full_version >= "3.6.1"
 debtcollector==2.3.0; python_version >= "3.6"
 decorator==5.1.0; python_version >= "3.6"
-defusedxml==0.7.1; python_version >= "3.0" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.0"
+defusedxml==0.7.1; python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "4" or python_full_version >= "3.5.0" and python_version >= "3.6" and python_version < "4"
 deprecated==1.2.13; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.6"
 deprecation==2.1.0
 dictobj==0.4
@@ -101,7 +102,7 @@ jmespath==0.10.0; python_version >= "3.6" and python_full_version < "3.0.0" or p
 jsonpatch==1.32; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.6"
 jsonpointer==2.2; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.6"
 jsonschema==4.0.0
-junit-xml==1.9
+junit-xml==1.9; python_version >= "3.6" and python_version < "4"
 keystoneauth1==4.4.0; python_version >= "3.6"
 kombu==5.1.0; python_version >= "3.6"
 lagom==1.4.1; python_version >= "3.6" and python_version < "4.0"
diff --git a/lib/galaxy/dependencies/pinned-requirements.txt b/lib/galaxy/dependencies/pinned-requirements.txt
index 091a9b60f3ce..a453121095b6 100644
--- a/lib/galaxy/dependencies/pinned-requirements.txt
+++ b/lib/galaxy/dependencies/pinned-requirements.txt
@@ -47,8 +47,9 @@ coloredlogs==15.0.1; python_version >= "3.6" and python_full_version < "3.0.0" a
 commonmark==0.9.1; python_version >= "3.6" and python_version < "4.0"
 contextvars==2.4; python_version >= "3.6" and python_version < "3.7"
 cryptography==35.0.0; python_version >= "3.6"
+cwl-upgrader==1.2.2; python_version >= "3.6" and python_version < "4"
+cwl-utils==0.13; python_version >= "3.6"
 cwltool==3.1.20211107152837; python_version >= "3.6" and python_version < "4"
-cwl-utils >= 0.12
 dataclasses==0.8; python_version >= "3.6" and python_version < "3.7" and python_full_version >= "3.6.1"
 debtcollector==2.3.0; python_version >= "3.6"
 decorator==5.1.0; python_version >= "3.6"
diff --git a/pyproject.toml b/pyproject.toml
index 50ef5574bbfa..64a1e9604d26 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -32,7 +32,7 @@ cloudbridge = "*"
 contextvars = {version = "*", python = "~3.6"}
 circus = "*"
 cwltool = "==3.1.20211107152837"
-cwl-utils = ">=0.12"
+cwl-utils = ">=0.13"
 dictobj = "*"
 docutils = "!=0.17, !=0.17.1"
 edam-ontology = "*"
@@ -88,7 +88,7 @@ Whoosh = "*"
 zipstream-new = "*"
 
 [tool.poetry.dev-dependencies]
-cwltest = "2.0.20200626112502"
+cwltest = "2.2.20210901154959"
 fluent-logger = "*"
 httpx = "*"
 gunicorn = "*"