Merge pull request #1228 from common-workflow-language/galaxy-tool-util

Replace galaxy-lib dependency with galaxy-tool-util.

Author: mr-c

README.rst

@@ -18,8 +18,8 @@
 
 from .builder import Builder, HasReqsHints
 try:
-    from galaxy.tools.deps.requirements import ToolRequirement, ToolRequirements
-    from galaxy.tools import deps
+    from galaxy.tool_util.deps.requirements import ToolRequirement, ToolRequirements
+    from galaxy.tool_util import deps
 except ImportError:
     ToolRequirement = None  # type: ignore
     ToolRequirements = None  # type: ignore
@@ -49,25 +49,30 @@ def __init__(self, args):
             self.tool_dependency_dir = tool_dependency_dir
             self.dependency_resolvers_config_file = os.path.abspath(conf_file)
         elif conda_dependencies is not None:
-            if not tool_dependency_dir is not None:
+            if tool_dependency_dir is None:
                 tool_dependency_dir = os.path.abspath("./cwltool_deps")
             self.tool_dependency_dir = tool_dependency_dir
             self.use_tool_dependencies = True
             self.dependency_resolvers_config_file = None
         else:
             self.use_tool_dependencies = False
 
-    @property
-    def config_dict(self):  # type: () -> Dict[Text, bool]
-        return {
-            'conda_auto_install': True,
-            'conda_auto_init': True,
-        }
-
     def build_job_script(self, builder, command):
         # type: (Builder, List[str]) -> Text
         ensure_galaxy_lib_available()
-        tool_dependency_manager = deps.build_dependency_manager(self)  # type: deps.DependencyManager
+        resolution_config_dict = {
+            'use': self.use_tool_dependencies,
+            'default_base_path': self.tool_dependency_dir,
+        }
+        app_config = {
+            'conda_auto_install': True,
+            'conda_auto_init': True,
+        }
+        tool_dependency_manager = deps.build_dependency_manager(
+            app_config_dict=app_config,
+            resolution_config_dict=resolution_config_dict,
+            conf_file=self.dependency_resolvers_config_file,
+        )  # type: deps.DependencyManager
         dependencies = get_dependencies(builder)
         handle_dependencies = ""  # str
         if dependencies:
@@ -107,10 +112,11 @@ def get_container_from_software_requirements(use_biocontainers, builder):
     # type: (bool, HasReqsHints) -> Optional[Text]
     if use_biocontainers:
         ensure_galaxy_lib_available()
-        from galaxy.tools.deps.containers import ContainerRegistry, AppInfo, ToolInfo, DOCKER_CONTAINER_TYPE
+        from galaxy.tool_util.deps.dependencies import AppInfo, ToolInfo
+        from galaxy.tool_util.deps.containers import ContainerRegistry, DOCKER_CONTAINER_TYPE
         app_info = AppInfo(
             involucro_auto_init=True,
-            enable_beta_mulled_containers=True,
+            enable_mulled_containers=True,
             container_image_cache_path=".",
         )  # type: AppInfo
         container_registry = ContainerRegistry(app_info)  # type: ContainerRegistry

cwltool/software_requirements.py

@@ -80,7 +80,7 @@
       extras_require={
           ':os.name=="posix" and python_version<"3.5"': ['subprocess32 >= 3.5.0'],
           ':python_version<"3.6"': ['typing >= 3.5.3'],
-          'deps': ["galaxy-lib >= 17.09.9, <= 18.9.2 "],
+          'deps': ["galaxy-tool-util"],
           'docs': ["sphinx >= 2.2", "sphinx-rtd-theme"],
       },
       python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, <4',

setup.py

@@ -65,7 +65,7 @@ def __main__():
     writer = output.write
     for line_offset in line_offsets:
         seeker( line_offset )
-        writer( readliner() )
+        writer( readliner().decode("utf-8") )
     input.close()
     output.close()
     #print("Kept %i of %i total lines." % ( num_lines, total_lines ))

tests/test_deps_env/random-lines/1.0/scripts/random-lines

@@ -37,7 +37,7 @@ deps =
   py{27,35,36,37,38}-unit: pytest-xdist<1.28.0
   py{27,35,36,37,38}-unit: pytest-cov
   py{27,35,36,37,38}-unit: -rtest-requirements.txt
-  py{27,35,36,37,38}-unit: galaxy-lib
+  py{27,35,36,37,38}-unit: galaxy-tool-util
   py{27,35,36,37,38}-lint: flake8
   py{27,35,36,37,38}-bandit: bandit
   py{35,36,36,37,38}-mypy{2,3}: mypy==0.720