Furter refine type descriptions for galaxy-lib.

common-workflow-language · Jul 3, 2017 · d25285c · d25285c
1 parent 470d561
commit d25285c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/cwltool/software_requirements.py b/cwltool/software_requirements.py
@@ -7,8 +7,10 @@
 ways to adapt new packages managers and such as well.
 """
 
+import argparse
 import os
 import string
+from typing import (Any, Dict, List, Text)
 
 try:
     from galaxy.tools.deps.requirements import ToolRequirement, ToolRequirements
@@ -72,7 +74,7 @@ def build_job_script(self, builder, command):
 
 
 def get_dependencies(builder):
-    # type: (Any) -> List[ToolRequirement]
+    # type: (Any) -> ToolRequirements
     (software_requirement, _) = get_feature(builder, "SoftwareRequirement")
     dependencies = []  # type: List[ToolRequirement]
     if software_requirement and software_requirement.get("packages"):

diff --git a/typeshed/2.7/galaxy/tools/deps/__init__.pyi b/typeshed/2.7/galaxy/tools/deps/__init__.pyi
@@ -12,7 +12,7 @@ from .resolvers.tool_shed_packages import ToolShedPackageDependencyResolver as T
 log = ...  # type: Any
 CONFIG_VAL_NOT_FOUND = ...  # type: Any
 
-def build_dependency_manager(config): ...
+def build_dependency_manager(config: Any) -> DependencyManager: ...
 
 class NullDependencyManager:
     dependency_resolvers = ...  # type: Any

diff --git a/typeshed/2.7/galaxy/tools/deps/requirements.pyi b/typeshed/2.7/galaxy/tools/deps/requirements.pyi
@@ -13,10 +13,10 @@ class ToolRequirement:
     version = ...  # type: Any
     specs = ...  # type: Any
     def __init__(self, name: Optional[Any] = ..., type: Optional[Any] = ..., version: Optional[Any] = ..., specs: Any = ...) -> None: ...
-    def to_dict(self) -> Dict[Any]: ...
+    def to_dict(self) -> Dict[str, Any]: ...
     def copy(self): ...
     @staticmethod
-    def from_dict(dict: Dict[Any]) -> ToolRequirement: ...
+    def from_dict(dict: Dict[str, Any]) -> ToolRequirement: ...
     def __eq__(self, other): ...
     def __ne__(self, other): ...
     def __hash__(self): ...
@@ -31,7 +31,7 @@ class RequirementSpecification:
     def short_name(self): ...
     def to_dict(self): ...
     @staticmethod
-    def from_dict(dict: Dict[Any]) -> ToolRequirements: ...
+    def from_dict(dict: Dict[str, Any]) -> ToolRequirements: ...
     def __eq__(self, other): ...
     def __ne__(self, other): ...
     def __hash__(self): ...