From 573310a4509fd447439dcc632348d1f5b90a4c08 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 9 Jun 2023 07:58:24 +0000
Subject: [PATCH] Update galaxy-tool-util requirement from <23,>=22.1.2 to
 >=22.1.2,<24

Updates the requirements on [galaxy-tool-util](https://github.com/galaxyproject/galaxy) to permit the latest version.
- [Release notes](https://github.com/galaxyproject/galaxy/releases)
- [Commits](https://github.com/galaxyproject/galaxy/compare/galaxy-tool-util-22.1.3...v23.0.1)

---
updated-dependencies:
- dependency-name: galaxy-tool-util
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Michael R. Crusoe <michael.crusoe@gmail.com>
---
 cwltool/software_requirements.py | 2 +-
 mypy-requirements.txt            | 2 ++
 pyproject.toml                   | 2 +-
 setup.py                         | 2 +-
 test-requirements.txt            | 4 ++--
 tests/test_dependencies.py       | 2 +-
 6 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/cwltool/software_requirements.py b/cwltool/software_requirements.py
index 4587b97a8..b7f604e31 100644
--- a/cwltool/software_requirements.py
+++ b/cwltool/software_requirements.py
@@ -155,7 +155,7 @@ def get_container_from_software_requirements(
             [DOCKER_CONTAINER_TYPE], tool_info
         )
         if container_description:
-            return cast(Optional[str], container_description.identifier)
+            return container_description.identifier
 
     return None
 
diff --git a/mypy-requirements.txt b/mypy-requirements.txt
index a5275dbec..263da6e5e 100644
--- a/mypy-requirements.txt
+++ b/mypy-requirements.txt
@@ -5,3 +5,5 @@ types-requests
 types-setuptools
 types-psutil
 types-mock
+galaxy-tool-util>=22.1.2,<24
+galaxy-util<24
diff --git a/pyproject.toml b/pyproject.toml
index 90c1bbc4e..0593d123f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -7,8 +7,8 @@ requires = [
     "importlib_resources>=1.4",  # equivalent to Python 3.9
     "ruamel.yaml>=0.16.0,<0.18",
     "schema-salad>=8.4.20230426093816,<9",
-    "packaging<22",
     "cwl-utils>=0.19",
+    "galaxy-tool-util >= 22.1.2, < 24",
     "toml",
     "argcomplete>=1.12.0",
 ]
diff --git a/setup.py b/setup.py
index 1502aa5ce..9dbed21b2 100644
--- a/setup.py
+++ b/setup.py
@@ -127,7 +127,7 @@
         "cwl-utils >= 0.22",
     ],
     extras_require={
-        "deps": ["galaxy-tool-util >= 22.1.2, <23", "galaxy-util <23"],
+        "deps": ["galaxy-tool-util >= 22.1.2, <24", "galaxy-util <24"],
     },
     python_requires=">=3.8, <4",
     setup_requires=PYTEST_RUNNER,
diff --git a/test-requirements.txt b/test-requirements.txt
index 67151ee97..57db44338 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -7,5 +7,5 @@ pytest-mock>=1.10.0
 pytest-cov
 arcp>=0.2.0
 -rrequirements.txt
-galaxy-tool-util>=22.1.2,<23
-galaxy-util<23
+galaxy-tool-util>=22.1.2,<24
+galaxy-util<24
diff --git a/tests/test_dependencies.py b/tests/test_dependencies.py
index 639f68b7b..c7964bf9d 100644
--- a/tests/test_dependencies.py
+++ b/tests/test_dependencies.py
@@ -17,7 +17,7 @@
 
 deps: Optional[ModuleType] = None
 try:
-    from galaxy.tool_util import deps  # type: ignore[no-redef]
+    from galaxy.tool_util import deps
 except ImportError:
     pass