needed until there is a new release of galaxy-tool-util with updated types

mr-c · mr-c · commit a3a57a8a8ace · 2022-08-01T17:51:40.000+02:00
diff --git a/cwltool/software_requirements.py b/cwltool/software_requirements.py
@@ -151,7 +151,7 @@ def get_container_from_software_requirements(
             [DOCKER_CONTAINER_TYPE], tool_info
         )
         if container_description:
-            return container_description.identifier
+            return cast(Optional[str], container_description.identifier)
 
     return None
 
diff --git a/mypy.ini b/mypy.ini
@@ -14,3 +14,9 @@ ignore_errors = True
 
 [mypy-past.builtins.*]
 ignore_missing_imports = True
+
+[mypy-galaxy.tool_util.*]
+ignore_missing_imports = True
+
+[mypy-cwltool.software_requirements]
+warn_unused_ignores= False
diff --git a/test-requirements.txt b/test-requirements.txt
@@ -7,3 +7,4 @@ pytest-cov
 arcp >= 0.2.0
 rdflib-jsonld>=0.4.0, <= 0.6.1;python_version<='3.6'
 -rrequirements.txt
+galaxy-tool-util >= 21.1.0
diff --git a/tests/test_dependencies.py b/tests/test_dependencies.py
@@ -11,7 +11,7 @@
 
 deps = None  # type: Optional[ModuleType]
 try:
-    from galaxy.tool_util import deps
+    from galaxy.tool_util import deps  # type: ignore[no-redef]
 except ImportError:
     pass
 

Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ def get_container_from_software_requirements(`
`151`	`151`	`[DOCKER_CONTAINER_TYPE], tool_info`
`152`	`152`	`)`
`153`	`153`	`if container_description:`
`154`		`- return container_description.identifier`
	`154`	`+ return cast(Optional[str], container_description.identifier)`
`155`	`155`
`156`	`156`	`return None`
`157`	`157`